merged current version of git://git.denx.de/u-boot

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

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index d5745b14e2ce54427ce7153759b0f39a0bb8fa3f..be25fe0b1a4a5af788822658b0fbf86d523e1e03 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -746,6 +746,13 @@ static image_header_t *image_get_kernel(ulong img_addr, int verify)
                return NULL;
        }
 
+#if defined(CONFIG_MX51_BBG) || defined(CONFIG_MX51_3DS)
+       if (image_get_load(hdr) < 0x90000000)
+               image_set_load(hdr, image_get_load(hdr)+0x20000000);
+       if (image_get_ep(hdr) < 0x90000000)
+               image_set_ep(hdr, image_get_ep(hdr)+0x20000000);
+#endif
+
        show_boot_progress(3);
        image_print_contents(hdr);