lib_*/board.c: do not initialize bi_enet*addr in global data

Since everyone is using the environment for mac address storage, there is
no point in seeding the global data.

The arches that are converted here:
	i386
	m68k
	microblaze
	mips
	nios
	nios2
	sh
	sparc

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/lib_i386/board.c b/lib_i386/board.c
index 1734f86cdf5fd2051b6f34df29bc701f587f3d51..29683ee26959ec2b76b2db06194c05eb5d8a7ab3 100644 (file)
--- a/lib_i386/board.c
+++ b/lib_i386/board.c
@@ -262,23 +262,6 @@ void start_i386boot (void)
        /* IP Address */
        bd_data.bi_ip_addr = getenv_IPaddr ("ipaddr");
 
-       /* MAC Address */
-       {
-               int i;
-               ulong reg;
-               char *s, *e;
-               char tmp[64];
-
-               i = getenv_r ("ethaddr", tmp, sizeof (tmp));
-               s = (i > 0) ? tmp : NULL;
-
-               for (reg = 0; reg < 6; ++reg) {
-                       bd_data.bi_enetaddr[reg] = s ? simple_strtoul (s, &e, 16) : 0;
-                       if (s)
-                               s = (*e) ? e + 1 : e;
-               }
-       }
-
 #if defined(CONFIG_PCI)
        /*
         * Do pci configuration

diff --git a/lib_m68k/board.c b/lib_m68k/board.c
index 583ce1072c182d084e6c5d4b89aa9f0bbff7b7c6..db45b00b1e3eacef5884d8074b3bc7716027e455 100644 (file)
--- a/lib_m68k/board.c
+++ b/lib_m68k/board.c
@@ -584,44 +584,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
         * where had to use getenv_r(), which can be pretty slow when
         * the environment is in EEPROM.
         */
-       s = getenv ("ethaddr");
-       for (i = 0; i < 6; ++i) {
-               bd->bi_enetaddr[i] = s ? simple_strtoul (s, &e, 16) : 0;
-               if (s)
-                       s = (*e) ? e + 1 : e;
-       }
-#ifdef CONFIG_HAS_ETH1
-       /* handle the 2nd ethernet address */
-
-       s = getenv ("eth1addr");
-       for (i = 0; i < 6; ++i) {
-               bd->bi_enet1addr[i] = s ? simple_strtoul (s, &e, 16) : 0;
-               if (s)
-                       s = (*e) ? e + 1 : e;
-       }
-#endif
-#ifdef CONFIG_HAS_ETH2
-       /* handle the 3rd ethernet address */
-
-       s = getenv ("eth2addr");
-       for (i = 0; i < 6; ++i) {
-               bd->bi_enet2addr[i] = s ? simple_strtoul (s, &e, 16) : 0;
-               if (s)
-                       s = (*e) ? e + 1 : e;
-       }
-#endif
-
-#ifdef CONFIG_HAS_ETH3
-       /* handle 4th ethernet address */
-       s = getenv("eth3addr");
-       for (i = 0; i < 6; ++i) {
-               bd->bi_enet3addr[i] = s ? simple_strtoul (s, &e, 16) : 0;
-               if (s)
-                       s = (*e) ? e + 1 : e;
-       }
-#endif
-
-       /* IP Address */
        bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
 
        WATCHDOG_RESET ();

diff --git a/lib_microblaze/board.c b/lib_microblaze/board.c
index 30d7641868d8140b77bab31cc1f8a178ef5b8aa0..1a426400ecd7b29273883a04f8ef75fc43631e8f 100644 (file)
--- a/lib_microblaze/board.c
+++ b/lib_microblaze/board.c
@@ -173,14 +173,6 @@ void board_init (void)
 #endif
 
 #if defined(CONFIG_CMD_NET)
-       /* board MAC address */
-       s = getenv ("ethaddr");
-       printf ("MAC:%s\n",s);
-       for (i = 0; i < 6; ++i) {
-               bd->bi_enetaddr[i] = s ? simple_strtoul (s, &e, 16) : 0;
-               if (s)
-                       s = (*e) ? e + 1 : e;
-       }
        /* IP Address */
        bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
        eth_init (bd);

diff --git a/lib_mips/board.c b/lib_mips/board.c
index dfe683161fd30879305efb6a0c20ced1b73d5dc7..6fc4845eb680059683145faa85caf217323b6633 100644 (file)
--- a/lib_mips/board.c
+++ b/lib_mips/board.c
@@ -401,14 +401,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
        /* relocate environment function pointers etc. */
        env_relocate();
 
-       /* board MAC address */
-       s = getenv ("ethaddr");
-       for (i = 0; i < 6; ++i) {
-               bd->bi_enetaddr[i] = s ? simple_strtoul (s, &e, 16) : 0;
-               if (s)
-                       s = (*e) ? e + 1 : e;
-       }
-
        /* IP Address */
        bd->bi_ip_addr = getenv_IPaddr("ipaddr");
 

diff --git a/lib_nios/board.c b/lib_nios/board.c
index 024beb51503833a487df0d52e62d8471a829b912..63e79aec28ea98d44f5b5d1044582eba87934c34 100644 (file)
--- a/lib_nios/board.c
+++ b/lib_nios/board.c
@@ -151,11 +151,6 @@ void board_init (void)
        env_relocate();
 
        bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
-       s = getenv ("ethaddr");
-       for (i = 0; i < 6; ++i) {
-               bd->bi_enetaddr[i] = s ? simple_strtoul (s, &e, 16) : 0;
-               if (s) s = (*e) ? e + 1 : e;
-       }
 
        WATCHDOG_RESET ();
        devices_init();

diff --git a/lib_nios2/board.c b/lib_nios2/board.c
index d759f0fd8042362dc43117ee2e00aa9f0750397d..70fad1b87029f2c54c05f248b9b2b48bf3003746 100644 (file)
--- a/lib_nios2/board.c
+++ b/lib_nios2/board.c
@@ -157,11 +157,6 @@ void board_init (void)
        env_relocate();
 
        bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
-       s = getenv ("ethaddr");
-       for (i = 0; i < 6; ++i) {
-               bd->bi_enetaddr[i] = s ? simple_strtoul (s, &e, 16) : 0;
-               if (s) s = (*e) ? e + 1 : e;
-       }
 
        WATCHDOG_RESET ();
        devices_init();

diff --git a/lib_sh/board.c b/lib_sh/board.c
index d4cc85cad140faf58a95f9b38c3bbada2667ea27..2fd213ba3dd1fd7c4aae3c766ab239535ee2bc37 100644 (file)
--- a/lib_sh/board.c
+++ b/lib_sh/board.c
@@ -125,17 +125,7 @@ static int sh_mem_env_init(void)
 static int sh_net_init(void)
 {
        DECLARE_GLOBAL_DATA_PTR;
-       char *s, *e;
-       int i;
-
        gd->bd->bi_ip_addr = getenv_IPaddr("ipaddr");
-       s = getenv("ethaddr");
-       for (i = 0; i < 6; ++i) {
-               gd->bd->bi_enetaddr[i] = s ? simple_strtoul(s, &e, 16) : 0;
-               if (s)
-                       s = (*e) ? e + 1 : e;
-       }
-
        return 0;
 }
 #endif

diff --git a/lib_sparc/board.c b/lib_sparc/board.c
index e972d3e2c6be8dadf8ef0a53daf9d518cfeea2ad..2f3e6733b60af00a06baedb6477a9c305924d940 100644 (file)
--- a/lib_sparc/board.c
+++ b/lib_sparc/board.c
@@ -390,25 +390,6 @@ void board_init_f(ulong bootflag)
        board_late_init();
 #endif
 
-       s = getenv("ethaddr");
-       for (i = 0; i < 6; ++i) {
-               bd->bi_enetaddr[i] = s ? simple_strtoul(s, &e, 16) : 0;
-               if (s)
-                       s = (*e) ? e + 1 : e;
-       }
-
-#ifdef CONFIG_HAS_ETH1
-       /* handle the 2nd ethernet address */
-
-       s = getenv("eth1addr");
-
-       for (i = 0; i < 6; ++i) {
-               bd->bi_enet1addr[i] = s ? simple_strtoul(s, &e, 16) : 0;
-               if (s)
-                       s = (*e) ? e + 1 : e;
-       }
-#endif
-
 #ifdef CONFIG_ID_EEPROM
        mac_read_from_eeprom();
 #endif