leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert CONFIG_SYS_FSL_SFP_BE et al to Kconfig

Browse Source 
This converts the following to Kconfig:
   CONFIG_KEY_REVOCATION
   CONFIG_SYS_FSL_SFP_BE
   CONFIG_SYS_FSL_SFP_LE
   CONFIG_SYS_FSL_SFP_VER_3_0
   CONFIG_SYS_FSL_SFP_VER_3_2
   CONFIG_SYS_FSL_SFP_VER_3_4
   CONFIG_SYS_FSL_SRK_LE

This partly means making sure to enable SYS_FSL_ERRATUM_A007186 only for
when CHAIN_OF_TRUST is enabled.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-06-16 14:04:40 -04:00
parent c9f85187e2
commit 601483ffd5
8 changed files with 37 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/Kconfig.nxp
View File

@ -34,6 +34,39 @@ config ESBC_ADDR_64BIT
help help
For Layerscape based platforms, ESBC image Address in Header is 64bit. For Layerscape based platforms, ESBC image Address in Header is 64bit.
config SYS_FSL_SFP_BE
def_bool y
depends on CHAIN_OF_TRUST && (PPC || FSL_LSCH2 || ARCH_LS1021A)
config SYS_FSL_SFP_LE
def_bool y
depends on CHAIN_OF_TRUST && !SYS_FSL_SFP_BE
choice
prompt "SFP IP revision"
depends on CHAIN_OF_TRUST
default SYS_FSL_SFP_VER_3_0 if PPC
default SYS_FSL_SFP_VER_3_4
config SYS_FSL_SFP_VER_3_0
bool "SFP version 3.0"
config SYS_FSL_SFP_VER_3_2
bool "SFP version 3.2"
config SYS_FSL_SFP_VER_3_4
bool "SFP version 3.4"
endchoice
config SYS_FSL_SRK_LE
def_bool y
depends on CHAIN_OF_TRUST && ARM
config KEY_REVOCATION
def_bool y
depends on CHAIN_OF_TRUST
config DEEP_SLEEP config DEEP_SLEEP
bool "Enable SoC deep sleep feature" bool "Enable SoC deep sleep feature"
depends on ARCH_T1024 || ARCH_T1040 || ARCH_T1042 || ARCH_LS1021A depends on ARCH_T1024 || ARCH_T1040 || ARCH_T1042 || ARCH_LS1021A

32
arch/arm/include/asm/arch-fsl-layerscape/config.h
View File

@ -55,11 +55,6 @@
/* SMMU Defintions */ /* SMMU Defintions */
#define SMMU_BASE 0x05000000 /* GR0 Base */ #define SMMU_BASE 0x05000000 /* GR0 Base */
/* SFP */
#define CONFIG_SYS_FSL_SFP_VER_3_4
#define CONFIG_SYS_FSL_SFP_LE
#define CONFIG_SYS_FSL_SRK_LE
/* DCFG - GUR */ /* DCFG - GUR */
#define CONFIG_SYS_FSL_CCSR_GUR_LE #define CONFIG_SYS_FSL_CCSR_GUR_LE
@ -154,11 +149,6 @@
#define CONFIG_SYS_MEMAC_LITTLE_ENDIAN #define CONFIG_SYS_MEMAC_LITTLE_ENDIAN
/* SFP */
#define CONFIG_SYS_FSL_SFP_VER_3_4
#define CONFIG_SYS_FSL_SFP_LE
#define CONFIG_SYS_FSL_SRK_LE
/* DCFG - GUR */ /* DCFG - GUR */
#define CONFIG_SYS_FSL_CCSR_GUR_LE #define CONFIG_SYS_FSL_CCSR_GUR_LE
#define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1
@ -203,11 +193,6 @@
/* SMMU Definitions */ /* SMMU Definitions */
#define SMMU_BASE 0x05000000 /* GR0 Base */ #define SMMU_BASE 0x05000000 /* GR0 Base */
/* SFP */
#define CONFIG_SYS_FSL_SFP_VER_3_4
#define CONFIG_SYS_FSL_SFP_LE
#define CONFIG_SYS_FSL_SRK_LE
/* DCFG - GUR */ /* DCFG - GUR */
#define CONFIG_SYS_FSL_CCSR_GUR_LE #define CONFIG_SYS_FSL_CCSR_GUR_LE
@ -256,11 +241,6 @@
#define CONFIG_SYS_MEMAC_LITTLE_ENDIAN #define CONFIG_SYS_MEMAC_LITTLE_ENDIAN
/* SFP */
#define CONFIG_SYS_FSL_SFP_VER_3_4
#define CONFIG_SYS_FSL_SFP_LE
#define CONFIG_SYS_FSL_SRK_LE
/* SEC */ /* SEC */
#define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1
@ -297,10 +277,6 @@
#define QE_NUM_OF_SNUM 28 #define QE_NUM_OF_SNUM 28
#define CONFIG_SYS_FSL_IFC_BE #define CONFIG_SYS_FSL_IFC_BE
#define CONFIG_SYS_FSL_SFP_VER_3_2
#define CONFIG_SYS_FSL_SFP_BE
#define CONFIG_SYS_FSL_SRK_LE
#define CONFIG_KEY_REVOCATION
/* SMMU Defintions */ /* SMMU Defintions */
#define SMMU_BASE 0x09000000 #define SMMU_BASE 0x09000000
@ -336,10 +312,6 @@
#elif defined(CONFIG_ARCH_LS1012A) #elif defined(CONFIG_ARCH_LS1012A)
#define GICD_BASE 0x01401000 #define GICD_BASE 0x01401000
#define GICC_BASE 0x01402000 #define GICC_BASE 0x01402000
#define CONFIG_SYS_FSL_SFP_VER_3_2
#define CONFIG_SYS_FSL_SFP_BE
#define CONFIG_SYS_FSL_SRK_LE
#define CONFIG_KEY_REVOCATION
#define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1
#define CONFIG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) #define CONFIG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30)
#define CONFIG_MAX_MEM_MAPPED CONFIG_SYS_DDR_BLOCK1_SIZE #define CONFIG_MAX_MEM_MAPPED CONFIG_SYS_DDR_BLOCK1_SIZE
@ -354,10 +326,6 @@
#define CONFIG_MAX_MEM_MAPPED CONFIG_SYS_DDR_BLOCK1_SIZE #define CONFIG_MAX_MEM_MAPPED CONFIG_SYS_DDR_BLOCK1_SIZE
#define CONFIG_SYS_FSL_IFC_BE #define CONFIG_SYS_FSL_IFC_BE
#define CONFIG_SYS_FSL_SFP_VER_3_2
#define CONFIG_SYS_FSL_SFP_BE
#define CONFIG_SYS_FSL_SRK_LE
#define CONFIG_KEY_REVOCATION
/* SMMU Defintions */ /* SMMU Defintions */
#define SMMU_BASE 0x09000000 #define SMMU_BASE 0x09000000

3
arch/arm/include/asm/arch-ls102xa/config.h
View File

@ -87,9 +87,6 @@
#define CONFIG_SYS_FSL_ESDHC_BE #define CONFIG_SYS_FSL_ESDHC_BE
#define CONFIG_SYS_FSL_WDOG_BE #define CONFIG_SYS_FSL_WDOG_BE
#define CONFIG_SYS_FSL_DSPI_BE #define CONFIG_SYS_FSL_DSPI_BE
#define CONFIG_SYS_FSL_SFP_VER_3_2
#define CONFIG_SYS_FSL_SFP_BE
#define CONFIG_SYS_FSL_SRK_LE
#define DCU_LAYER_MAX_NUM 16 #define DCU_LAYER_MAX_NUM 16

2
arch/arm/include/asm/fsl_secure_boot.h
View File

@ -21,8 +21,6 @@
#define CONFIG_SPL_UBOOT_KEY_HASH NULL #define CONFIG_SPL_UBOOT_KEY_HASH NULL
#endif /* ifdef CONFIG_SPL_BUILD */ #endif /* ifdef CONFIG_SPL_BUILD */
#define CONFIG_KEY_REVOCATION
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#ifndef CONFIG_SYS_RAMBOOT #ifndef CONFIG_SYS_RAMBOOT
/* The key used for verification of next level images /* The key used for verification of next level images

8
arch/powerpc/cpu/mpc85xx/Kconfig
View File

@ -196,7 +196,7 @@ config ARCH_B4420
select SYS_FSL_ERRATUM_A006475 select SYS_FSL_ERRATUM_A006475
select SYS_FSL_ERRATUM_A006593 select SYS_FSL_ERRATUM_A006593
select SYS_FSL_ERRATUM_A007075 select SYS_FSL_ERRATUM_A007075
select SYS_FSL_ERRATUM_A007186 select SYS_FSL_ERRATUM_A007186 if CHAIN_OF_TRUST
select SYS_FSL_ERRATUM_A007212 select SYS_FSL_ERRATUM_A007212
select SYS_FSL_ERRATUM_A009942 select SYS_FSL_ERRATUM_A009942
select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_DDR3
@ -224,7 +224,7 @@ config ARCH_B4860
select SYS_FSL_ERRATUM_A006475 select SYS_FSL_ERRATUM_A006475
select SYS_FSL_ERRATUM_A006593 select SYS_FSL_ERRATUM_A006593
select SYS_FSL_ERRATUM_A007075 select SYS_FSL_ERRATUM_A007075
select SYS_FSL_ERRATUM_A007186 select SYS_FSL_ERRATUM_A007186 if CHAIN_OF_TRUST
select SYS_FSL_ERRATUM_A007212 select SYS_FSL_ERRATUM_A007212
select SYS_FSL_ERRATUM_A007907 select SYS_FSL_ERRATUM_A007907
select SYS_FSL_ERRATUM_A009942 select SYS_FSL_ERRATUM_A009942
@ -735,7 +735,7 @@ config ARCH_T2080
select SYS_FSL_DDR_VER_47 select SYS_FSL_DDR_VER_47
select SYS_FSL_ERRATUM_A006379 select SYS_FSL_ERRATUM_A006379
select SYS_FSL_ERRATUM_A006593 select SYS_FSL_ERRATUM_A006593
select SYS_FSL_ERRATUM_A007186 select SYS_FSL_ERRATUM_A007186 if CHAIN_OF_TRUST
select SYS_FSL_ERRATUM_A007212 select SYS_FSL_ERRATUM_A007212
select SYS_FSL_ERRATUM_A007815 select SYS_FSL_ERRATUM_A007815
select SYS_FSL_ERRATUM_A007907 select SYS_FSL_ERRATUM_A007907
@ -768,7 +768,7 @@ config ARCH_T4240
select SYS_FSL_ERRATUM_A006261 select SYS_FSL_ERRATUM_A006261
select SYS_FSL_ERRATUM_A006379 select SYS_FSL_ERRATUM_A006379
select SYS_FSL_ERRATUM_A006593 select SYS_FSL_ERRATUM_A006593
select SYS_FSL_ERRATUM_A007186 select SYS_FSL_ERRATUM_A007186 if CHAIN_OF_TRUST
select SYS_FSL_ERRATUM_A007798 select SYS_FSL_ERRATUM_A007798
select SYS_FSL_ERRATUM_A007815 select SYS_FSL_ERRATUM_A007815
select SYS_FSL_ERRATUM_A007907 select SYS_FSL_ERRATUM_A007907

7
arch/powerpc/include/asm/config_mpc85xx.h
View File

@ -18,7 +18,6 @@
/* IP endianness */ /* IP endianness */
#define CONFIG_SYS_FSL_IFC_BE #define CONFIG_SYS_FSL_IFC_BE
#define CONFIG_SYS_FSL_SFP_BE
#if defined(CONFIG_ARCH_MPC8548) #if defined(CONFIG_ARCH_MPC8548)
#define CONFIG_SYS_FSL_SRIO_MAX_PORTS 1 #define CONFIG_SYS_FSL_SRIO_MAX_PORTS 1
@ -199,7 +198,6 @@
#define CONFIG_SYS_FSL_SRIO_LIODN #define CONFIG_SYS_FSL_SRIO_LIODN
#define CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE #define CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE
#define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY #define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
#define CONFIG_SYS_FSL_SFP_VER_3_0
#define CONFIG_SYS_FSL_PCI_VER_3_X #define CONFIG_SYS_FSL_PCI_VER_3_X
#elif defined(CONFIG_ARCH_B4860) || defined(CONFIG_ARCH_B4420) #elif defined(CONFIG_ARCH_B4860) || defined(CONFIG_ARCH_B4420)
@ -216,7 +214,6 @@
#define CONFIG_SYS_FSL_TBCLK_DIV 16 #define CONFIG_SYS_FSL_TBCLK_DIV 16
#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.4" #define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.4"
#define CONFIG_SYS_FSL_USB1_PHY_ENABLE #define CONFIG_SYS_FSL_USB1_PHY_ENABLE
#define CONFIG_SYS_FSL_SFP_VER_3_0
#ifdef CONFIG_ARCH_B4860 #ifdef CONFIG_ARCH_B4860
#define CONFIG_SYS_FSL_CORES_PER_CLUSTER 4 #define CONFIG_SYS_FSL_CORES_PER_CLUSTER 4
@ -264,7 +261,6 @@
#define QE_MURAM_SIZE 0x6000UL #define QE_MURAM_SIZE 0x6000UL
#define MAX_QE_RISC 1 #define MAX_QE_RISC 1
#define QE_NUM_OF_SNUM 28 #define QE_NUM_OF_SNUM 28
#define CONFIG_SYS_FSL_SFP_VER_3_0
#elif defined(CONFIG_ARCH_T1024) #elif defined(CONFIG_ARCH_T1024)
#define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
@ -291,7 +287,6 @@
#define QE_MURAM_SIZE 0x6000UL #define QE_MURAM_SIZE 0x6000UL
#define MAX_QE_RISC 1 #define MAX_QE_RISC 1
#define QE_NUM_OF_SNUM 28 #define QE_NUM_OF_SNUM 28
#define CONFIG_SYS_FSL_SFP_VER_3_0
#elif defined(CONFIG_ARCH_T2080) #elif defined(CONFIG_ARCH_T2080)
#define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
@ -321,10 +316,8 @@
#define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v3.0" #define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v3.0"
#define CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE #define CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE
#define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY #define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
#define CONFIG_SYS_FSL_SFP_VER_3_0
#define CONFIG_SYS_FSL_ISBC_VER 2 #define CONFIG_SYS_FSL_ISBC_VER 2
#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
#define CONFIG_SYS_FSL_SFP_VER_3_0
#elif defined(CONFIG_ARCH_C29X) #elif defined(CONFIG_ARCH_C29X)

5
arch/powerpc/include/asm/fsl_secure_boot.h
View File

@ -31,7 +31,6 @@
#ifndef CONFIG_SYS_RAMBOOT #ifndef CONFIG_SYS_RAMBOOT
#define CONFIG_SYS_CPC_REINIT_F #define CONFIG_SYS_CPC_REINIT_F
#endif #endif
#define CONFIG_KEY_REVOCATION
#undef CONFIG_SYS_INIT_L3_ADDR #undef CONFIG_SYS_INIT_L3_ADDR
#define CONFIG_SYS_INIT_L3_ADDR 0xbff00000 #define CONFIG_SYS_INIT_L3_ADDR 0xbff00000
#endif #endif
@ -47,10 +46,6 @@
#endif #endif
#endif #endif
#if defined(CONFIG_TARGET_C29XPCIE)
#define CONFIG_KEY_REVOCATION
#endif
#if defined(CONFIG_ARCH_P3041) || \ #if defined(CONFIG_ARCH_P3041) || \
defined(CONFIG_ARCH_P4080) || \ defined(CONFIG_ARCH_P4080) || \
defined(CONFIG_ARCH_P5040) || \ defined(CONFIG_ARCH_P5040) || \

2
include/fsl_sfp.h
View File

@ -24,8 +24,6 @@
#define sfp_in32(a) in_be32(a) #define sfp_in32(a) in_be32(a)
#define sfp_out32(a, v) out_be32(a, v) #define sfp_out32(a, v) out_be32(a, v)
#define sfp_in16(a) in_be16(a) #define sfp_in16(a) in_be16(a)
#else
#error Neither CONFIG_SYS_FSL_SFP_LE nor CONFIG_SYS_FSL_SFP_BE is defined
#endif #endif
/* Number of SRKH registers */ /* Number of SRKH registers */