From cf6bbe4c6114126eaab215ea84267c7aa7ab08a1 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Mon, 20 Oct 2014 17:45:57 +0900
Subject: [PATCH] kconfig: add CONFIG_SUPPORT_TPL

CONFIG_TPL should not be enabled for boards that do not have TPL.
CONFIG_SUPPORT_TPL introduced by this commit should be "select"ed
by boards with TPL support and CONFIG_TPL should depend on it.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
 Kconfig                          | 5 ++++-
 arch/powerpc/cpu/mpc85xx/Kconfig | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Kconfig b/Kconfig
index 29e0b929f51..932fc8b12af 100644
--- a/Kconfig
+++ b/Kconfig
@@ -73,6 +73,9 @@ config TPL_BUILD
 config SUPPORT_SPL
 	bool
 
+config SUPPORT_TPL
+	bool
+
 config SPL
 	bool
 	depends on SUPPORT_SPL
@@ -83,7 +86,7 @@ config SPL
 
 config TPL
 	bool
-	depends on SPL
+	depends on SPL && SUPPORT_TPL
 	prompt "Enable TPL" if !SPL_BUILD
 	default y if TPL_BUILD
 	default n
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 39d0ab001b1..7b42d06952c 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -28,6 +28,7 @@ config TARGET_BSC9132QDS
 config TARGET_C29XPCIE
 	bool "Support C29XPCIE"
 	select SUPPORT_SPL
+	select SUPPORT_TPL
 
 config TARGET_P3041DS
 	bool "Support P3041DS"
@@ -74,10 +75,12 @@ config TARGET_MPC8572DS
 config TARGET_P1010RDB
 	bool "Support P1010RDB"
 	select SUPPORT_SPL
+	select SUPPORT_TPL
 
 config TARGET_P1022DS
 	bool "Support P1022DS"
 	select SUPPORT_SPL
+	select SUPPORT_TPL
 
 config TARGET_P1023RDB
 	bool "Support P1023RDB"
@@ -85,10 +88,12 @@ config TARGET_P1023RDB
 config TARGET_P1_P2_RDB
 	bool "Support P1_P2_RDB"
 	select SUPPORT_SPL
+	select SUPPORT_TPL
 
 config TARGET_P1_P2_RDB_PC
 	bool "Support p1_p2_rdb_pc"
 	select SUPPORT_SPL
+	select SUPPORT_TPL
 
 config TARGET_P1_TWR
 	bool "Support p1_twr"
-- 
GitLab