diff options
author | Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> | 2008-03-06 10:22:33 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 06:28:07 -0400 |
commit | 0f9801463b0aa9ac7253a250ec6bc37e6f77d31d (patch) | |
tree | 54a36670fb46c08e5aeb2dde5b3dc95cb80b90ee /arch/arm/boot | |
parent | cbfc0f04069a426f3c8b4b35021117f6833df9ca (diff) |
[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>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index 25f12303b106..da226abce2d0 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile | |||
@@ -61,9 +61,15 @@ endif | |||
61 | 61 | ||
62 | quiet_cmd_uimage = UIMAGE $@ | 62 | quiet_cmd_uimage = UIMAGE $@ |
63 | cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \ | 63 | cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \ |
64 | -C none -a $(ZRELADDR) -e $(ZRELADDR) \ | 64 | -C none -a $(LOADADDR) -e $(LOADADDR) \ |
65 | -n 'Linux-$(KERNELRELEASE)' -d $< $@ | 65 | -n 'Linux-$(KERNELRELEASE)' -d $< $@ |
66 | 66 | ||
67 | ifeq ($(CONFIG_ZBOOT_ROM),y) | ||
68 | $(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT) | ||
69 | else | ||
70 | $(obj)/uImage: LOADADDR=$(ZRELADDR) | ||
71 | endif | ||
72 | |||
67 | $(obj)/uImage: $(obj)/zImage FORCE | 73 | $(obj)/uImage: $(obj)/zImage FORCE |
68 | $(call if_changed,uimage) | 74 | $(call if_changed,uimage) |
69 | @echo ' Image $@ is ready' | 75 | @echo ' Image $@ is ready' |