SPEAr: Change the default environment variables

[u-boot] / common / cmd_bootm.c

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 9ad2535d4bacc7fe6831c4c9838608ce5f16ffd2..45e726af8b8bc4870334d9ae48e39df02762e487 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -186,6 +186,7 @@ static void boot_start_lmb(bootm_headers_t *images)
        board_lmb_reserve(&images->lmb);
 }
 #else
+#define lmb_reserve(lmb, base, size)
 static inline void boot_start_lmb(bootm_headers_t *images) { }
 #endif
 
@@ -1586,7 +1587,6 @@ static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc,
 
 static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       ulong           iflag;
        bootm_headers_t images;
 
        if (bootz_start(cmdtp, flag, argc, argv, &images))
@@ -1597,7 +1597,7 @@ static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
         * overwrite all exception vector code, so we cannot easily
         * recover from any failures any more...
         */
-       iflag = disable_interrupts();
+       disable_interrupts();
 
 #if defined(CONFIG_CMD_USB)
        /*