diff options
| author | Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> | 2008-03-06 16:22:33 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 11:28:07 +0100 |
| commit | 0f9801463b0aa9ac7253a250ec6bc37e6f77d31d (patch) | |
| tree | 54a36670fb46c08e5aeb2dde5b3dc95cb80b90ee /arch/arm/boot | |
| parent | cbfc0f04069a426f3c8b4b35021117f6833df9ca (diff) | |
| download | linux-0f9801463b0aa9ac7253a250ec6bc37e6f77d31d.tar.gz linux-0f9801463b0aa9ac7253a250ec6bc37e6f77d31d.tar.bz2 linux-0f9801463b0aa9ac7253a250ec6bc37e6f77d31d.zip | |
[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 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' |