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 /board/sandburst/common | |
| parent | f11e6ff5b1859d9213f0d501b3309e065f487543 (diff) | |
| download | talos-obmc-uboot-d8d21e699d7fcfb6ab11635110266dd09b7edc62.tar.gz talos-obmc-uboot-d8d21e699d7fcfb6ab11635110266dd09b7edc62.zip | |
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 'board/sandburst/common')
| -rw-r--r-- | board/sandburst/common/sb_common.c | 4 | ||||
| -rw-r--r-- | board/sandburst/common/sb_common.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/board/sandburst/common/sb_common.c b/board/sandburst/common/sb_common.c index f6ea16f0a5..b8160c8427 100644 --- a/board/sandburst/common/sb_common.c +++ b/board/sandburst/common/sb_common.c @@ -394,9 +394,8 @@ int is_pci_host(struct pci_controller *hose) * mgmt mac address. * ************************************************************************/ -static int macaddr_idx = 0; -void board_get_enetaddr (uchar * enet) +void board_get_enetaddr(int macaddr_idx, uchar *enet) { int i; unsigned short tmp; @@ -419,7 +418,6 @@ void board_get_enetaddr (uchar * enet) tmp += 31; memcpy(&enet[4], &tmp, 2); - macaddr_idx++; } else { enet[0] = 0x02; enet[1] = 0x00; diff --git a/board/sandburst/common/sb_common.h b/board/sandburst/common/sb_common.h index 888e4f01eb..e652ba8ed8 100644 --- a/board/sandburst/common/sb_common.h +++ b/board/sandburst/common/sb_common.h @@ -72,5 +72,6 @@ int sbcommon_get_master(void); int sbcommon_secondary_present(void); unsigned short sbcommon_get_serial_number(void); void sbcommon_fans(void); +void board_get_enetaddr(int macaddr_idx, uchar *enet); #endif /* __SBCOMMON_H__ */ |
