[U-Boot] [PATCH v2 3/5] Makefile: Provide an option to select SPL or TPL

Simon Glass
2017-04-02T15:50:30Z

At present we have SPL_ which can be used in Makefiles to select between
normal and SPL CONFIGs like this:

obj-$(CONFIG_$(SPL_)DM) += core/

When TPL is being built, SPL_ has the value 'SPL' which is generally a
good idea since they tend to follow each other. But in extreme situations
we may want to distinugish between SPL and TPL. For example we may not
want to enable CONFIG_DM with TPL.

Add a new SPL_TPL_ variable which is set to either empty (for U-Boot
proper), 'SPL' or 'TPL'. This may prove useful with TPL-specific options.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

scripts/Kbuild.include | 6 ++++++
scripts/Makefile.spl | 6 ++++++
2 files changed, 12 insertions(+)

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 1b62aedb00..a3a5c59d0d 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -321,6 +321,12 @@ endif

ifdef CONFIG_SPL_BUILD
SPL_ := SPL_
+ifeq ($(CONFIG_TPL_BUILD),y)
+SPL_TPL_ := TPL_
+else
+SPL_TPL_ := SPL_
+endif
else
SPL_ :=
+SPL_TPL_ :=
endif
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index 5370648e85..4485ea8812 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -37,8 +37,14 @@ endif

ifdef CONFIG_SPL_BUILD
SPL_ := SPL_
+ifeq ($(CONFIG_TPL_BUILD),y)
+SPL_TPL_ := TPL_
+else
+SPL_TPL_ := SPL_
+endif
else
SPL_ :=
+SPL_TPL_ :=
endif

include $(srctree)/config.mk
--
2.12.2.564.g063fe858b8-goog