rename CFG_ macros to CONFIG_SYS

[people/ms/u-boot.git] / lib_m68k / bootm.c

diff --git a/lib_m68k/bootm.c b/lib_m68k/bootm.c
index 1c3b9c92192e75e1a955e552da54d2c08fe2008c..a73f6ebb99d4d0f3bb0f297fe4a1ae3002ef6c39 100644 (file)
--- a/lib_m68k/bootm.c
+++ b/lib_m68k/bootm.c
@@ -42,11 +42,8 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static ulong get_sp (void);
 static void set_clocks_in_mhz (bd_t *kbd);
-extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
-void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
-                   int argc, char *argv[],
-                   bootm_headers_t *images)
+int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 {
        ulong sp;
 
@@ -67,7 +64,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
         *
         * Allocate space for command line and board info - the
         * address should be as high as possible within the reach of
-        * the kernel (see CFG_BOOTMAPSZ settings), but in unused
+        * the kernel (see CONFIG_SYS_BOOTMAPSZ settings), but in unused
         * memory, which means far enough below the current stack
         * pointer.
         */
@@ -76,7 +73,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
 
        /* adjust sp by 1K to be safe */
        sp -= 1024;
-       lmb_reserve(lmb, sp, (CFG_SDRAM_BASE + gd->ram_size - sp));
+       lmb_reserve(lmb, sp, (CONFIG_SYS_SDRAM_BASE + gd->ram_size - sp));
 
        /* allocate space and init command line */
        ret = boot_get_cmdline (lmb, &cmd_start, &cmd_end, bootmap_base);
@@ -116,11 +113,8 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,
         */
        (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
        /* does not return */
-       return ;
-
 error:
-       do_reset (cmdtp, flag, argc, argv);
-       return ;
+       return 1;
 }
 
 static ulong get_sp (void)