From 1cdf5d92cfa67b18c2b5e2557d5a47f8adf12166 Mon Sep 17 00:00:00 2001 From: stroese Date: Thu, 16 Dec 2004 17:37:54 +0000 Subject: [PATCH] code cleanup: use CFG_VXWORKS_MAC_PTR instead of multiple board defines --- common/cmd_elf.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/common/cmd_elf.c b/common/cmd_elf.c index eb0cc71fb3..37286e86a8 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -79,9 +79,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) || \ - defined(CONFIG_CPCI405) || \ - defined(CONFIG_OCRTC) || \ - defined(CONFIG_ORSG) + defined(CFG_VXWORKS_MAC_PTR) DECLARE_GLOBAL_DATA_PTR; #endif @@ -126,11 +124,8 @@ int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #if defined(CONFIG_WALNUT405) tmp = (char *) CFG_NVRAM_BASE_ADDR + 0x500; memcpy ((char *) tmp, (char *) &gd->bd->bi_enetaddr[3], 3); -#elif defined(CONFIG_CPCI405) - tmp = (char *) CFG_NVRAM_BASE_ADDR + CFG_NVRAM_VXWORKS_OFFS; - memcpy ((char *) tmp, (char *) &gd->bd->bi_enetaddr[0], 6); -#elif defined(CONFIG_OCRTC) || defined(CONFIG_ORSG) - tmp = (char *) CFG_ETHERNET_MAC_ADDR; +#elif defined(CFG_VXWORKS_MAC_PTR) + tmp = (char *) CFG_VXWORKS_MAC_PTR; memcpy ((char *) tmp, (char *) &gd->bd->bi_enetaddr[0], 6); #else puts ("## Ethernet MAC address not copied to NV RAM\n"); -- 2.39.2