summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-08-17 14:23:46 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-10-17 09:12:40 +0100
commitcd227fbffa9e971ee80065de772d3201c73e1670 (patch)
tree8ddb2e622c2c5ce1b6527a69d5782ed2d62279d0 /arch/arm
parent60aac93283823b44644c92d0803d821b9d2d987a (diff)
downloadblackbird-op-linux-cd227fbffa9e971ee80065de772d3201c73e1670.tar.gz
blackbird-op-linux-cd227fbffa9e971ee80065de772d3201c73e1670.zip
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/Makefile9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index a1edfd5a129a..176062ac7f07 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -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'
OpenPOWER on IntegriCloud