diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-02-16 18:03:14 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-03-20 22:39:12 +0100 |
| commit | d8d21e699d7fcfb6ab11635110266dd09b7edc62 (patch) | |
| tree | ec591b9aaf82e817558bde954ba6dc616bc908fd /lib_ppc | |
| parent | f11e6ff5b1859d9213f0d501b3309e065f487543 (diff) | |
boards: move board_get_enetaddr() into board-specific init
The environment is the canonical storage location of the mac address, so
we're killing off the global data location and moving everything to
querying the env directly.
Rather than have the common ppc code have board-specific hooks, move the
board_get_enetaddr() function into the board-specific init functions.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'lib_ppc')
| -rw-r--r-- | lib_ppc/board.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c index b1612ff01..dc5be3bd0 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -879,14 +879,6 @@ void board_init_r (gd_t *id, ulong dest_addr) #endif s = getenv ("ethaddr"); -#if defined (CONFIG_MBX) || \ - defined (CONFIG_RPXCLASSIC) || \ - defined(CONFIG_IAD210) || \ - defined(CONFIG_V38B) - if (s == NULL) - board_get_enetaddr (bd->bi_enetaddr); - else -#endif for (i = 0; i < 6; ++i) { bd->bi_enetaddr[i] = s ? simple_strtoul (s, &e, 16) : 0; if (s) @@ -914,11 +906,6 @@ void board_init_r (gd_t *id, ulong dest_addr) /* handle the 3rd ethernet address */ s = getenv ("eth2addr"); -#if defined(CONFIG_XPEDITE1K) || defined(CONFIG_METROBOX) || defined(CONFIG_KAREF) - if (s == NULL) - board_get_enetaddr(bd->bi_enet2addr); - else -#endif for (i = 0; i < 6; ++i) { bd->bi_enet2addr[i] = s ? simple_strtoul (s, &e, 16) : 0; if (s) @@ -929,11 +916,6 @@ void board_init_r (gd_t *id, ulong dest_addr) #ifdef CONFIG_HAS_ETH3 /* handle 4th ethernet address */ s = getenv("eth3addr"); -#if defined(CONFIG_XPEDITE1K) || defined(CONFIG_METROBOX) || defined(CONFIG_KAREF) - if (s == NULL) - board_get_enetaddr(bd->bi_enet3addr); - else -#endif for (i = 0; i < 6; ++i) { bd->bi_enet3addr[i] = s ? simple_strtoul (s, &e, 16) : 0; if (s) @@ -944,11 +926,6 @@ void board_init_r (gd_t *id, ulong dest_addr) #ifdef CONFIG_HAS_ETH4 /* handle 5th ethernet address */ s = getenv("eth4addr"); -#if defined(CONFIG_XPEDITE1K) || defined(CONFIG_METROBOX) || defined(CONFIG_KAREF) - if (s == NULL) - board_get_enetaddr(bd->bi_enet4addr); - else -#endif for (i = 0; i < 6; ++i) { bd->bi_enet4addr[i] = s ? simple_strtoul (s, &e, 16) : 0; if (s) @@ -959,11 +936,6 @@ void board_init_r (gd_t *id, ulong dest_addr) #ifdef CONFIG_HAS_ETH5 /* handle 6th ethernet address */ s = getenv("eth5addr"); -#if defined(CONFIG_XPEDITE1K) || defined(CONFIG_METROBOX) || defined(CONFIG_KAREF) - if (s == NULL) - board_get_enetaddr(bd->bi_enet5addr); - else -#endif for (i = 0; i < 6; ++i) { bd->bi_enet5addr[i] = s ? simple_strtoul (s, &e, 16) : 0; if (s) |