remove bi_enet*addr from global data for all arches

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Ben Warren <biggerbadderben@gmail.com>
CC: Daniel Hellstrom <daniel@gaisler.com>
CC: Michal Simek <monstr@seznam.cz>
CC: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
CC: Scott McNutt <smcnutt@psyent.com>
CC: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/include/asm-arm/u-boot.h b/include/asm-arm/u-boot.h
index b11d555..cfd5a9b 100644 (file)
--- a/include/asm-arm/u-boot.h
+++ b/include/asm-arm/u-boot.h
@@ -39,7 +39,6 @@
 typedef struct bd_info {
     int                        bi_baudrate;    /* serial console baudrate */
     unsigned long      bi_ip_addr;     /* IP Address */
-    unsigned char      bi_enetaddr[6]; /* Ethernet adress */
     struct environment_s              *bi_env;
     ulong              bi_arch_number; /* unique id for this board */
     ulong              bi_boot_params; /* where this board expects params */
@@ -48,10 +47,6 @@ typedef struct bd_info {
        ulong start;
        ulong size;
     }                  bi_dram[CONFIG_NR_DRAM_BANKS];
-#ifdef CONFIG_HAS_ETH1
-    /* second onboard ethernet port */
-    unsigned char   bi_enet1addr[6];
-#endif
 } bd_t;
 
 #define bi_env_data bi_env->data

diff --git a/include/asm-avr32/u-boot.h b/include/asm-avr32/u-boot.h
index 85ef008..7e4001f 100644 (file)
--- a/include/asm-avr32/u-boot.h
+++ b/include/asm-avr32/u-boot.h
@@ -25,7 +25,6 @@
 typedef struct bd_info {
        unsigned long           bi_baudrate;
        unsigned long           bi_ip_addr;
-       unsigned char           bi_enetaddr[6];
        unsigned char           bi_phy_id[4];
        struct environment_s    *bi_env;
        unsigned long           bi_board_number;

diff --git a/include/asm-blackfin/u-boot.h b/include/asm-blackfin/u-boot.h
index 9d2903b..a6e6cf0 100644 (file)
--- a/include/asm-blackfin/u-boot.h
+++ b/include/asm-blackfin/u-boot.h
@@ -31,7 +31,6 @@
 typedef struct bd_info {
        int bi_baudrate;                /* serial console baudrate */
        unsigned long bi_ip_addr;       /* IP Address */
-       unsigned char bi_enetaddr[6];   /* Ethernet adress */
        unsigned long bi_boot_params;   /* where this board expects params */
        unsigned long bi_memstart;      /* start of DRAM memory */
        phys_size_t bi_memsize;         /* size  of DRAM memory in bytes */

diff --git a/include/asm-i386/u-boot.h b/include/asm-i386/u-boot.h
index fc5a2ae..9a1eec0 100644 (file)
--- a/include/asm-i386/u-boot.h
+++ b/include/asm-i386/u-boot.h
@@ -46,7 +46,6 @@ typedef struct bd_info {
        unsigned long   bi_sramsize;    /* size  of SRAM memory */
        unsigned long   bi_bootflags;   /* boot / reboot flag (for LynxOS) */
        unsigned long   bi_ip_addr;     /* IP Address */
-       unsigned char   bi_enetaddr[6]; /* Ethernet adress */
        unsigned short  bi_ethspeed;    /* Ethernet speed in Mbps */
        unsigned long   bi_intfreq;     /* Internal Freq, in MHz */
        unsigned long   bi_busfreq;     /* Bus Freq, in MHz */

diff --git a/include/asm-m68k/u-boot.h b/include/asm-m68k/u-boot.h
index 5a0d5fe..a0f2983 100644 (file)
--- a/include/asm-m68k/u-boot.h
+++ b/include/asm-m68k/u-boot.h
@@ -48,7 +48,6 @@ typedef struct bd_info {
        unsigned long bi_bootflags;     /* boot / reboot flag (for LynxOS) */
        unsigned long bi_boot_params;   /* where this board expects params */
        unsigned long bi_ip_addr;       /* IP Address */
-       unsigned char bi_enetaddr[6];   /* Ethernet adress */
        unsigned short bi_ethspeed;     /* Ethernet speed in Mbps */
        unsigned long bi_intfreq;       /* Internal Freq, in MHz */
        unsigned long bi_busfreq;       /* Bus Freq, in MHz */
@@ -61,18 +60,6 @@ typedef struct bd_info {
        unsigned long bi_flbfreq;       /* Flexbus Freq in MHz */
 #endif
        unsigned long bi_baudrate;      /* Console Baudrate */
-
-#ifdef CONFIG_HAS_ETH1
-       /* second onboard ethernet port */
-       unsigned char bi_enet1addr[6];
-#endif
-#ifdef CONFIG_HAS_ETH2
-       /* third onboard ethernet port */
-       unsigned char bi_enet2addr[6];
-#endif
-#ifdef CONFIG_HAS_ETH3
-       unsigned char bi_enet3addr[6];
-#endif
 } bd_t;
 
 #endif                         /* __ASSEMBLY__ */

diff --git a/include/asm-microblaze/u-boot.h b/include/asm-microblaze/u-boot.h
index 9db491e..543a6b1 100644 (file)
--- a/include/asm-microblaze/u-boot.h
+++ b/include/asm-microblaze/u-boot.h
@@ -41,7 +41,6 @@ typedef struct bd_info {
        unsigned long   bi_sramstart;   /* start of SRAM memory */
        unsigned long   bi_sramsize;    /* size  of SRAM memory */
        unsigned long   bi_ip_addr;     /* IP Address */
-       unsigned char   bi_enetaddr[6]; /* Ethernet adress */
        unsigned long   bi_baudrate;    /* Console Baudrate */
 } bd_t;
 

diff --git a/include/asm-mips/u-boot.h b/include/asm-mips/u-boot.h
index 9ecb9ac..d9c14ca 100644 (file)
--- a/include/asm-mips/u-boot.h
+++ b/include/asm-mips/u-boot.h
@@ -34,7 +34,6 @@
 typedef struct bd_info {
        int             bi_baudrate;    /* serial console baudrate */
        unsigned long   bi_ip_addr;     /* IP Address */
-       unsigned char   bi_enetaddr[6]; /* Ethernet adress */
        unsigned long   bi_arch_number; /* unique id for this board */
        unsigned long   bi_boot_params; /* where this board expects params */
        unsigned long   bi_memstart;    /* start of DRAM memory */

diff --git a/include/asm-nios/u-boot.h b/include/asm-nios/u-boot.h
index 3436185..bdb6cf2 100644 (file)
--- a/include/asm-nios/u-boot.h
+++ b/include/asm-nios/u-boot.h
@@ -41,7 +41,6 @@ typedef struct bd_info {
        unsigned long   bi_sramstart;   /* start of SRAM memory */
        unsigned long   bi_sramsize;    /* size  of SRAM memory */
        unsigned long   bi_ip_addr;     /* IP Address */
-       unsigned char   bi_enetaddr[6]; /* Ethernet adress */
        unsigned long   bi_baudrate;    /* Console Baudrate */
 } bd_t;
 

diff --git a/include/asm-nios2/u-boot.h b/include/asm-nios2/u-boot.h
index de8c405..ec844d0 100644 (file)
--- a/include/asm-nios2/u-boot.h
+++ b/include/asm-nios2/u-boot.h
@@ -40,7 +40,6 @@ typedef struct bd_info {
        unsigned long   bi_sramstart;   /* start of SRAM memory */
        unsigned long   bi_sramsize;    /* size  of SRAM memory */
        unsigned long   bi_ip_addr;     /* IP Address */
-       unsigned char   bi_enetaddr[6]; /* Ethernet adress */
        unsigned long   bi_baudrate;    /* Console Baudrate */
 } bd_t;
 

diff --git a/include/asm-sh/u-boot.h b/include/asm-sh/u-boot.h
index e89c193..27d43b9 100644 (file)
--- a/include/asm-sh/u-boot.h
+++ b/include/asm-sh/u-boot.h
@@ -34,7 +34,6 @@ typedef struct bd_info {
        unsigned long   bi_sramstart;   /* start of SRAM memory */
        unsigned long   bi_sramsize;    /* size  of SRAM memory */
        unsigned long   bi_ip_addr;     /* IP Address */
-       unsigned char   bi_enetaddr[6]; /* Ethernet adress */
        unsigned long   bi_baudrate;    /* Console Baudrate */
        unsigned long   bi_boot_params; /* where this board expects params */
 } bd_t;

diff --git a/include/asm-sparc/u-boot.h b/include/asm-sparc/u-boot.h
index c42e93c..209873f 100644 (file)
--- a/include/asm-sparc/u-boot.h
+++ b/include/asm-sparc/u-boot.h
@@ -52,22 +52,10 @@ typedef struct bd_info {
        unsigned long bi_sramsize;      /* size  of SRAM memory */
        unsigned long bi_bootflags;     /* boot / reboot flag (for LynxOS) */
        unsigned long bi_ip_addr;       /* IP Address */
-       unsigned char bi_enetaddr[6];   /* Ethernet adress */
        unsigned short bi_ethspeed;     /* Ethernet speed in Mbps */
        unsigned long bi_intfreq;       /* Internal Freq, in MHz */
        unsigned long bi_busfreq;       /* Bus Freq, in MHz */
        unsigned long bi_baudrate;      /* Console Baudrate */
-#ifdef CONFIG_HAS_ETH1
-       /* second onboard ethernet port */
-       unsigned char bi_enet1addr[6];
-#endif
-#ifdef CONFIG_HAS_ETH2
-       /* third onboard ethernet port */
-       unsigned char bi_enet2addr[6];
-#endif
-#ifdef CONFIG_HAS_ETH3
-       unsigned char bi_enet3addr[6];
-#endif
 } bd_t;
 
 #endif                         /* __ASSEMBLY__ */