From 2060426d141999483e68c20cebc0b7aa8f16554f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <Uwe.Kleine-Koenig@digi.com>
Date: Thu, 6 Mar 2008 16:22:33 +0100
Subject: [PATCH] --- yaml --- r: 91161 b: refs/heads/master c:
 0f9801463b0aa9ac7253a250ec6bc37e6f77d31d h: refs/heads/master i:   91159:
 caf00de5d113a9de868da3da6724f1578f77749e v: v3

---
 [refs]                       | 2 +-
 trunk/arch/arm/boot/Makefile | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4829f32854a4..34a490cd3875 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbfc0f04069a426f3c8b4b35021117f6833df9ca
+refs/heads/master: 0f9801463b0aa9ac7253a250ec6bc37e6f77d31d
diff --git a/trunk/arch/arm/boot/Makefile b/trunk/arch/arm/boot/Makefile
index 25f12303b106..da226abce2d0 100644
--- a/trunk/arch/arm/boot/Makefile
+++ b/trunk/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'