From: Heiko Schocher <hs@denx.de>
Date: Thu, 30 Oct 2014 08:59:59 +0000 (+0100)
Subject: arm, at91: generate boot.bin file for all atmel SoC
X-Git-Tag: v2015.01-rc2~70
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c001486d99ea18b94f952507be346c41ebf809f4;p=u-boot

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>
---

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