summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Wen <leiwen@marvell.com>2011-01-10 18:21:15 +0800
committerWolfgang Denk <wd@denx.de>2011-04-11 21:10:44 +0200
commit02cf345973a7fe9986626448a089ed54f1a26d13 (patch)
treea0a29c18e79ad59ae685da330f947266583020ba
parenta4c3b40b33e41563077ea9ccbae7cac9d26ca38f (diff)
downloadu-boot-imx-02cf345973a7fe9986626448a089ed54f1a26d13.zip
u-boot-imx-02cf345973a7fe9986626448a089ed54f1a26d13.tar.gz
u-boot-imx-02cf345973a7fe9986626448a089ed54f1a26d13.tar.bz2
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>
-rw-r--r--common/cmd_bootm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 18019d6..778f6a4 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);