SOURCES: grub-gcc4.patch, grub-pxe.patch - apply pxe after gcc4 patch

[baggins]

Author: baggins                      Date: Sun Feb  1 14:10:57 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- apply pxe after gcc4 patch

---- Files affected:
SOURCES:
   grub-gcc4.patch (1.2 -> 1.3) , grub-pxe.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/grub-gcc4.patch
diff -u SOURCES/grub-gcc4.patch:1.2 SOURCES/grub-gcc4.patch:1.3
--- SOURCES/grub-gcc4.patch:1.2	Mon Jan 12 14:04:12 2009
+++ SOURCES/grub-gcc4.patch	Sun Feb  1 15:10:51 2009
@@ -1,35 +1,37 @@
+--- grub-0.97/netboot/etherboot.h.orig	2003-07-09 13:45:37.000000000 +0200
++++ grub-0.97/netboot/etherboot.h	2005-06-12 15:52:11.000000000 +0200
+@@ -531,9 +531,6 @@
+ extern int network_ready;
+ extern struct rom_info rom;
+ extern struct arptable_t arptable[MAX_ARP];
+-extern struct bootpd_t bootp_data;
+-#define	BOOTP_DATA_ADDR	(&bootp_data)
+-extern unsigned char *end_of_rfc1533;
+ 
+ /* config.c */
+ extern struct nic nic;
+--- grub-0.97/netboot/main.c.orig	2004-05-21 00:19:33.000000000 +0200
++++ grub-0.97/netboot/main.c	2005-06-12 15:52:45.000000000 +0200
+@@ -55,6 +55,7 @@
+ static int vendorext_isvalid;
+ static unsigned long netmask;
+ static struct bootpd_t bootp_data;
++#define BOOTP_DATA_ADDR (&bootp_data)
+ static unsigned long xid;
+ static unsigned char *end_of_rfc1533 = NULL;
+ 
 --- grub-0.97/netboot/natsemi.c.orig	2003-07-09 13:45:38.000000000 +0200
 +++ grub-0.97/netboot/natsemi.c	2005-06-12 15:55:59.000000000 +0200
 @@ -608,7 +608,7 @@
  		 const char  *p)     /* Packet */
  {
-     u32 to, nstype;
+     u32 status, to, nstype;
 -    u32 tx_status;
 +    volatile u32 tx_status;
      
      /* Stop the transmitter */
      outl(TxOff, ioaddr + ChipCmd);
 @@ -647,7 +647,7 @@
- 
-     to = currticks() + TX_TIMEOUT;
- 
--    while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to))
-+    while (((tx_status = txd.cmdsts) & OWN) && (currticks() < to))
-         /* wait */ ;
- 
-     if (currticks() >= to) {
---- grub-0.97/netboot/sis900.c~	2009-01-12 13:41:30.000000000 +0100
-+++ grub-0.97/netboot/sis900.c	2009-01-12 13:42:51.000000000 +0100
-@@ -1081,7 +1081,7 @@
-                 const char  *p)     /* Packet */
- {
-     u32 to, nstype;
--    u32 tx_status;
-+    volatile u32 tx_status;
-     
-     /* Stop the transmitter */
-     outl(TxDIS | inl(ioaddr + cr), ioaddr + cr);
-@@ -1120,7 +1120,7 @@
  
      to = currticks() + TX_TIMEOUT;
  

================================================================
Index: SOURCES/grub-pxe.patch
diff -u SOURCES/grub-pxe.patch:1.3 SOURCES/grub-pxe.patch:1.4
--- SOURCES/grub-pxe.patch:1.3	Tue Jan 13 11:15:18 2009
+++ SOURCES/grub-pxe.patch	Sun Feb  1 15:10:51 2009
@@ -3913,8 +3913,8 @@
 - *                  network device driver which uses this chip
 - *
 - * $Log$
-- * Revision 1.3  2009/01/13 10:15:18  baggins
-- * - fixed default config back to /boot/grub/menu.lst
+- * Revision 1.4  2009/02/01 14:10:51  baggins
+- * - apply pxe after gcc4 patch
 - *
 - * Revision 1.3  2000/07/29 19:22:54  okuji
 - * update the network support to etherboot-4.6.4.
@@ -11940,7 +11940,7 @@
 ===================================================================
 --- netboot/main.c	(.../upstream/grub-0.97)	(revision 112)
 +++ netboot/main.c	(.../trunk)	(revision 112)
-@@ -1,1171 +0,0 @@
+@@ -1,1172 +0,0 @@
 -/*
 - *  GRUB  --  GRand Unified Bootloader
 - *  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
@@ -11998,6 +11998,7 @@
 -static int vendorext_isvalid;
 -static unsigned long netmask;
 -static struct bootpd_t bootp_data;
+-#define BOOTP_DATA_ADDR (&bootp_data)
 -static unsigned long xid;
 -static unsigned char *end_of_rfc1533 = NULL;
 -
@@ -19044,7 +19045,7 @@
  {
 -    u32 status, to, nstype;
 +    u32 to, nstype;
-     u32 tx_status;
+     volatile u32 tx_status;
      
      /* Stop the transmitter */
      outl(TxOff, ioaddr + ChipCmd);
@@ -19123,7 +19124,7 @@
 ===================================================================
 --- netboot/etherboot.h	(.../upstream/grub-0.97)	(revision 112)
 +++ netboot/etherboot.h	(.../trunk)	(revision 112)
-@@ -1,547 +1,15 @@
+@@ -1,544 +1,15 @@
 -/*
 - *  GRUB  --  GRand Unified Bootloader
 - *  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
@@ -19670,9 +19671,6 @@
 -extern int network_ready;
 -extern struct rom_info rom;
 -extern struct arptable_t arptable[MAX_ARP];
--extern struct bootpd_t bootp_data;
--#define	BOOTP_DATA_ADDR	(&bootp_data)
--extern unsigned char *end_of_rfc1533;
 -
 -/* config.c */
 -extern struct nic nic;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/grub-gcc4.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/grub-pxe.patch?r1=1.3&r2=1.4&f=u