summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-02-11 18:27:18 -0500
committerWolfgang Denk <wd@denx.de>2009-03-20 22:39:11 +0100
commit19b5b533ccd522abeb501d510750693c35e20456 (patch)
tree2477e2b01fa106d3095b2010976eb5b4587a7fe5
parent740e8ba7d475c49c1b76058e1bf354e376b5c4e0 (diff)
downloadu-boot-19b5b533ccd522abeb501d510750693c35e20456.tar.gz
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>
-rw-r--r--lib_i386/board.c17
-rw-r--r--lib_m68k/board.c38
-rw-r--r--lib_microblaze/board.c8
-rw-r--r--lib_mips/board.c8
-rw-r--r--lib_nios/board.c5
-rw-r--r--lib_nios2/board.c5
-rw-r--r--lib_sh/board.c10
-rw-r--r--lib_sparc/board.c19
8 files changed, 0 insertions, 110 deletions
diff --git a/lib_i386/board.c b/lib_i386/board.c
index 1734f86cdf..29683ee269 100644
--- 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 583ce1072c..db45b00b1e 100644
--- 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 30d7641868..1a426400ec 100644
--- 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 dfe683161f..6fc4845eb6 100644
--- 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 024beb5150..63e79aec28 100644
--- 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 d759f0fd80..70fad1b870 100644
--- 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 d4cc85cad1..2fd213ba3d 100644
--- 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 e972d3e2c6..2f3e6733b6 100644
--- 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