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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Uwe Kleine-König and committed by

Russell King 18 years ago 0f980146 cbfc0f04

+7 -1

1 changed file

expand all

arch

arm

boot

Makefile

+7 -1

arch/arm/boot/Makefile

··· 61 61 62 62 quiet_cmd_uimage = UIMAGE $@ 63 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 65 -n 'Linux-$(KERNELRELEASE)' -d $< $@ 66 + 67 + ifeq ($(CONFIG_ZBOOT_ROM),y) 68 + $(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT) 69 + else 70 + $(obj)/uImage: LOADADDR=$(ZRELADDR) 71 + endif 66 72 67 73 $(obj)/uImage: $(obj)/zImage FORCE 68 74 $(call if_changed,uimage)