Browse Source

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>
Tom Rini 7 years ago
parent
commit
88077715d8

+ 0 - 8
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

+ 0 - 5
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)

+ 2 - 0
board/freescale/b4860qds/Kconfig

@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "B4860QDS"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/bsc9132qds/Kconfig

@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "BSC9132QDS"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/c29xpcie/Kconfig

@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "C29XPCIE"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 4 - 0
board/freescale/common/Kconfig

@@ -0,0 +1,4 @@
+config CHAIN_OF_TRUST
+	depends on !FIT_SIGNATURE && SECURE_BOOT
+	bool
+	default y

+ 8 - 0
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

+ 2 - 0
board/freescale/ls1012afrdm/Kconfig

@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls1012afrdm"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/ls1012aqds/Kconfig

@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls1012aqds"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/ls1012ardb/Kconfig

@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls1012ardb"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/ls1021aiot/Kconfig

@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls1021aiot"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/ls1021aqds/Kconfig

@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls1021aqds"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/ls1021atwr/Kconfig

@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls1021atwr"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/ls1043aqds/Kconfig

@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls1043aqds"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
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

+ 2 - 0
board/freescale/ls1046aqds/Kconfig

@@ -12,4 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls1046aqds"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 4 - 0
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

+ 2 - 0
board/freescale/ls2080aqds/Kconfig

@@ -13,4 +13,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls2080aqds"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/ls2080ardb/Kconfig

@@ -13,4 +13,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls2080ardb"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/p1010rdb/Kconfig

@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "P1010RDB"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/p2041rdb/Kconfig

@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "P2041RDB"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/t102xqds/Kconfig

@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "T102xQDS"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/t102xrdb/Kconfig

@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "T102xRDB"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/t1040qds/Kconfig

@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "T1040QDS"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/t104xrdb/Kconfig

@@ -11,4 +11,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "T104xRDB"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/t208xqds/Kconfig

@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "T208xQDS"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/t208xrdb/Kconfig

@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "T208xRDB"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/t4qds/Kconfig

@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "T4240QDS"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/freescale/t4rdb/Kconfig

@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "T4240RDB"
 
+source "board/freescale/common/Kconfig"
+
 endif

+ 2 - 0
board/varisys/cyrus/Kconfig

@@ -9,4 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "cyrus"
 
+source "board/freescale/common/Kconfig"
+
 endif