Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f980146 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Russell King
Browse files

[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: default avatarUwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cbfc0f04

arch/arm/boot/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -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'