diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-02-11 19:36:20 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-03-20 22:39:11 +0100 |
| commit | 0107cf66f7346e8c7d6cf0fe99d2f265134afd59 (patch) | |
| tree | c1e55d8bda28e709db5522892d26d683f9acc9dd /board/nx823/flash.c | |
| parent | 19b5b533ccd522abeb501d510750693c35e20456 (diff) | |
| download | blackbird-obmc-uboot-0107cf66f7346e8c7d6cf0fe99d2f265134afd59.tar.gz blackbird-obmc-uboot-0107cf66f7346e8c7d6cf0fe99d2f265134afd59.zip | |
nx823: get mac address from environment
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.
For the nx823, the serial number is moved out of load_sernum_ethaddr() and
into misc_init_r() as is the env setup. This lets us kill off the former
function in the process.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'board/nx823/flash.c')
| -rw-r--r-- | board/nx823/flash.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/board/nx823/flash.c b/board/nx823/flash.c index 194d841e4e..336e70412b 100644 --- a/board/nx823/flash.c +++ b/board/nx823/flash.c @@ -27,8 +27,9 @@ #include <common.h> #include <mpc8xx.h> +DECLARE_GLOBAL_DATA_PTR; + flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */ -extern u_long *my_sernum; /* from nx823.c */ /*----------------------------------------------------------------------- * Protection Flags: @@ -346,7 +347,7 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) if (addr >= CONFIG_SYS_FLASH_SN_SECTOR && addr < CONFIG_SYS_FLASH_SN_BASE) { u_long dest = CONFIG_SYS_FLASH_SN_BASE; - u_short *sn = (u_short *)my_sernum; + u_short *sn = (u_short *)gd->bd->bi_sernum; printf("(saving sernum)"); for (i=0; i<4; i++) |
