NXP: Introduce board/freescale/common/Kconfig and migrate CHAIN_OF_TRUST

Introduce board/freescale/common/Kconfig so that we have a single place
for CONFIG options that are shared between ARM and PowerPC NXP platforms.

Cc: York Sun <york.sun@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h
index f920215d015849f850efd34320855090cd405145..17ca5409080a47373bd36b5320cc9ea6df16b8f5 100644 (file)
--- a/arch/arm/include/asm/fsl_secure_boot.h
+++ b/arch/arm/include/asm/fsl_secure_boot.h
@@ -7,14 +7,6 @@
 #ifndef __FSL_SECURE_BOOT_H
 #define __FSL_SECURE_BOOT_H
 
-#ifdef CONFIG_SECURE_BOOT
-
-#ifndef CONFIG_FIT_SIGNATURE
-#define CONFIG_CHAIN_OF_TRUST
-#endif
-
-#endif
-
 #ifdef CONFIG_CHAIN_OF_TRUST
 #define CONFIG_CMD_ESBC_VALIDATE
 #define CONFIG_FSL_SEC_MON

diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h
index ab2957901c6d5a0618a640315ff18e2b4aa86c94..e17ead569628520da1b9d98adeab7d359e0a42e4 100644 (file)
--- a/arch/powerpc/include/asm/fsl_secure_boot.h
+++ b/arch/powerpc/include/asm/fsl_secure_boot.h
@@ -9,11 +9,6 @@
 #include <asm/config_mpc85xx.h>
 
 #ifdef CONFIG_SECURE_BOOT
-
-#ifndef CONFIG_FIT_SIGNATURE
-#define CONFIG_CHAIN_OF_TRUST
-#endif
-
 #if defined(CONFIG_FSL_CORENET)
 #define CONFIG_SYS_PBI_FLASH_BASE              0xc0000000
 #elif defined(CONFIG_TARGET_BSC9132QDS)

diff --git a/board/freescale/b4860qds/Kconfig b/board/freescale/b4860qds/Kconfig
index 01d68e14e2aba5cdf3b8cf67ab9207af7e9c7f10..9bb667ab4f9cfe48b5ffce03e179b941c3860e60 100644 (file)
--- a/board/freescale/b4860qds/Kconfig
+++ b/board/freescale/b4860qds/Kconfig
@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "B4860QDS"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/bsc9132qds/Kconfig b/board/freescale/bsc9132qds/Kconfig
index db3a1f1d47ecc71091984746a9f6c5e047a976de..e5499e6129aac27cdf07475c9f079ce20bd1f8cf 100644 (file)
--- a/board/freescale/bsc9132qds/Kconfig
+++ b/board/freescale/bsc9132qds/Kconfig
@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "BSC9132QDS"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/c29xpcie/Kconfig b/board/freescale/c29xpcie/Kconfig
index 17369b8ca7eb1463ace6b4da03909090e2da7465..51e25c39dfd4b827cec8813d551f07b9b838152f 100644 (file)
--- a/board/freescale/c29xpcie/Kconfig
+++ b/board/freescale/c29xpcie/Kconfig
@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "C29XPCIE"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig
new file mode 100644 (file)
index 0000000..38babd3
--- /dev/null
+++ b/board/freescale/common/Kconfig
@@ -0,0 +1,4 @@
+config CHAIN_OF_TRUST
+       depends on !FIT_SIGNATURE && SECURE_BOOT
+       bool
+       default y

diff --git a/board/freescale/corenet_ds/Kconfig b/board/freescale/corenet_ds/Kconfig
index 433f539d997a6fa191930594d4dfb699f38db11f..98b1adde6207df526a2c6f1b1f9d444718ff0701 100644 (file)
--- a/board/freescale/corenet_ds/Kconfig
+++ b/board/freescale/corenet_ds/Kconfig
@@ -9,6 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "P3041DS"
 
+source "board/freescale/common/Kconfig"
+
 endif
 
 if TARGET_P4080DS
@@ -22,6 +24,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "P4080DS"
 
+source "board/freescale/common/Kconfig"
+
 endif
 
 if TARGET_P5020DS
@@ -35,6 +39,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "P5020DS"
 
+source "board/freescale/common/Kconfig"
+
 endif
 
 if TARGET_P5040DS
@@ -48,4 +54,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "P5040DS"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/ls1012afrdm/Kconfig b/board/freescale/ls1012afrdm/Kconfig
index a34521cf795412969156cf48683734feffc96416..38bd91b191812ddb8854c98a44d177114aac54f2 100644 (file)
--- a/board/freescale/ls1012afrdm/Kconfig
+++ b/board/freescale/ls1012afrdm/Kconfig
@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1012afrdm"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/ls1012aqds/Kconfig b/board/freescale/ls1012aqds/Kconfig
index 1257ec8d06e99da4a6162e7b5ba766fc55c9516d..fc9250b253ed43f66987caf3775e351f8dff56fe 100644 (file)
--- a/board/freescale/ls1012aqds/Kconfig
+++ b/board/freescale/ls1012aqds/Kconfig
@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1012aqds"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/ls1012ardb/Kconfig b/board/freescale/ls1012ardb/Kconfig
index 3f67c2841f5b60363abb58f4301f4e1e47432fe1..98231f96b3ed5529b8870ba9f5d495d4b4fef713 100644 (file)
--- a/board/freescale/ls1012ardb/Kconfig
+++ b/board/freescale/ls1012ardb/Kconfig
@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1012ardb"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/ls1021aiot/Kconfig b/board/freescale/ls1021aiot/Kconfig
index 4a12c1687fcede1eec51e52be85876fa9bad0eb5..c6b16063a4a620af0321b000b69258837b73065b 100644 (file)
--- a/board/freescale/ls1021aiot/Kconfig
+++ b/board/freescale/ls1021aiot/Kconfig
@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1021aiot"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/ls1021aqds/Kconfig b/board/freescale/ls1021aqds/Kconfig
index 119b9550410c2664ab9d959eef8b7e1a040f729f..60b8472990daf1edaffdd01a83afce789597dc92 100644 (file)
--- a/board/freescale/ls1021aqds/Kconfig
+++ b/board/freescale/ls1021aqds/Kconfig
@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1021aqds"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/ls1021atwr/Kconfig b/board/freescale/ls1021atwr/Kconfig
index bc50b8d96689bb7fb44c3f06058a5df45d6dfd9a..a4641cbca09b0ac0f7d572cd4b504d6ebf9ca6c6 100644 (file)
--- a/board/freescale/ls1021atwr/Kconfig
+++ b/board/freescale/ls1021atwr/Kconfig
@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1021atwr"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/ls1043aqds/Kconfig b/board/freescale/ls1043aqds/Kconfig
index 7e27f8f5b139dca7519cb1c036f903d0bfaef5d7..95d288812a97a3e9b76b5521b9267a7dc4498668 100644 (file)
--- a/board/freescale/ls1043aqds/Kconfig
+++ b/board/freescale/ls1043aqds/Kconfig
@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1043aqds"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/ls1043ardb/Kconfig b/board/freescale/ls1043ardb/Kconfig
index 80203a4f3b334dfd5856ab72468d77d35ac70faa..1bab7cab613f86a443bea1ae4176919fbd0e19f6 100644 (file)
--- a/board/freescale/ls1043ardb/Kconfig
+++ b/board/freescale/ls1043ardb/Kconfig
@@ -22,4 +22,6 @@ config SYS_HAS_ARMV8_SECURE_BASE
          If enabled, please also define the value for ARMV8_SECURE_BASE,
          for LS1043ARDB, it could be some address in OCRAM.
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/ls1046aqds/Kconfig b/board/freescale/ls1046aqds/Kconfig
index 723f4ba90a071d63258af6f76bd53f02d98dc737..070827d7b9fd205d05d075d116b56ad4d4961455 100644 (file)
--- a/board/freescale/ls1046aqds/Kconfig
+++ b/board/freescale/ls1046aqds/Kconfig
@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls1046aqds"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/ls2080a/Kconfig b/board/freescale/ls2080a/Kconfig
index 0b938ffb54199768669756d528f67673acf38439..b5033511b55b28e686fa95052577f8250320f7e0 100644 (file)
--- a/board/freescale/ls2080a/Kconfig
+++ b/board/freescale/ls2080a/Kconfig
@@ -12,6 +12,8 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls2080a_emu"
 
+source "board/freescale/common/Kconfig"
+
 endif
 
 if TARGET_LS2080A_SIMU
@@ -28,4 +30,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls2080a_simu"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/ls2080aqds/Kconfig b/board/freescale/ls2080aqds/Kconfig
index 2f997e9de1acc651cfcad6ea24f5499f3a747213..e2b2c8d0898636f645f16e3a3acfa562f85bccc9 100644 (file)
--- a/board/freescale/ls2080aqds/Kconfig
+++ b/board/freescale/ls2080aqds/Kconfig
@@ -13,4 +13,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls2080aqds"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/ls2080ardb/Kconfig b/board/freescale/ls2080ardb/Kconfig
index fe02575cf983290acfd0de362a06c13a086590bc..2f0465fbba2e5f26d14598c83e0de4277c3d2a82 100644 (file)
--- a/board/freescale/ls2080ardb/Kconfig
+++ b/board/freescale/ls2080ardb/Kconfig
@@ -13,4 +13,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "ls2080ardb"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/p1010rdb/Kconfig b/board/freescale/p1010rdb/Kconfig
index 159bcc4f54d9208dfc3581f071509090e398b090..3adac4af1e3c9bc215666ddd38b936bd41fa4872 100644 (file)
--- a/board/freescale/p1010rdb/Kconfig
+++ b/board/freescale/p1010rdb/Kconfig
@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "P1010RDB"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/p2041rdb/Kconfig b/board/freescale/p2041rdb/Kconfig
index 78e11214a5b815d15f7e294129cdf000cf879f1b..7e187dde725500ff5ecf725a7dd858d798b5ab2e 100644 (file)
--- a/board/freescale/p2041rdb/Kconfig
+++ b/board/freescale/p2041rdb/Kconfig
@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "P2041RDB"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/t102xqds/Kconfig b/board/freescale/t102xqds/Kconfig
index 6ee7468b217d032740005809e687283f287d4d85..87818a8d3ae81b90d5d8d8c834fa54f19a04655a 100644 (file)
--- a/board/freescale/t102xqds/Kconfig
+++ b/board/freescale/t102xqds/Kconfig
@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "T102xQDS"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/t102xrdb/Kconfig b/board/freescale/t102xrdb/Kconfig
index d538386d4344ef6da5349cdab12bca6d067b268d..6deeb248a3006facbd873e66a4e7de4d2ddb80d7 100644 (file)
--- a/board/freescale/t102xrdb/Kconfig
+++ b/board/freescale/t102xrdb/Kconfig
@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "T102xRDB"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/t1040qds/Kconfig b/board/freescale/t1040qds/Kconfig
index 1bb168401199841cb9c6fb0e1fb65655eba42ac7..ec3ff0c1ecbbc3db787abc45ccc729265b4aa6a9 100644 (file)
--- a/board/freescale/t1040qds/Kconfig
+++ b/board/freescale/t1040qds/Kconfig
@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "T1040QDS"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/t104xrdb/Kconfig b/board/freescale/t104xrdb/Kconfig
index e33d3173650ccd9d7bb9803fd63848bcdff10c0a..e6e46fa126fbf7df6d1111516a53d7690211b448 100644 (file)
--- a/board/freescale/t104xrdb/Kconfig
+++ b/board/freescale/t104xrdb/Kconfig
@@ -11,4 +11,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "T104xRDB"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/t208xqds/Kconfig b/board/freescale/t208xqds/Kconfig
index 26ef530b93801749feb4ea46a8cc3538045a59e3..5a435c2695b66524c063cf0cc4037da5006822c3 100644 (file)
--- a/board/freescale/t208xqds/Kconfig
+++ b/board/freescale/t208xqds/Kconfig
@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "T208xQDS"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/t208xrdb/Kconfig b/board/freescale/t208xrdb/Kconfig
index 71e11303ba658eba42a4ae522732c31075752b8a..6f0b012baba34ea8ec7208991aa2c45df07c8453 100644 (file)
--- a/board/freescale/t208xrdb/Kconfig
+++ b/board/freescale/t208xrdb/Kconfig
@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "T208xRDB"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/t4qds/Kconfig b/board/freescale/t4qds/Kconfig
index 563a87c4569cd81b2f2402e0d55b4441df43b3a5..f7c1a0c15dd1c86517b6e08933da6f5fa64a00cf 100644 (file)
--- a/board/freescale/t4qds/Kconfig
+++ b/board/freescale/t4qds/Kconfig
@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "T4240QDS"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/freescale/t4rdb/Kconfig b/board/freescale/t4rdb/Kconfig
index 67832da30bed6e3d2459a2feec7a8b953a0e4044..a94a57e7feebd013a10fa552fdc101f54eb76d7e 100644 (file)
--- a/board/freescale/t4rdb/Kconfig
+++ b/board/freescale/t4rdb/Kconfig
@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "T4240RDB"
 
+source "board/freescale/common/Kconfig"
+
 endif

diff --git a/board/varisys/cyrus/Kconfig b/board/varisys/cyrus/Kconfig
index c7b5253926519c142a058b32d74a74b77b87e2e0..a0389f8fa1a58d9eb86a3a3b56a128524c7e8e91 100644 (file)
--- a/board/varisys/cyrus/Kconfig
+++ b/board/varisys/cyrus/Kconfig
@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "cyrus"
 
+source "board/freescale/common/Kconfig"
+
 endif