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 b11d5558f009ce301faa07041dc51efb631fbe3d..cfd5a9ba45006e6f61a0406292d579fa3fdcb6da 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 85ef008b7272b3d756ddbba0e64d8649327b6da7..7e4001fc5d773764ebf9d7062963edf9433ee36d 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 9d2903be9a13d9c8a4c29e8f794a9b076c76d889..a6e6cf0f5422ea4c3ae6d38bdae140e5642eca96 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 fc5a2ae591207c15c058843a6f9146d9f0f32da1..9a1eec0cd54fbfde4574525b5f0bc6c1adccf1a7 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 5a0d5fe4877d05f00e42f4c23ae17e6518f128b2..a0f2983750f453d30b503e9b3d27e5289a445a0c 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 9db491ec99d12194dfc828bcbd05e225f0223912..543a6b177707256321ebf241f48ba36eae2d789e 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 9ecb9ac3273ad48a926df101d8e01cf86f9054e7..d9c14caf4afa63593f516ba9012b3693eb6bfa25 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 3436185a8fc3500bc5ef54fbc58aea48f0f70c67..bdb6cf21b65667417739e13ec647cc4fd6f80252 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 de8c4052f1e6f1d90a689c28409bc72b58812d7e..ec844d040180bf981bc6f32be31cff1713efbfbe 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 e89c1936ffdd71c82a3989a5952a348d714c8073..27d43b93474806f889faca993b974dd04b6a5596 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 c42e93cbef494c925e003205d46fcacecc9d3be0..209873ffec86825be36dd95cfd8756d820d6688b 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__ */