aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-23 08:02:24 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-02-23 14:06:27 +0000
commit938f94cde74b33d6d3580c6fe65ebe918a770ae2 (patch)
treedeabdaa159618a1b8219fb75caa1c56635c4b8c8 /arch/arm/boot/Makefile
parentb44bf43b20cd4ff5009aead83e2c8a78fac3d189 (diff)
downloadlinux-linaro-stable-938f94cde74b33d6d3580c6fe65ebe918a770ae2.tar.gz
ARM: 7656/1: uImage: Error out on build of multiplatform without LOADADDR
On multiplatform kernels, $MACHINE will be empty so there will be no default LOADADDR. Fail to build the uImage target unless one is provided by the developer at build time. Signed-off-by: Olof Johansson <olof@lixom.net> Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot/Makefile')
-rw-r--r--arch/arm/boot/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index abfce280f57b..71768b8a1ab9 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -68,8 +68,8 @@ else
endif
check_for_multiple_loadaddr = \
-if [ $(words $(UIMAGE_LOADADDR)) -gt 1 ]; then \
- echo 'multiple load addresses: $(UIMAGE_LOADADDR)'; \
+if [ $(words $(UIMAGE_LOADADDR)) -ne 1 ]; then \
+ echo 'multiple (or no) load addresses: $(UIMAGE_LOADADDR)'; \
echo 'This is incompatible with uImages'; \
echo 'Specify LOADADDR on the commandline to build an uImage'; \
false; \