rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / common / cmd_elf.c

diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index cc8a8daa707da54beea584f31a7b203b800d5a9a..3ebb6d9354436c88a1e6f008198b69dd4efc6074 100644 (file)
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -19,12 +19,10 @@
 #include <net.h>
 #include <elf.h>
 
-#if defined(CONFIG_WALNUT) || defined(CFG_VXWORKS_MAC_PTR)
+#if defined(CONFIG_WALNUT) || defined(CONFIG_SYS_VXWORKS_MAC_PTR)
 DECLARE_GLOBAL_DATA_PTR;
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_ELF) || defined(CONFIG_CMD_ELF)
-
 #ifndef MAX
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
@@ -32,6 +30,32 @@ DECLARE_GLOBAL_DATA_PTR;
 int valid_elf_image (unsigned long addr);
 unsigned long load_elf_image (unsigned long addr);
 
+/* Allow ports to override the default behavior */
+__attribute__((weak))
+unsigned long do_bootelf_exec (ulong (*entry)(int, char *[]), int argc, char *argv[])
+{
+       unsigned long ret;
+
+       /*
+        * QNX images require the data cache is disabled.
+        * Data cache is already flushed, so just turn it off.
+        */
+       int dcache = dcache_status ();
+       if (dcache)
+               dcache_disable ();
+
+       /*
+        * pass address parameter as argv[0] (aka command name),
+        * and all remaining args
+        */
+       ret = entry (argc, argv);
+
+       if (dcache)
+               dcache_enable ();
+
+       return ret;
+}
+
 /* ======================================================================
  * Interpreter command to boot an arbitrary ELF image from memory.
  * ====================================================================== */
@@ -55,18 +79,11 @@ int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        printf ("## Starting application at 0x%08lx ...\n", addr);
 
-       /*
-        * QNX images require the data cache is disabled.
-        * Data cache is already flushed, so just turn it off.
-        */
-       if (dcache_status ())
-               dcache_disable ();
-
        /*
         * pass address parameter as argv[0] (aka command name),
         * and all remaining args
         */
-       rc = ((ulong (*)(int, char *[])) addr) (--argc, &argv[1]);
+       rc = do_bootelf_exec ((void *)addr, argc - 1, argv + 1);
        if (rc != 0)
                rcode = 1;
 
@@ -101,7 +118,7 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        else
                addr = simple_strtoul (argv[1], NULL, 16);
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
        /* Check to see if we need to tftp the image ourselves before starting */
 
        if ((argc == 2) && (strcmp (argv[1], "tftp") == 0)) {
@@ -118,10 +135,10 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         */
 
 #if defined(CONFIG_WALNUT)
-       tmp = (char *) CFG_NVRAM_BASE_ADDR + 0x500;
+       tmp = (char *) CONFIG_SYS_NVRAM_BASE_ADDR + 0x500;
        memcpy ((char *) tmp, (char *) &gd->bd->bi_enetaddr[3], 3);
-#elif defined(CFG_VXWORKS_MAC_PTR)
-       tmp = (char *) CFG_VXWORKS_MAC_PTR;
+#elif defined(CONFIG_SYS_VXWORKS_MAC_PTR)
+       tmp = (char *) CONFIG_SYS_VXWORKS_MAC_PTR;
        memcpy ((char *) tmp, (char *) &gd->bd->bi_enetaddr[0], 6);
 #else
        puts ("## Ethernet MAC address not copied to NV RAM\n");
@@ -323,5 +340,3 @@ U_BOOT_CMD(
        "bootvx  - Boot vxWorks from an ELF image\n",
        " [address] - load address of vxWorks ELF image.\n"
 );
-
-#endif /* CFG_CMD_ELF */