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

[linux-2.6-omap-h63xx.git] / arch / arm / boot / Makefile

diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index 25f12303b1062d163fcbb846b7e8709e609a640b..da226abce2d0972c2a3cebc8a99276f294e57516 100644 (file)
--- 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'