From: Lei Wen <leiwen@marvell.com>
Date: Mon, 10 Jan 2011 10:21:15 +0000 (+0800)
Subject: bootm: replace blob_start with image_start
X-Git-Tag: v2011.06-rc1~175
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=02cf345973a7fe9986626448a089ed54f1a26d13;p=oweals%2Fu-boot.git

bootm: replace blob_start with image_start

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>
---

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 18019d6526..778f6a4296 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -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);