diff options
author | Jon Loeliger <jdl@freescale.com> | 2005-08-02 13:53:07 -0500 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2005-08-02 13:53:07 -0500 |
commit | 4b1d95d96a39a71eddd088bb5e0e9e699035c9bf (patch) | |
tree | 57e2d52b0636c7299992e869fa0b0ee4da7ca4d2 /common/cmd_elf.c | |
parent | de1d0a69956a63cea6a62043ae5d5afb584efe93 (diff) | |
parent | 095b8a3798f1c6cd618092899e783dc2ee0d23f5 (diff) | |
download | u-boot-imx-4b1d95d96a39a71eddd088bb5e0e9e699035c9bf.zip u-boot-imx-4b1d95d96a39a71eddd088bb5e0e9e699035c9bf.tar.gz u-boot-imx-4b1d95d96a39a71eddd088bb5e0e9e699035c9bf.tar.bz2 |
Merge with rsync://git-user@source.denx.net/git/u-boot.git
Diffstat (limited to 'common/cmd_elf.c')
-rw-r--r-- | common/cmd_elf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_elf.c b/common/cmd_elf.c index 37286e8..eccf2e9 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -78,7 +78,7 @@ int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) * ====================================================================== */ int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { -#if defined(CONFIG_WALNUT405) || \ +#if defined(CONFIG_WALNUT) || \ defined(CFG_VXWORKS_MAC_PTR) DECLARE_GLOBAL_DATA_PTR; #endif @@ -121,7 +121,7 @@ int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) * This will vary from board to board */ -#if defined(CONFIG_WALNUT405) +#if defined(CONFIG_WALNUT) tmp = (char *) CFG_NVRAM_BASE_ADDR + 0x500; memcpy ((char *) tmp, (char *) &gd->bd->bi_enetaddr[3], 3); #elif defined(CFG_VXWORKS_MAC_PTR) |