From: Scott Wood <scottwood@freescale.com>
Date: Fri, 21 Sep 2012 21:27:32 +0000 (-0500)
Subject: spl: introduce CONFIG_SPL_TARGET
X-Git-Tag: v2013.01-rc2~117^2~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ca2fca22351aa8d2f52e21f2dffb22b0c82170b6;p=oweals%2Fu-boot.git

spl: introduce CONFIG_SPL_TARGET

Currently the SPL target is specified in a CPU-specific makefile
fragment.  While some targets may need something more complicated than a
simple target name, targets which don't need this shouldn't have to provide a makefile fragment just for this.

Signed-off-by: Scott Wood <scottwood@freescale.com>
---
v2: Removed default target as it's been pointed out to me how existing platforms
cause the SPL to be built.
---

diff --git a/Makefile b/Makefile
index f2882a17c3..5f8b02c36a 100644
--- a/Makefile
+++ b/Makefile
@@ -407,6 +407,7 @@ ALL-y += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map
 ALL-$(CONFIG_NAND_U_BOOT) += $(obj)u-boot-nand.bin
 ALL-$(CONFIG_ONENAND_U_BOOT) += $(obj)u-boot-onenand.bin
 ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin
+ALL-$(CONFIG_SPL) += $(obj)$(subst ",,$(CONFIG_SPL_TARGET))
 ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin
 
 # enable combined SPL/u-boot/dtb rules for tegra
diff --git a/README b/README
index 2dc098462d..211bad03d5 100644
--- a/README
+++ b/README
@@ -2746,6 +2746,11 @@ FIT uImage format:
 		CONFIG_SPL_LIBGENERIC_SUPPORT
 		Support for lib/libgeneric.o in SPL binary
 
+		CONFIG_SPL_TARGET
+		Final target image containing SPL and payload.  Some SPLs
+		use an arch-specific makefile fragment instead, for
+		example if more than one image needs to be produced.
+
 Modem Support:
 --------------