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 4683554040caaab119b5d4d6bda7799b279e3e66..3ebb6d9354436c88a1e6f008198b69dd4efc6074 100644 (file)
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -19,7 +19,7 @@
 #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
 
@@ -27,23 +27,34 @@ DECLARE_GLOBAL_DATA_PTR;
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
 
-static inline void bootelf_setup(int argc, char *argv[])
+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.
         */
-       if (dcache_status ())
+       int dcache = dcache_status ();
+       if (dcache)
                dcache_disable ();
 
-#ifdef CONFIG_BLACKFIN
-       if (icache_status ())
-               icache_disable ();
-#endif
-}
+       /*
+        * pass address parameter as argv[0] (aka command name),
+        * and all remaining args
+        */
+       ret = entry (argc, argv);
 
-int valid_elf_image (unsigned long addr);
-unsigned long load_elf_image (unsigned long addr);
+       if (dcache)
+               dcache_enable ();
+
+       return ret;
+}
 
 /* ======================================================================
  * Interpreter command to boot an arbitrary ELF image from memory.
@@ -68,13 +79,11 @@ int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        printf ("## Starting application at 0x%08lx ...\n", addr);
 
-       bootelf_setup(argc, argv);
-
        /*
         * 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;
 
@@ -126,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");