Merge patch series "mtd: spi-nor: Remove recently added nor->addr_width == 3 test"

[J-u-boot.git] / boot / bootm.c

diff --git a/boot/bootm.c b/boot/bootm.c
index ddede08979a684b8594df004e8b44c9a32f25711..16a43d519a8aa968c77e9a3903e579348f3feb25 100644 (file)
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -239,11 +239,6 @@ static int boot_get_kernel(const char *addr_fit, struct bootm_headers *images,
        return 0;
 }
 
-#if !CONFIG_IS_ENABLED(LMB)
-#define lmb_reserve(base, size)
-static inline void boot_start_lmb(void) { }
-#endif
-
 static int bootm_start(void)
 {
        memset((void *)&images, 0, sizeof(images));
@@ -689,7 +684,7 @@ static int bootm_load_os(struct bootm_headers *images, int boot_progress)
 
                /* Handle BOOTM_STATE_LOADOS */
                if (relocated_addr != load) {
-                       printf("Moving Image from 0x%lx to 0x%lx, end=%lx\n",
+                       printf("Moving Image from 0x%lx to 0x%lx, end=0x%lx\n",
                               load, relocated_addr,
                               relocated_addr + image_size);
                        memmove((void *)relocated_addr, load_buf, image_size);
@@ -700,7 +695,9 @@ static int bootm_load_os(struct bootm_headers *images, int boot_progress)
                images->os.end = relocated_addr + image_size;
        }
 
-       lmb_reserve(images->os.load, (load_end - images->os.load));
+       if (CONFIG_IS_ENABLED(LMB))
+               lmb_reserve(images->os.load, (load_end - images->os.load));
+
        return 0;
 }