Commit cd227fbf authored Aug 17, 2011 by Sascha Hauer Committed by Russell King Oct 17, 2011

ARM: 7021/1: Check for multiple load addresses before building a uImage



uImages need a load address specified. This makes them
incompatible with multiple zreladdrs. Catch this error
before building an uImage so that we do not end up with
broken uImages. The load address can still be specified
with LOADADDR= on the command line.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 60aac932

arch/arm/boot/Makefile

+9 −0

Original line number	Diff line number	Diff line
		@@ -78,7 +78,16 @@ endif

		$(obj)/uImage: STARTADDR=$(LOADADDR)

		check_for_multiple_loadaddr = \
		if [ $(words $(LOADADDR)) -gt 1 ]; then \
		echo 'multiple load addresses: $(LOADADDR)'; \
		echo 'This is incompatible with uImages'; \
		echo 'Specify LOADADDR on the commandline to build an uImage'; \
		false; \
		fi

		$(obj)/uImage: $(obj)/zImage FORCE
		@$(check_for_multiple_loadaddr)
		$(call if_changed,uimage)
		@echo ' Image $@ is ready'