Merge with rsync://git-user@source.denx.net/git/u-boot.git

[platform/kernel/u-boot.git] / common / cmd_elf.c

diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index f039724..eccf2e9 100644 (file)
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -78,10 +78,8 @@ 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)
+#if defined(CONFIG_WALNUT)     || \
+    defined(CFG_VXWORKS_MAC_PTR)
        DECLARE_GLOBAL_DATA_PTR;
 #endif
 
@@ -103,7 +101,7 @@ int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        if ((tmp = getenv ("loadaddr")) != NULL) {
                addr = simple_strtoul (tmp, NULL, 16);
        } else {
-               printf ("No load address provided\n");
+               puts ("No load address provided\n");
                return 1;
        }
 
@@ -123,17 +121,14 @@ 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(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
-       printf ("## Ethernet MAC address not copied to NV RAM\n");
+       puts ("## Ethernet MAC address not copied to NV RAM\n");
 #endif
 
        /*
@@ -200,7 +195,7 @@ int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                 * to just copy
                 */
 
-               printf ("No bootargs defined\n");
+               puts ("No bootargs defined\n");
                return 1;
 #endif
        }
@@ -214,7 +209,7 @@ int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        if (valid_elf_image (addr)) {
                addr = load_elf_image (addr);
        } else {
-               printf ("## Not an ELF image, assuming binary\n");
+               puts ("## Not an ELF image, assuming binary\n");
                /* leave addr as load_addr */
        }
 
@@ -224,7 +219,7 @@ int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        ((void (*)(void)) addr) ();
 
-       printf ("## vxWorks terminated\n");
+       puts ("## vxWorks terminated\n");
        return 1;
 }