Skip to contentSkip to conversation

Introduce CONFIG_SUPPORT_SPL/TPL

PATCH Superseded Masahiro Yamada 2 participants 6 messages Sep 25, 2014 – Oct 11, 2014

Subsystems (4)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

cover Introduce CONFIG_SUPPORT_SPL/TPL

Masahiro Yamada (2):
kconfig: add CONFIG_SUPPORT_SPL
kconfig: add CONFIG_SUPPORT_TPL

 Kconfig                                |  9 ++++++-
 arch/arm/Kconfig                       | 44 ++++++++++++++++++++++++++++++++++
 arch/arm/cpu/arm926ejs/davinci/Kconfig |  4 ++++
 arch/arm/cpu/armv7/exynos/Kconfig      |  7 ++++++
 arch/arm/cpu/armv7/omap3/Kconfig       | 16 +++++++++++++
 arch/microblaze/Kconfig                |  1 +
 arch/powerpc/cpu/mpc5xxx/Kconfig       |  1 +
 arch/powerpc/cpu/mpc83xx/Kconfig       |  1 +
 arch/powerpc/cpu/mpc85xx/Kconfig       | 17 +++++++++++++
 arch/powerpc/cpu/ppc4xx/Kconfig        |  1 +
 10 files changed, 100 insertions(+), 1 deletion(-)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/2 kconfig: add CONFIG_SUPPORT_SPL

CONFIG_SPL should not be enabled for boards that do not have SPL. CONFIG_SUPPORT_SPL introduced by this commit should be "select"ed by boards with SPL support and CONFIG_SPL should depend on it.

---

 Kconfig                                |  4 ++++
 arch/arm/Kconfig                       | 44 ++++++++++++++++++++++++++++++++++
 arch/arm/cpu/arm926ejs/davinci/Kconfig |  4 ++++
 arch/arm/cpu/armv7/exynos/Kconfig      |  7 ++++++
 arch/arm/cpu/armv7/omap3/Kconfig       | 16 +++++++++++++
 arch/microblaze/Kconfig                |  1 +
 arch/powerpc/cpu/mpc5xxx/Kconfig       |  1 +
 arch/powerpc/cpu/mpc83xx/Kconfig       |  1 +
 arch/powerpc/cpu/mpc85xx/Kconfig       | 12 ++++++++++
 arch/powerpc/cpu/ppc4xx/Kconfig        |  1 +
 10 files changed, 91 insertions(+)
Kconfig +4 -0
index e0c8992..29e0b92 100644
@@ -70,8 +70,12 @@ config TPL_BUILD
 	depends on $KCONFIG_OBJDIR="tpl"
 	default y
 
+config SUPPORT_SPL
+	bool
+
 config SPL
 	bool
+	depends on SUPPORT_SPL
 	prompt "Enable SPL" if !SPL_BUILD
 	default y if SPL_BUILD
 	help
arch/arm/Kconfig +44 -0

221 lines not on this page · raw message

arch/arm/cpu/arm926ejs/davinci/Kconfig +4 -0
index 4c18ab6..1791cef 100644
@@ -8,18 +8,22 @@ config TARGET_ENBW_CMC
 
 config TARGET_IPAM390
 	bool "IPAM390 board"
+	select SUPPORT_SPL
 
 config TARGET_DA830EVM
 	bool "DA830 EVM board"
 
 config TARGET_DA850EVM
 	bool "DA850 EVM board"
+	select SUPPORT_SPL
 
 config TARGET_CAM_ENC_4XX
 	bool "CAM ENC 4xx board"
+	select SUPPORT_SPL
 
 config TARGET_HAWKBOARD
 	bool "Hawkboard"
+	select SUPPORT_SPL
 
 config TARGET_DAVINCI_DM355EVM
 	bool "DM355 EVM board"
arch/arm/cpu/armv7/exynos/Kconfig +7 -0
index e7c93d8..72d90e7 100644
@@ -4,6 +4,7 @@ choice
 	prompt "EXYNOS board select"
 
 config TARGET_SMDKV310
+	select SUPPORT_SPL
 	bool "Exynos4210 SMDKV310 board"
 
 config TARGET_TRATS
@@ -14,6 +15,7 @@ config TARGET_S5PC210_UNIVERSAL
 
 config TARGET_ORIGEN
 	bool "Exynos4412 Origen board"
+	select SUPPORT_SPL
 
 config TARGET_TRATS2
 	bool "Exynos4412 Trat2 board"
@@ -23,22 +25,27 @@ config TARGET_ODROID
 
 config TARGET_ARNDALE
 	bool "Exynos5250 Arndale board"
+	select SUPPORT_SPL
 	select OF_CONTROL if !SPL_BUILD
 
 config TARGET_SMDK5250
 	bool "SMDK5250 board"
+	select SUPPORT_SPL
 	select OF_CONTROL if !SPL_BUILD
 
 config TARGET_SNOW
 	bool "Snow board"
+	select SUPPORT_SPL
 	select OF_CONTROL if !SPL_BUILD
 
 config TARGET_SMDK5420
 	bool "SMDK5420 board"
+	select SUPPORT_SPL
 	select OF_CONTROL if !SPL_BUILD
 
 config TARGET_PEACH_PIT
 	bool "Peach Pi board"
+	select SUPPORT_SPL
 	select OF_CONTROL if !SPL_BUILD
 
 endchoice
arch/arm/cpu/armv7/omap3/Kconfig +16 -0
index 6fae1e5..26e328f 100644
@@ -5,57 +5,71 @@ choice
 
 config TARGET_AM3517_EVM
 	bool "AM3517 EVM"
+	select SUPPORT_SPL
 
 config TARGET_MT_VENTOUX
 	bool "TeeJet Mt.Ventoux"
+	select SUPPORT_SPL
 
 config TARGET_OMAP3_SDP3430
 	bool "TI OMAP3430 SDP"
 
 config TARGET_OMAP3_BEAGLE
 	bool "TI OMAP3 BeagleBoard"
+	select SUPPORT_SPL
 
 config TARGET_CM_T35
 	bool "CompuLab CM-T35"
+	select SUPPORT_SPL
 
 config TARGET_DEVKIT8000
 	bool "TimLL OMAP3 Devkit8000"
+	select SUPPORT_SPL
 
 config TARGET_OMAP3_EVM
 	bool "TI OMAP3 EVM"
+	select SUPPORT_SPL
 
 config TARGET_OMAP3_EVM_QUICK_MMC
 	bool "TI OMAP3 EVM Quick MMC"
+	select SUPPORT_SPL
 
 config TARGET_OMAP3_EVM_QUICK_NAND
 	bool "TI OMAP3 EVM Quick NAND"
+	select SUPPORT_SPL
 
 config TARGET_OMAP3_IGEP00X0
 	bool "IGEP"
+	select SUPPORT_SPL
 
 config TARGET_OMAP3_OVERO
 	bool "OMAP35xx Gumstix Overo"
+	select SUPPORT_SPL
 
 config TARGET_OMAP3_ZOOM1
 	bool "TI Zoom1"
 
 config TARGET_AM3517_CRANE
 	bool "am3517_crane"
+	select SUPPORT_SPL
 
 config TARGET_OMAP3_PANDORA
 	bool "OMAP3 Pandora"
 
 config TARGET_ECO5PK
 	bool "ECO5PK"
+	select SUPPORT_SPL
 
 config TARGET_DIG297
 	bool "DIG297"
 
 config TARGET_TRICORDER
 	bool "Tricorder"
+	select SUPPORT_SPL
 
 config TARGET_MCX
 	bool "MCX"
+	select SUPPORT_SPL
 
 config TARGET_OMAP3_LOGIC
 	bool "OMAP3 Logic"
@@ -68,9 +82,11 @@ config TARGET_NOKIA_RX51
 
 config TARGET_TAO3530
 	bool "TAO3530"
+	select SUPPORT_SPL
 
 config TARGET_TWISTER
 	bool "Twister"
+	select SUPPORT_SPL
 
 endchoice
 
arch/microblaze/Kconfig +1 -0
index 33bfd9f..6f419f0 100644
@@ -9,6 +9,7 @@ choice
 
 config TARGET_MICROBLAZE_GENERIC
 	bool "Support microblaze-generic"
+	select SUPPORT_SPL
 
 endchoice
 
arch/powerpc/cpu/mpc5xxx/Kconfig +1 -0
index cca58e5..7f6ae8e 100644
@@ -9,6 +9,7 @@ choice
 
 config TARGET_A3M071
 	bool "Support a3m071"
+	select SUPPORT_SPL
 
 config TARGET_A4M072
 	bool "Support a4m072"
arch/powerpc/cpu/mpc83xx/Kconfig +1 -0
index 6de9265..2d5a424 100644
@@ -24,6 +24,7 @@ config TARGET_MPC8308RDB
 
 config TARGET_MPC8313ERDB
 	bool "Support MPC8313ERDB"
+	select SUPPORT_SPL
 
 config TARGET_MPC8315ERDB
 	bool "Support MPC8315ERDB"
arch/powerpc/cpu/mpc85xx/Kconfig +12 -0
index 8c1c01c..6dcc45a 100644
@@ -18,15 +18,19 @@ config TARGET_HWW1U1A
 
 config TARGET_B4860QDS
 	bool "Support B4860QDS"
+	select SUPPORT_SPL
 
 config TARGET_BSC9131RDB
 	bool "Support BSC9131RDB"
+	select SUPPORT_SPL
 
 config TARGET_BSC9132QDS
 	bool "Support BSC9132QDS"
+	select SUPPORT_SPL
 
 config TARGET_C29XPCIE
 	bool "Support C29XPCIE"
+	select SUPPORT_SPL
 
 config TARGET_P3041DS
 	bool "Support P3041DS"
@@ -72,18 +76,22 @@ config TARGET_MPC8572DS
 
 config TARGET_P1010RDB
 	bool "Support P1010RDB"
+	select SUPPORT_SPL
 
 config TARGET_P1022DS
 	bool "Support P1022DS"
+	select SUPPORT_SPL
 
 config TARGET_P1023RDB
 	bool "Support P1023RDB"
 
 config TARGET_P1_P2_RDB
 	bool "Support P1_P2_RDB"
+	select SUPPORT_SPL
 
 config TARGET_P1_P2_RDB_PC
 	bool "Support p1_p2_rdb_pc"
+	select SUPPORT_SPL
 
 config TARGET_P1_TWR
 	bool "Support p1_twr"
@@ -105,18 +113,22 @@ config TARGET_T1040QDS
 
 config TARGET_T104XRDB
 	bool "Support T104xRDB"
+	select SUPPORT_SPL
 
 config TARGET_T208XQDS
 	bool "Support T208xQDS"
+	select SUPPORT_SPL
 
 config TARGET_T208XRDB
 	bool "Support T208xRDB"
+	select SUPPORT_SPL
 
 config TARGET_T4240EMU
 	bool "Support T4240EMU"
 
 config TARGET_T4240QDS
 	bool "Support T4240QDS"
+	select SUPPORT_SPL
 
 config TARGET_T4240RDB
 	bool "Support T4240RDB"
arch/powerpc/cpu/ppc4xx/Kconfig +1 -0
index 41b525c..f525289 100644
@@ -24,6 +24,7 @@ config TARGET_KORAT
 
 config TARGET_LWMON5
 	bool "Support lwmon5"
+	select SUPPORT_SPL
 
 config TARGET_PCS440EP
 	bool "Support pcs440ep"
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/2 kconfig: add CONFIG_SUPPORT_TPL

In reply to Masahiro Yamada

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.

---

 Kconfig                          | 5 ++++-
 arch/powerpc/cpu/mpc85xx/Kconfig | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)
Kconfig +4 -1
index 29e0b92..0b9be50 100644
@@ -73,6 +73,9 @@ config TPL_BUILD
 config SUPPORT_SPL
 	bool
 
+config HAVE_TPL_SUPPORT
+	bool
+
 config SPL
 	bool
 	depends on SUPPORT_SPL
@@ -83,7 +86,7 @@ config SPL
 
 config TPL
 	bool
-	depends on SPL
+	depends on SPL && HAVE_TPL_SUPPORT
 	prompt "Enable TPL" if !SPL_BUILD
 	default y if TPL_BUILD
 	default n
arch/powerpc/cpu/mpc85xx/Kconfig +5 -0
index 6dcc45a..c5ebd40 100644
@@ -31,6 +31,7 @@ config TARGET_BSC9132QDS
 config TARGET_C29XPCIE
 	bool "Support C29XPCIE"
 	select SUPPORT_SPL
+	select SUPPORT_TPL
 
 config TARGET_P3041DS
 	bool "Support P3041DS"
@@ -77,10 +78,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"
@@ -88,10 +91,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"
Signature · 1 line
1.9.1
#3 lore raw

PATCH 2/2 kconfig: add CONFIG_SUPPORT_TPL

Hi Masahiro,

Quoted 3 lines · Masahiro Yamada

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.

Actually, I see no CONFIG_SUPPORT_TPL in the patch, only HAVE_TPL_SUPPORT. The commit message should match the patch content on this point, should it not?

Quoted 58 lines

---

 Kconfig                          | 5 ++++-
 arch/powerpc/cpu/mpc85xx/Kconfig | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)
Kconfig +4 -1
index 29e0b92..0b9be50 100644
@@ -73,6 +73,9 @@ config TPL_BUILD
 config SUPPORT_SPL
 	bool
 
+config HAVE_TPL_SUPPORT
+	bool
+
 config SPL
 	bool
 	depends on SUPPORT_SPL
@@ -83,7 +86,7 @@ config SPL
 
 config TPL
 	bool
-	depends on SPL
+	depends on SPL && HAVE_TPL_SUPPORT
 	prompt "Enable TPL" if !SPL_BUILD
 	default y if TPL_BUILD
 	default n
arch/powerpc/cpu/mpc85xx/Kconfig +3 -0
index 6dcc45a..c5ebd40 100644
@@ -31,6 +31,7 @@ config TARGET_BSC9132QDS
 config TARGET_C29XPCIE
 	bool "Support C29XPCIE"
 	select SUPPORT_SPL
+	select SUPPORT_TPL
 
 config TARGET_P3041DS
 	bool "Support P3041DS"
@@ -77,10 +78,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"
@@ -88,10 +91,12 @@ config TARGET_P1023RDB
 config TARGET_P1_P2_RDB
 	bool "Support P1_P2_RDB"

arch/powerpc/cpu/mpc85xx/Kconfig config TARGET_P1023RDB · line 102

Quoted 10 lines
arch/powerpc/cpu/mpc85xx/Kconfig +2 -0
 	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"

Amicalement,

Signature · 1 line
Albert.
#4 lore raw

PATCH 2/2 kconfig: add CONFIG_SUPPORT_TPL

Hi Albert,

2014-10-11 17:56 GMT+09:00 Albert ARIBAUD <[email protected]>:

Quoted 5 lines

Hi Masahiro,

On Thu, 25 Sep 2014 18:19:07 +0900, Masahiro Yamada <[email protected]> wrote:

Quoted 7 lines
Quoted 3 lines

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.

Actually, I see no CONFIG_SUPPORT_TPL in the patch, only HAVE_TPL_SUPPORT. The commit message should match the patch content on this point, should it not?

I am guessing you are seeing the old patch (v1) that has been already Superseded.

The newest of this patch is v3:
http://patchwork.ozlabs.org/patch/397543/

Signature · 2 lines
Best Regards
Masahiro Yamada
#5 lore raw

PATCH 2/2 kconfig: add CONFIG_SUPPORT_TPL

Hi Masahiro,

Quoted 17 lines · Masahiro YAMADA

Hi Albert,

2014-10-11 17:56 GMT+09:00 Albert ARIBAUD <[email protected]>:

Quoted 5 lines

Hi Masahiro,

On Thu, 25 Sep 2014 18:19:07 +0900, Masahiro Yamada <[email protected]> wrote:

Quoted 7 lines
Quoted 3 lines

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.

Actually, I see no CONFIG_SUPPORT_TPL in the patch, only HAVE_TPL_SUPPORT. The commit message should match the patch content on this point, should it not?

Quoted 5 lines

I am guessing you are seeing the old patch (v1) that has been already Superseded.

The newest of this patch is v3:
http://patchwork.ozlabs.org/patch/397543/

My bad -- I'd missed this indeed.

Amicalement,

Signature · 1 line
Albert.