diff options
30 files changed, 66 insertions, 13 deletions
diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index f920215d015..17ca5409080 100644 --- 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 ab2957901c6..e17ead56962 100644 --- 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 01d68e14e2a..9bb667ab4f9 100644 --- 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 db3a1f1d47e..e5499e6129a 100644 --- 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 17369b8ca7e..51e25c39dfd 100644 --- 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 index 00000000000..38babd30bab --- /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 433f539d997..98b1adde620 100644 --- 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 a34521cf795..38bd91b1918 100644 --- 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 1257ec8d06e..fc9250b253e 100644 --- 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 3f67c2841f5..98231f96b3e 100644 --- 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 4a12c1687fc..c6b16063a4a 100644 --- 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 119b9550410..60b8472990d 100644 --- 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 bc50b8d9668..a4641cbca09 100644 --- 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 7e27f8f5b13..95d288812a9 100644 --- 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 80203a4f3b3..1bab7cab613 100644 --- 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 723f4ba90a0..070827d7b9f 100644 --- 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 0b938ffb541..b5033511b55 100644 --- 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 2f997e9de1a..e2b2c8d0898 100644 --- 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 fe02575cf98..2f0465fbba2 100644 --- 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 159bcc4f54d..3adac4af1e3 100644 --- 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 78e11214a5b..7e187dde725 100644 --- 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 6ee7468b217..87818a8d3ae 100644 --- 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 d538386d434..6deeb248a30 100644 --- 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 1bb16840119..ec3ff0c1ecb 100644 --- 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 e33d3173650..e6e46fa126f 100644 --- 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 26ef530b938..5a435c2695b 100644 --- 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 71e11303ba6..6f0b012baba 100644 --- 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 563a87c4569..f7c1a0c15dd 100644 --- 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 67832da30be..a94a57e7fee 100644 --- 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 c7b52539265..a0389f8fa1a 100644 --- 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 |