summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2014-10-30 09:59:59 +0100
committerTom Rini <trini@ti.com>2014-11-17 08:47:16 -0500
commitc001486d99ea18b94f952507be346c41ebf809f4 (patch)
treecfaecb1c6a3a5a78807aad2f87d5ccb4cc2ca3eb
parentda79fa4d7736601b1e484dc23838f6976b1d761b (diff)
downloadblackbird-obmc-uboot-c001486d99ea18b94f952507be346c41ebf809f4.tar.gz
blackbird-obmc-uboot-c001486d99ea18b94f952507be346c41ebf809f4.zip
arm, at91: generate boot.bin file for all atmel SoC
generate the boot.bin file for all atmel SoC (arm920, arm926, armv7) Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com> Reviewed-by: Masahiro Yamada <yamada.m@jp.panasonic.com> [fix subject] Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
-rw-r--r--arch/arm/cpu/armv7/at91/config.mk4
-rw-r--r--scripts/Makefile.spl4
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv7/at91/config.mk b/arch/arm/cpu/armv7/at91/config.mk
index 09eab70955..db6030880f 100644
--- a/arch/arm/cpu/armv7/at91/config.mk
+++ b/arch/arm/cpu/armv7/at91/config.mk
@@ -3,8 +3,6 @@
#
# SPDX-License-Identifier: GPL-2.0+
#
-ifdef CONFIG_SPL_BUILD
-ALL-y += boot.bin
-else
+ifndef CONFIG_SPL_BUILD
ALL-y += u-boot.img
endif
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 7afe437e62..07db0bff8d 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -181,6 +181,10 @@ ALL-y += $(obj)/sunxi-spl.bin
endif
endif
+ifeq ($(CONFIG_SYS_SOC),"at91")
+ALL-y += boot.bin
+endif
+
all: $(ALL-y)
ifdef CONFIG_SAMSUNG
OpenPOWER on IntegriCloud