]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
bootm: replace blob_start with image_start
authorLei Wen <leiwen@marvell.com>
Mon, 10 Jan 2011 10:21:15 +0000 (18:21 +0800)
committerWolfgang Denk <wd@denx.de>
Mon, 11 Apr 2011 19:10:44 +0000 (21:10 +0200)
For uImage always has a 64 bytes header, we couldn't expect to do
the xip from the header but should xip from the image start.

The latter logic in that section is also move the image from image_start
to the load address, so sync this logic to the xip operation.

Signed-off-by: Lei Wen <leiwen@marvell.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
common/cmd_bootm.c

index 18019d65263ca55086f8b2a412cd0e0de9fcf36f..778f6a429623f7f63c76c039c5cc163f190491e8 100644 (file)
@@ -344,7 +344,7 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
 
        switch (comp) {
        case IH_COMP_NONE:
-               if (load == blob_start) {
+               if (load == blob_start || load == image_start) {
                        printf ("   XIP %s ... ", type_name);
                } else {
                        printf ("   Loading %s ... ", type_name);