From: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Date: Thu, 6 Mar 2008 15:22:33 +0000 (+0100)
Subject: [ARM] 4854/1: fix the load address of uImage for CONFIG_ZBOOT_ROM=y
X-Git-Tag: v2.6.26-rc1~1131^2~2^6~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f9801463b0aa9ac7253a250ec6bc37e6f77d31d;p=linux-2.6

[ARM] 4854/1: fix the load address of uImage for CONFIG_ZBOOT_ROM=y

U-Boot puts an image at the load address specified in the uImage
header before jumping to the entry point.

In the CONFIG_ZBOOT_ROM case ZBOOT_ROM_TEXT is the right load
address.

Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index 25f12303b1..da226abce2 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -61,9 +61,15 @@ endif
 
 quiet_cmd_uimage = UIMAGE  $@
       cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
-		   -C none -a $(ZRELADDR) -e $(ZRELADDR) \
+		   -C none -a $(LOADADDR) -e $(LOADADDR) \
 		   -n 'Linux-$(KERNELRELEASE)' -d $< $@
 
+ifeq ($(CONFIG_ZBOOT_ROM),y)
+$(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)
+else
+$(obj)/uImage: LOADADDR=$(ZRELADDR)
+endif
+
 $(obj)/uImage:	$(obj)/zImage FORCE
 	$(call if_changed,uimage)
 	@echo '  Image $@ is ready'