Skip to contentSkip to conversation

Convert CONFIG_EXTRA_CLOCK to Kconfig

PATCH Superseded Tom Rini 1 participant 9 messages Jun 16, 2022 – Jul 6, 2022

Subsystems (6)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/8 Convert CONFIG_EXTRA_CLOCK to Kconfig

This converts the following to Kconfig:
CONFIG_EXTRA_CLOCK

---
 board/sysam/stmark2/Kconfig | 3 +++
 include/configs/stmark2.h   | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)
board/sysam/stmark2/Kconfig +3 -0
index 4abcdb3aaf16..49d02744a9a0 100644
@@ -3,6 +3,9 @@ if TARGET_STMARK2
 config CF_SBF
 	def_bool y
 
+config EXTRA_CLOCK
+	def_bool y
+
 config SYS_INPUT_CLKSRC
 	hex
 	default 30000000
include/configs/stmark2.h +0 -1
index 2195feeb658e..797d9bbb4af1 100644
@@ -41,7 +41,6 @@
 #define CONFIG_SYS_SBFHDR_SIZE		0x7
 
 /* Input, PCI, Flexbus, and VCO */
-#define CONFIG_EXTRA_CLOCK
 
 #define CONFIG_PRAM			2048	/* 2048 KB */
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/8 Convert CONFIG_HETROGENOUS_CLUSTERS et al to Kconfig

This converts the following to Kconfig:
CONFIG_HETROGENOUS_CLUSTERS
CONFIG_SYS_MAPLE
CONFIG_SYS_CPRI
CONFIG_PPC_CLUSTER_START
CONFIG_DSP_CLUSTER_START
CONFIG_SYS_CPRI_CLK
CONFIG_SYS_ULB_CLK
CONFIG_SYS_ETVPE_CLK

---
 arch/powerpc/cpu/mpc85xx/Kconfig          | 34 +++++++++++++++++++++++
 arch/powerpc/include/asm/config_mpc85xx.h |  8 ------
 2 files changed, 34 insertions(+), 8 deletions(-)
arch/powerpc/cpu/mpc85xx/Kconfig +34 -0
index 5510bc728788..2cc0185c3778 100644
@@ -187,6 +187,7 @@ config ARCH_B4420
 	select E500MC
 	select E6500
 	select FSL_LAW
+	select HETROGENOUS_CLUSTERS
 	select SYS_FSL_DDR_VER_47
 	select SYS_FSL_ERRATUM_A004477
 	select SYS_FSL_ERRATUM_A005871
@@ -214,6 +215,7 @@ config ARCH_B4860
 	select E500MC
 	select E6500
 	select FSL_LAW
+	select HETROGENOUS_CLUSTERS
 	select SYS_FSL_DDR_VER_47
 	select SYS_FSL_ERRATUM_A004477
 	select SYS_FSL_ERRATUM_A005871
@@ -822,6 +824,9 @@ config FSL_LAW
 	help
 		Use Freescale common code for Local Access Window
 
+config HETROGENOUS_CLUSTERS
+	bool
+
 config NXP_ESBC
 	bool	"NXP_ESBC"
 	help
@@ -1121,6 +1126,35 @@ config SYS_NUM_TLBCAMS
 		Number of TLB CAM entries for Book-E chips. 64 for E500MC,
 		16 for other E500 SoCs.
 
+if HETROGENOUS_CLUSTERS
+
+config SYS_MAPLE
+	def_bool y
+
+config SYS_CPRI
+	def_bool y
+
+config PPC_CLUSTER_START
+	int
+	default 0
+
+config DSP_CLUSTER_START
+	int
+	default 1
+
+config SYS_CPRI_CLK
+	int
+	default 3
+
+config SYS_ULB_CLK
+	int
+	default 4
+
+config SYS_ETVPE_CLK
+	int
+	default 1
+endif
+
 config BACKSIDE_L2_CACHE
 	bool
 
arch/powerpc/include/asm/config_mpc85xx.h +0 -8
index 06f66d02de2b..225befb3a5e3 100644
@@ -206,19 +206,11 @@
 #elif defined(CONFIG_ARCH_B4860) || defined(CONFIG_ARCH_B4420)
 #define CONFIG_FSL_CORENET		/* Freescale CoreNet platform */
 #define CONFIG_SYS_FSL_QMAN_V3		/* QMAN version 3 */
-#define CONFIG_HETROGENOUS_CLUSTERS     /* DSP/SC3900 core clusters */
-#define CONFIG_PPC_CLUSTER_START	0 /*Start index of ppc clusters*/
-#define CONFIG_DSP_CLUSTER_START	1 /*Start index of dsp clusters*/
 #define CONFIG_SYS_FSL_SRDS_1
 #define CONFIG_SYS_FSL_SRDS_2
-#define CONFIG_SYS_MAPLE
-#define CONFIG_SYS_CPRI
 #define CONFIG_SYS_FSL_NUM_CC_PLLS	5
 #define CONFIG_SYS_NUM_FMAN		1
 #define CONFIG_SYS_FM1_CLK		0
-#define CONFIG_SYS_CPRI_CLK		3
-#define CONFIG_SYS_ULB_CLK		4
-#define CONFIG_SYS_ETVPE_CLK		1
 #define CONFIG_SYS_FSL_IFC_BANK_COUNT	4
 #define CONFIG_SYS_FMAN_V3
 #define CONFIG_SYS_FM_MURAM_SIZE	0x60000
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 3/8 nxp: Make board/freescale/common/Kconfig safe to include once in arch/Kconfig

In reply to Tom Rini

The way that we use this file currently means that we have to guard it in every platform Kconfig. But it is also required in all NXP platforms, including non-reference platforms. Make all options in it have appropriate dependencies so that we can include it a single time under arch/Kconfig

---
 arch/Kconfig                              |  1 +
 board/advantech/imx8mp_rsb3720a1/Kconfig  |  2 --
 board/advantech/imx8qm_rom7720_a1/Kconfig |  2 --
 board/beacon/imx8mm/Kconfig               |  2 --
 board/beacon/imx8mn/Kconfig               |  2 --
 board/bsh/imx8mn_smm_s2/Kconfig           |  4 ----
 board/engicam/imx8mm/Kconfig              |  2 --
 board/freescale/common/Kconfig            | 12 ++++++++----
 board/freescale/corenet_ds/Kconfig        |  6 ------
 board/freescale/imx8mn_evk/Kconfig        |  2 --
 board/freescale/imx8mp_evk/Kconfig        |  2 --
 board/freescale/imx8qm_mek/Kconfig        |  2 --
 board/freescale/imx8qxp_mek/Kconfig       |  2 --
 board/freescale/imx8ulp_evk/Kconfig       |  2 --
 board/freescale/ls1012afrdm/Kconfig       |  4 ----
 board/freescale/ls1012aqds/Kconfig        |  3 ---
 board/freescale/ls1012ardb/Kconfig        |  4 ----
 board/freescale/ls1021aiot/Kconfig        |  2 --
 board/freescale/ls1021aqds/Kconfig        |  2 --
 board/freescale/ls1021atsn/Kconfig        |  2 --
 board/freescale/ls1021atwr/Kconfig        |  2 --
 board/freescale/ls1028a/Kconfig           |  4 ----
 board/freescale/ls1043aqds/Kconfig        |  2 --
 board/freescale/ls1043ardb/Kconfig        |  2 --
 board/freescale/ls1046afrwy/Kconfig       |  1 -
 board/freescale/ls1046aqds/Kconfig        |  2 --
 board/freescale/ls1046ardb/Kconfig        |  1 -
 board/freescale/ls1088a/Kconfig           |  2 --
 board/freescale/ls2080aqds/Kconfig        |  2 --
 board/freescale/ls2080ardb/Kconfig        |  4 ----
 board/freescale/lx2160a/Kconfig           |  3 ---
 board/freescale/p1010rdb/Kconfig          |  2 --
 board/freescale/p1_p2_rdb_pc/Kconfig      |  2 --
 board/freescale/p2041rdb/Kconfig          |  2 --
 board/freescale/t102xrdb/Kconfig          |  2 --
 board/freescale/t104xrdb/Kconfig          |  2 --
 board/freescale/t208xqds/Kconfig          |  2 --
 board/freescale/t208xrdb/Kconfig          |  2 --
 board/freescale/t4rdb/Kconfig             |  2 --
 board/variscite/imx8mn_var_som/Kconfig    |  2 --
 configs/kmcent2_defconfig                 |  1 +
 configs/pg_wcom_expu1_defconfig           |  1 +
 configs/pg_wcom_expu1_update_defconfig    |  1 +
 configs/pg_wcom_seli8_defconfig           |  1 +
 configs/pg_wcom_seli8_update_defconfig    |  1 +
 45 files changed, 14 insertions(+), 94 deletions(-)
arch/Kconfig +1 -0
index 12de8a11650d..b7f9d644ef28 100644
@@ -446,4 +446,5 @@ source "arch/x86/Kconfig"
 source "arch/xtensa/Kconfig"
 source "arch/riscv/Kconfig"
 
+source "board/freescale/common/Kconfig"
 source "board/keymile/Kconfig"
board/advantech/imx8mp_rsb3720a1/Kconfig +0 -2
index 4486ed6d335a..95cac7c4f09f 100644
@@ -9,6 +9,4 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "imx8mp_rsb3720"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/advantech/imx8qm_rom7720_a1/Kconfig +0 -2
index 8bf3a7d34846..c846537f7432 100644
@@ -12,6 +12,4 @@ config SYS_CONFIG_NAME
 config IMX_CONFIG
 	default "board/advantech/imx8qm_rom7720_a1/imximage.cfg"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/beacon/imx8mm/Kconfig +0 -2
index 63f064e8cb85..e5d8aa3ec9cd 100644
@@ -12,6 +12,4 @@ config SYS_CONFIG_NAME
 config IMX_CONFIG
 	default "board/beacon/imx8mm/imximage-8mm-lpddr4.cfg"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/beacon/imx8mn/Kconfig +0 -2
index fb301397b1ad..e11286c5c3ac 100644
@@ -18,6 +18,4 @@ config IMX8MN_BEACON_2GB_LPDDR
 config IMX_CONFIG
 	default "board/beacon/imx8mn/imximage-8mn-lpddr4.cfg"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/bsh/imx8mn_smm_s2/Kconfig +0 -4
index f43d058f2188..041a9c78a66d 100644
@@ -22,8 +22,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select BSH_SMM_S2_DDR3L_256
 
-source "board/freescale/common/Kconfig"
-
 endif
 
 if TARGET_IMX8MN_BSH_SMM_S2PRO
@@ -44,6 +42,4 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select BSH_SMM_S2_DDR3L_512
 
-source "board/freescale/common/Kconfig"
-
 endif
board/engicam/imx8mm/Kconfig +0 -2
index 5495b3bf99be..3b3b93bb2f0a 100644
@@ -12,6 +12,4 @@ config SYS_CONFIG_NAME
 config IMX_CONFIG
 	default "arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/common/Kconfig +8 -4
index c13c865fd1f1..9c305b3748eb 100644
@@ -15,7 +15,8 @@ config CHAIN_OF_TRUST
 
 config CMD_ESBC_VALIDATE
 	bool "Enable the 'esbc_validate' and 'esbc_halt' commands"
-	default y if CHAIN_OF_TRUST
+	depends on CHAIN_OF_TRUST
+	default y
 	help
 	  This option enables two commands used for secure booting:
 
@@ -24,26 +25,28 @@ config CMD_ESBC_VALIDATE
 
 config DEEP_SLEEP
 	bool "Enable SoC deep sleep feature"
-	default y if ARCH_T1024 || ARCH_T1040 || ARCH_T1042 || ARCH_LS1021A
+	depends on ARCH_T1024 || ARCH_T1040 || ARCH_T1042 || ARCH_LS1021A
+	default y
 	help
 	  Indicates this SoC supports deep sleep feature. If deep sleep is
 	  supported, core will start to execute uboot when wakes up.
 
 config FSL_USE_PCA9547_MUX
 	bool "Enable PCA9547 I2C Mux on Freescale boards"
+	depends on PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
 	help
 	 This option enables the PCA9547 I2C mux on Freescale boards.
 
 config VID
 	bool "Enable Freescale VID"
-	depends on I2C || DM_I2C
+	depends on (PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3) && (I2C || DM_I2C)
 	help
 	 This option enables setting core voltage based on individual
 	 values saved in SoC fuses.
 
 config SPL_VID
 	bool "Enable Freescale VID in SPL"
-	depends on I2C || DM_I2C
+	depends on (PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3) && (SPL_I2C || DM_SPL_I2C)
 	help
 	 This option enables setting core voltage based on individual
 	 values saved in SoC fuses, in SPL.
@@ -102,6 +105,7 @@ endif
 
 config FSL_QIXIS
 	bool "Enable QIXIS support"
+	depends on PPC || ARCH_LS1021A || FSL_LSCH2 || FSL_LSCH3
 
 config QIXIS_I2C_ACCESS
 	bool "Access to QIXIS is over i2c"
board/freescale/corenet_ds/Kconfig +0 -6
index e92b0d099da7..dbcd1afcbad1 100644
@@ -9,8 +9,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "P3041DS"
 
-source "board/freescale/common/Kconfig"
-
 endif
 
 if TARGET_P4080DS
@@ -24,8 +22,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "P4080DS"
 
-source "board/freescale/common/Kconfig"
-
 endif
 
 if TARGET_P5040DS
@@ -39,6 +35,4 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "P5040DS"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/imx8mn_evk/Kconfig +0 -2
index 0adf87bd42a1..a148a9b998c5 100644
@@ -15,6 +15,4 @@ config IMX8MN_LOW_DRIVE_MODE
 config IMX_CONFIG
 	default "board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/imx8mp_evk/Kconfig +0 -2
index 42625fd58889..cafa6329a40b 100644
@@ -12,6 +12,4 @@ config SYS_CONFIG_NAME
 config IMX_CONFIG
 	default "board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/imx8qm_mek/Kconfig +0 -2
index aed6ab25ce18..5f2413f8dbfc 100644
@@ -12,6 +12,4 @@ config SYS_CONFIG_NAME
 config IMX_CONFIG
 	default "board/freescale/imx8qm_mek/imximage.cfg"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/imx8qxp_mek/Kconfig +0 -2
index b9aab3789ee4..6533b4d9535e 100644
@@ -12,6 +12,4 @@ config SYS_CONFIG_NAME
 config IMX_CONFIG
 	default "board/freescale/imx8qxp_mek/imximage.cfg"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/imx8ulp_evk/Kconfig +0 -2
index 1e461ee1da71..4637b969be6d 100644
@@ -9,6 +9,4 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "imx8ulp_evk"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/ls1012afrdm/Kconfig +0 -4
index 4ac69d711748..75de782afc9c 100644
@@ -89,7 +89,3 @@ config SYS_LS_PFE_ESBC_LENGTH
 	hex "length of PFE Firmware HDR"
 	default 0xc00
 endif
-
-if TARGET_LS1012AFRDM || TARGET_LS1012AFRWY
-source "board/freescale/common/Kconfig"
-endif
board/freescale/ls1012aqds/Kconfig +0 -3
index 59b1a876655f..991ba6044db8 100644
@@ -77,7 +77,4 @@ config PFE_SGMII_2500_PHY2_ADDR
 
 endif
 
-
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/ls1012ardb/Kconfig +0 -4
index c4acea3ae2db..aa15f5a027e8 100644
@@ -63,8 +63,6 @@ config PFE_EMAC2_PHY_ADDR
 
 endif
 
-source "board/freescale/common/Kconfig"
-
 endif
 
 if TARGET_LS1012A2G5RDB
@@ -119,6 +117,4 @@ config PFE_EMAC2_PHY_ADDR
 
 endif
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/ls1021aiot/Kconfig +0 -2
index c6b16063a4a6..4a12c1687fce 100644
@@ -12,6 +12,4 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls1021aiot"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/ls1021aqds/Kconfig +0 -2
index 60b8472990da..119b9550410c 100644
@@ -12,6 +12,4 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls1021aqds"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/ls1021atsn/Kconfig +0 -2
index d999fa469002..aa42a06c663f 100644
@@ -13,6 +13,4 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls1021atsn"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/ls1021atwr/Kconfig +0 -2
index a4641cbca09b..bc50b8d96689 100644
@@ -12,6 +12,4 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls1021atwr"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/ls1028a/Kconfig +0 -4
index 40939816ad89..5c27f0f726dd 100644
@@ -32,8 +32,6 @@ config SYS_LS_PPA_ESBC_ADDR
 endif
 endif
 
-source "board/freescale/common/Kconfig"
-
 endif
 
 if TARGET_LS1028ARDB
@@ -58,6 +56,4 @@ config SYS_TEXT_BASE
 	default 0x82000000 if TFABOOT
 	default 0x20100000
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/ls1043aqds/Kconfig +0 -2
index 182900efb7b2..4be445e8c8f8 100644
@@ -28,6 +28,4 @@ config SYS_LS_PPA_ESBC_ADDR
 endif
 endif
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/ls1043ardb/Kconfig +0 -2
index d66c7804b13e..56502f9f9c63 100644
@@ -27,6 +27,4 @@ config SYS_LS_PPA_ESBC_ADDR
 endif
 endif
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/ls1046afrwy/Kconfig +0 -1
index 6a4c3e92f7ba..68329d78caf3 100644
@@ -13,5 +13,4 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls1046afrwy"
 
-source "board/freescale/common/Kconfig"
 endif
board/freescale/ls1046aqds/Kconfig +0 -2
index 1616dcc683eb..adf325f4efd0 100644
@@ -28,6 +28,4 @@ config SYS_LS_PPA_ESBC_ADDR
 endif
 endif
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/ls1046ardb/Kconfig +0 -1
index 4c31e0e88572..1fb391c991c6 100644
@@ -27,5 +27,4 @@ config SYS_LS_PPA_ESBC_ADDR
 endif
 endif
 
-source "board/freescale/common/Kconfig"
 endif
board/freescale/ls1088a/Kconfig +0 -2
index 8bb828e3fd66..f1a45236061b 100644
@@ -26,7 +26,6 @@ config SYS_LS_PPA_ESBC_ADDR
 endif
 endif
 
-source "board/freescale/common/Kconfig"
 endif
 
 if TARGET_LS1088ARDB
@@ -57,5 +56,4 @@ config SYS_LS_PPA_ESBC_ADDR
 endif
 endif
 
-source "board/freescale/common/Kconfig"
 endif
board/freescale/ls2080aqds/Kconfig +0 -2
index 6b2b64581d60..1036f33c61fa 100644
@@ -29,6 +29,4 @@ config SYS_LS_PPA_ESBC_ADDR
 endif
 endif
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/ls2080ardb/Kconfig +0 -4
index 678d58257303..c8b0b94596b5 100644
@@ -12,8 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "ls2080ardb"
 
-source "board/freescale/common/Kconfig"
-
 if FSL_LS_PPA
 config SYS_LS_PPA_FW_ADDR
 	hex "PPA Firmware Addr"
@@ -30,6 +28,4 @@ config SYS_LS_PPA_ESBC_ADDR
 endif
 endif
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/lx2160a/Kconfig +0 -3
index 7556f7dd2156..0e4b4158a7f1 100644
@@ -12,7 +12,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "lx2160ardb"
 
-source "board/freescale/common/Kconfig"
 endif
 
 if TARGET_LX2160AQDS
@@ -29,7 +28,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "lx2160aqds"
 
-source "board/freescale/common/Kconfig"
 endif
 
 if TARGET_LX2162AQDS
@@ -46,5 +44,4 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "lx2162aqds"
 
-source "board/freescale/common/Kconfig"
 endif
board/freescale/p1010rdb/Kconfig +0 -2
index 3adac4af1e3c..159bcc4f54d9 100644
@@ -9,6 +9,4 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "P1010RDB"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/p1_p2_rdb_pc/Kconfig +0 -2
index db7b47a4635b..cd36150f6377 100644
@@ -11,6 +11,4 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "p1_p2_rdb_pc"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/p2041rdb/Kconfig +0 -2
index 7e187dde7255..78e11214a5b8 100644
@@ -9,6 +9,4 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "P2041RDB"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/t102xrdb/Kconfig +0 -2
index 6deeb248a300..d538386d4344 100644
@@ -9,6 +9,4 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "T102xRDB"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/t104xrdb/Kconfig +0 -2
index e6e46fa126fb..e33d3173650c 100644
@@ -11,6 +11,4 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "T104xRDB"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/t208xqds/Kconfig +0 -2
index 58a31b65278e..c419a59dbb62 100644
@@ -12,6 +12,4 @@ config SYS_CONFIG_NAME
 config SRIO_PCIE_BOOT_SLAVE
 	bool "Boot as a SRIO PCIe slave device"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/t208xrdb/Kconfig +0 -2
index d4c061a5eabc..35d884e6ccbd 100644
@@ -12,6 +12,4 @@ config SYS_CONFIG_NAME
 config T2080RDB_REV_D
 	bool "Support for T2080RDB revisions D and up"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/freescale/t4rdb/Kconfig +0 -2
index 542e574fed14..d93e4532ac4a 100644
@@ -9,6 +9,4 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "T4240RDB"
 
-source "board/freescale/common/Kconfig"
-
 endif
board/variscite/imx8mn_var_som/Kconfig +0 -2
index cfe6fc8c2c78..9a4003aa11b0 100644
@@ -12,6 +12,4 @@ config SYS_CONFIG_NAME
 config IMX_CONFIG
 	default "board/variscite/imx8mn_var_som/imximage-8mn-ddr4.cfg"
 
-source "board/freescale/common/Kconfig"
-
 endif
configs/kmcent2_defconfig +1 -0
index 8540923f8911..37529f21df39 100644
@@ -11,6 +11,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_KMCENT2=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+# CONFIG_DEEP_SLEEP is not set
 CONFIG_KM_DEF_NETDEV="eth2"
 CONFIG_KM_IVM_BUS=2
 CONFIG_MP=y
configs/pg_wcom_expu1_defconfig +1 -0
index c5d657408343..fe864c75b7f0 100644
@@ -18,6 +18,7 @@ CONFIG_SYS_CLK_FREQ=66666666
 CONFIG_SYS_LOAD_ADDR=0x82000000
 CONFIG_ENV_ADDR=0x60060000
 CONFIG_AHCI=y
+# CONFIG_DEEP_SLEEP is not set
 CONFIG_KM_DEF_NETDEV="eth2"
 CONFIG_KM_COMMON_ETH_INIT=y
 CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3
configs/pg_wcom_expu1_update_defconfig +1 -0
index c2b079df3790..787fe554bad2 100644
@@ -17,6 +17,7 @@ CONFIG_SYS_BOOTCOUNT_ADDR=0x70000020
 CONFIG_SYS_LOAD_ADDR=0x82000000
 CONFIG_ENV_ADDR=0x60220000
 CONFIG_AHCI=y
+# CONFIG_DEEP_SLEEP is not set
 CONFIG_KM_DEF_NETDEV="eth2"
 CONFIG_KM_COMMON_ETH_INIT=y
 CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3
configs/pg_wcom_seli8_defconfig +1 -0
index 56e922a241cc..51919dc6cbbb 100644
@@ -18,6 +18,7 @@ CONFIG_SYS_CLK_FREQ=66666666
 CONFIG_SYS_LOAD_ADDR=0x82000000
 CONFIG_ENV_ADDR=0x60060000
 CONFIG_AHCI=y
+# CONFIG_DEEP_SLEEP is not set
 CONFIG_KM_DEF_NETDEV="eth2"
 CONFIG_KM_COMMON_ETH_INIT=y
 CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3
configs/pg_wcom_seli8_update_defconfig +1 -0
index 9d25094a9a6b..0f22511dabc8 100644
@@ -17,6 +17,7 @@ CONFIG_SYS_BOOTCOUNT_ADDR=0x70000020
 CONFIG_SYS_LOAD_ADDR=0x82000000
 CONFIG_ENV_ADDR=0x60220000
 CONFIG_AHCI=y
+# CONFIG_DEEP_SLEEP is not set
 CONFIG_KM_DEF_NETDEV="eth2"
 CONFIG_KM_COMMON_ETH_INIT=y
 CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH 4/8 nxp: Rename board/freescale/common/Kconfig to arch/Kconfig.nxp

In reply to Tom Rini

Now that board/freescale/common/Kconfig is safe to be included once, globally, rename this to arch/Kconfig.nxp to better reflect that it contains options that are valid on multiple architectures and SoC families, and not specific to NXP reference platforms either.

Cc Stefano Babic <[email protected]>
Cc Peng Fan <[email protected]>
---
 arch/Kconfig                                       | 7 ++++++-
 board/freescale/common/Kconfig => arch/Kconfig.nxp | 0
 2 files changed, 6 insertions(+), 1 deletion(-)
 rename board/freescale/common/Kconfig => arch/Kconfig.nxp (100%)
arch/Kconfig +6 -1
index b7f9d644ef28..dccae0f673a6 100644
@@ -446,5 +446,10 @@ source "arch/x86/Kconfig"
 source "arch/xtensa/Kconfig"
 source "arch/riscv/Kconfig"
 
-source "board/freescale/common/Kconfig"
+if ARM || M68K || PPC
+
+source "arch/Kconfig.nxp"
+
+endif
+
 source "board/keymile/Kconfig"
arch/Kconfig.nxp renamed from board/freescale/common/Kconfig +0 -0
similarity index 100%
rename from board/freescale/common/Kconfig
rename to arch/Kconfig.nxp
Signature · 1 line
2.25.1
author
#4 lore raw

PATCH 5/8 Convert CONFIG_ESBC_HDR_LS et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_ESBC_HDR_LS
CONFIG_ESBC_ADDR_64BIT

---
 arch/Kconfig.nxp                                  |  9 +++++++++
 arch/arm/cpu/armv8/fsl-layerscape/Kconfig         |  5 +++++
 arch/arm/include/asm/arch-fsl-layerscape/config.h | 12 ------------
 arch/arm/include/asm/fsl_secure_boot.h            |  8 --------
 4 files changed, 14 insertions(+), 20 deletions(-)
arch/Kconfig.nxp +9 -0
index 9c305b3748eb..e002ab40152b 100644
@@ -23,6 +23,15 @@ config CMD_ESBC_VALIDATE
 	    esbc_validate - validate signature using RSA verification
 	    esbc_halt - put the core in spin loop (Secure Boot Only)
 
+config ESBC_HDR_LS
+	bool
+
+config ESBC_ADDR_64BIT
+	def_bool y
+	depends on ESBC_HDR_LS && FSL_LAYERSCAPE
+	help
+	  For Layerscape based platforms, ESBC image Address in Header is 64bit.
+
 config DEEP_SLEEP
 	bool "Enable SoC deep sleep feature"
 	depends on ARCH_T1024 || ARCH_T1040 || ARCH_T1042 || ARCH_LS1021A
arch/arm/cpu/armv8/fsl-layerscape/Kconfig +5 -0
index 3ea023d36f9b..7f08733a35b6 100644
@@ -26,6 +26,7 @@ config ARCH_LS1012A
 config ARCH_LS1028A
 	bool
 	select ARMV8_SET_SMPEN
+	select ESBC_HDR_LS
 	select FSL_LAYERSCAPE
 	select FSL_LSCH3
 	select GICV3
@@ -138,6 +139,7 @@ config ARCH_LS1088A
 	bool
 	select ARMV8_SET_SMPEN
 	select ARM_ERRATA_855873 if !TFABOOT
+	select ESBC_HDR_LS
 	select FSL_IFC
 	select FSL_LAYERSCAPE
 	select FSL_LSCH3
@@ -187,6 +189,7 @@ config ARCH_LS2080A
 	select ARM_ERRATA_828024
 	select ARM_ERRATA_829520
 	select ARM_ERRATA_833471
+	select ESBC_HDR_LS
 	select FSL_IFC
 	select FSL_LAYERSCAPE
 	select FSL_LSCH3
@@ -239,6 +242,7 @@ config ARCH_LS2080A
 config ARCH_LX2162A
 	bool
 	select ARMV8_SET_SMPEN
+	select ESBC_HDR_LS
 	select FSL_DDR_BIST
 	select FSL_DDR_INTERACTIVE
 	select FSL_LAYERSCAPE
@@ -277,6 +281,7 @@ config ARCH_LX2162A
 config ARCH_LX2160A
 	bool
 	select ARMV8_SET_SMPEN
+	select ESBC_HDR_LS
 	select FSL_DDR_BIST
 	select FSL_DDR_INTERACTIVE
 	select FSL_LAYERSCAPE
arch/arm/include/asm/arch-fsl-layerscape/config.h +0 -12
index 1315bebb56f7..709c2933bae0 100644
@@ -63,9 +63,6 @@
 /* Security Monitor */
 #define CONFIG_SYS_FSL_SEC_MON_LE
 
-/* Secure Boot */
-#define CONFIG_ESBC_HDR_LS
-
 /* DCFG - GUR */
 #define CONFIG_SYS_FSL_CCSR_GUR_LE
 
@@ -168,9 +165,6 @@
 /* Security Monitor */
 #define CONFIG_SYS_FSL_SEC_MON_LE
 
-/* Secure Boot */
-#define CONFIG_ESBC_HDR_LS
-
 /* DCFG - GUR */
 #define CONFIG_SYS_FSL_CCSR_GUR_LE
 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC	1
@@ -223,9 +217,6 @@
 /* Security Monitor */
 #define CONFIG_SYS_FSL_SEC_MON_LE
 
-/* Secure Boot */
-#define CONFIG_ESBC_HDR_LS
-
 /* DCFG - GUR */
 #define CONFIG_SYS_FSL_CCSR_GUR_LE
 
@@ -285,9 +276,6 @@
 /* Security Monitor */
 #define CONFIG_SYS_FSL_SEC_MON_LE
 
-/* Secure Boot */
-#define CONFIG_ESBC_HDR_LS
-
 /* DCFG - GUR */
 #define CONFIG_SYS_FSL_CCSR_GUR_LE
 
arch/arm/include/asm/fsl_secure_boot.h +0 -8
index b0c7599e412b..154663e192c2 100644
@@ -25,14 +25,6 @@
 
 #define CONFIG_KEY_REVOCATION
 
-#if defined(CONFIG_FSL_LAYERSCAPE)
-/*
- * For fsl layerscape based platforms, ESBC image Address in Header
- * is 64 bit.
- */
-#define CONFIG_ESBC_ADDR_64BIT
-#endif
-
 #ifndef CONFIG_SPL_BUILD
 #ifndef CONFIG_SYS_RAMBOOT
 /* The key used for verification of next level images
Signature · 1 line
2.25.1
author
#5 lore raw

PATCH 6/8 Convert CONFIG_ESDHC_DETECT_QUIRK to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_ESDHC_DETECT_QUIRK

---
 board/freescale/common/qixis.h                | 21 +++++++++++++++++++
 board/freescale/lx2160a/lx2160a.c             | 21 -------------------
 configs/ls1088aqds_defconfig                  |  1 +
 configs/ls1088aqds_qspi_SECURE_BOOT_defconfig |  1 +
 configs/ls1088aqds_qspi_defconfig             |  1 +
 configs/ls1088aqds_sdcard_ifc_defconfig       |  1 +
 configs/ls1088aqds_sdcard_qspi_defconfig      |  1 +
 configs/ls1088aqds_tfa_defconfig              |  1 +
 configs/ls2080aqds_SECURE_BOOT_defconfig      |  1 +
 configs/ls2080aqds_defconfig                  |  1 +
 configs/ls2080aqds_nand_defconfig             |  1 +
 configs/ls2080aqds_qspi_defconfig             |  1 +
 configs/ls2080aqds_sdcard_defconfig           |  1 +
 configs/ls2088aqds_tfa_defconfig              |  1 +
 configs/lx2160aqds_tfa_SECURE_BOOT_defconfig  |  1 +
 configs/lx2160aqds_tfa_defconfig              |  1 +
 drivers/mmc/Kconfig                           |  4 ++++
 drivers/mmc/fsl_esdhc.c                       |  3 ++-
 include/configs/ls1088aqds.h                  |  4 ----
 include/configs/ls2080aqds.h                  |  8 -------
 include/configs/lx2160aqds.h                  | 10 ---------
 include/configs/lx2162aqds.h                  | 10 ---------
 22 files changed, 41 insertions(+), 54 deletions(-)
board/freescale/common/qixis.h +21 -0
index 0860bd231267..af76327e4d2f 100644
@@ -166,4 +166,25 @@ defined(CONFIG_TARGET_LX2160ARDB)
 #define QIXIS_ESDHC_NO_ADAPTER		0x7
 #endif
 
+/*
+ * implementation of CONFIG_ESDHC_DETECT_QUIRK Macro.
+ */
+static inline u8 qixis_esdhc_detect_quirk(void)
+{
+	/*
+	 * SDHC1 Card ID:
+	 * Specifies the type of card installed in the SDHC1 adapter slot.
+	 * 000= (reserved)
+	 * 001= eMMC V4.5 adapter is installed.
+	 * 010= SD/MMC 3.3V adapter is installed.
+	 * 011= eMMC V4.4 adapter is installed.
+	 * 100= eMMC V5.0 adapter is installed.
+	 * 101= MMC card/Legacy (3.3V) adapter is installed.
+	 * 110= SDCard V2/V3 adapter installed.
+	 * 111= no adapter is installed.
+	 */
+	return ((QIXIS_READ(sdhc1) & QIXIS_SDID_MASK) !=
+		 QIXIS_ESDHC_NO_ADAPTER);
+}
+
 #endif
board/freescale/lx2160a/lx2160a.c +0 -21
index 49d96d3fa2a9..a078643708f7 100644
@@ -356,27 +356,6 @@ int checkboard(void)
 }
 
 #if defined(CONFIG_TARGET_LX2160AQDS) || defined(CONFIG_TARGET_LX2162AQDS)
-/*
- * implementation of CONFIG_ESDHC_DETECT_QUIRK Macro.
- */
-u8 qixis_esdhc_detect_quirk(void)
-{
-	/*
-	 * SDHC1 Card ID:
-	 * Specifies the type of card installed in the SDHC1 adapter slot.
-	 * 000= (reserved)
-	 * 001= eMMC V4.5 adapter is installed.
-	 * 010= SD/MMC 3.3V adapter is installed.
-	 * 011= eMMC V4.4 adapter is installed.
-	 * 100= eMMC V5.0 adapter is installed.
-	 * 101= MMC card/Legacy (3.3V) adapter is installed.
-	 * 110= SDCard V2/V3 adapter installed.
-	 * 111= no adapter is installed.
-	 */
-	return ((QIXIS_READ(sdhc1) & QIXIS_SDID_MASK) !=
-		 QIXIS_ESDHC_NO_ADAPTER);
-}
-
 static void esdhc_adapter_card_ident(void)
 {
 	u8 card_id, val;
configs/ls1088aqds_defconfig +1 -0
index 1580ceb6b72c..be351a3b6bf6 100644
@@ -71,6 +71,7 @@ CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_EARLY_INIT=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
+CONFIG_ESDHC_DETECT_QUIRK=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/ls1088aqds_qspi_SECURE_BOOT_defconfig +1 -0
index b20a5d20f7d1..7c2134ae4d97 100644
@@ -65,6 +65,7 @@ CONFIG_MPC8XXX_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
+CONFIG_ESDHC_DETECT_QUIRK=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_FSL_IFC=y
configs/ls1088aqds_qspi_defconfig +1 -0
index caf5d774f57c..0aed10298b3e 100644
@@ -68,6 +68,7 @@ CONFIG_MPC8XXX_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
+CONFIG_ESDHC_DETECT_QUIRK=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_FSL_IFC=y
configs/ls1088aqds_sdcard_ifc_defconfig +1 -0
index 663aacf876b9..6ec9f2b333e0 100644
@@ -90,6 +90,7 @@ CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_EARLY_INIT=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
+CONFIG_ESDHC_DETECT_QUIRK=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/ls1088aqds_sdcard_qspi_defconfig +1 -0
index f3e204875efa..0ca54c8340b3 100644
@@ -86,6 +86,7 @@ CONFIG_MPC8XXX_GPIO=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
+CONFIG_ESDHC_DETECT_QUIRK=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_FSL_IFC=y
configs/ls1088aqds_tfa_defconfig +1 -0
index a135de388ff9..e5063be8fc36 100644
@@ -79,6 +79,7 @@ CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
+CONFIG_ESDHC_DETECT_QUIRK=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/ls2080aqds_SECURE_BOOT_defconfig +1 -0
index abc958f5dd11..383e8928870f 100644
@@ -59,6 +59,7 @@ CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
+CONFIG_ESDHC_DETECT_QUIRK=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/ls2080aqds_defconfig +1 -0
index 9278a6e80f7e..92f129551c25 100644
@@ -62,6 +62,7 @@ CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
+CONFIG_ESDHC_DETECT_QUIRK=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/ls2080aqds_nand_defconfig +1 -0
index dab9a7fb85a9..855d1176e0ba 100644
@@ -83,6 +83,7 @@ CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_EARLY_INIT=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
+CONFIG_ESDHC_DETECT_QUIRK=y
 CONFIG_MTD=y
 CONFIG_NAND_FSL_IFC=y
 CONFIG_SYS_NAND_ONFI_DETECTION=y
configs/ls2080aqds_qspi_defconfig +1 -0
index afa2469b1b44..8ca856c788e3 100644
@@ -64,6 +64,7 @@ CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_EARLY_INIT=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
+CONFIG_ESDHC_DETECT_QUIRK=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_FSL_IFC=y
configs/ls2080aqds_sdcard_defconfig +1 -0
index 3d6aa69d5f18..bc9febcf507c 100644
@@ -78,6 +78,7 @@ CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_EARLY_INIT=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
+CONFIG_ESDHC_DETECT_QUIRK=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_FSL_IFC=y
configs/ls2088aqds_tfa_defconfig +1 -0
index c46e506213c9..60e489facb5c 100644
@@ -73,6 +73,7 @@ CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
+CONFIG_ESDHC_DETECT_QUIRK=y
 CONFIG_MTD=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
configs/lx2160aqds_tfa_SECURE_BOOT_defconfig +1 -0
index 7fe1243795fd..82f35c3efdd4 100644
@@ -69,6 +69,7 @@ CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
+CONFIG_ESDHC_DETECT_QUIRK=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_EON=y
configs/lx2160aqds_tfa_defconfig +1 -0
index b6441a3abde9..97cfb663fb61 100644
@@ -76,6 +76,7 @@ CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
+CONFIG_ESDHC_DETECT_QUIRK=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_EON=y
drivers/mmc/Kconfig +4 -0
index 082352f1f27c..32735628df3c 100644
@@ -843,6 +843,10 @@ config FSL_ESDHC_VS33_NOT_SUPPORT
 	  For eSDHC, power supply is through peripheral circuit. 3.3V support is
 	  common. Select this if 3.3V power supply not supported.
 
+config ESDHC_DETECT_QUIRK
+	bool "QIXIS-based eSDHC quirk detection"
+	depends on FSL_ESDHC && FSL_QIXIS
+
 config FSL_ESDHC_IMX
 	bool "Freescale/NXP i.MX eSDHC controller support"
 	help
drivers/mmc/fsl_esdhc.c +2 -1
index fdf2cc290e06..d0a875114ba0 100644
@@ -30,6 +30,7 @@
 #include <linux/iopoll.h>
 #include <linux/dma-mapping.h>
 #include <sdhci.h>
+#include "../../board/freescale/common/qixis.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -773,7 +774,7 @@ static int esdhc_getcd_common(struct fsl_esdhc_priv *priv)
 	struct fsl_esdhc *regs = priv->esdhc_regs;
 
 #ifdef CONFIG_ESDHC_DETECT_QUIRK
-	if (CONFIG_ESDHC_DETECT_QUIRK)
+	if (qixis_esdhc_detect_quirk())
 		return 1;
 #endif
 	if (esdhc_read32(&regs->prsstat) & PRSSTAT_CINS)
include/configs/ls1088aqds.h +0 -4
index 7c60f287981a..debb60d25cef 100644
@@ -305,10 +305,6 @@
 
 #define CONFIG_FSL_MEMAC
 
-/*  MMC  */
-#define CONFIG_ESDHC_DETECT_QUIRK ((readb(QIXIS_BASE + QIXIS_STAT_PRES1) & \
-	QIXIS_SDID_MASK) != QIXIS_ESDHC_NO_ADAPTER)
-
 #define COMMON_ENV \
 	"kernelheader_addr_r=0x80200000\0"	\
 	"fdtheader_addr_r=0x80100000\0"		\
include/configs/ls2080aqds.h +0 -8
index a0e2127f1ddd..9de602bc1640 100644
@@ -238,14 +238,6 @@
  */
 #define FSL_QIXIS_BRDCFG9_QSPI		0x1
 
-/*
- * MMC
- */
-#ifdef CONFIG_MMC
-#define CONFIG_ESDHC_DETECT_QUIRK ((readb(QIXIS_BASE + QIXIS_STAT_PRES1) & \
-	QIXIS_SDID_MASK) != QIXIS_ESDHC_NO_ADAPTER)
-#endif
-
 /*
  * RTC configuration
  */
include/configs/lx2160aqds.h +0 -10
index e7aec6bc5964..585aab26bff7 100644
@@ -11,16 +11,6 @@
 /* RTC */
 #define CONFIG_SYS_RTC_BUS_NUM		0
 
-/*
- * MMC
- */
-#ifdef CONFIG_MMC
-#ifndef __ASSEMBLY__
-u8 qixis_esdhc_detect_quirk(void);
-#endif
-#define CONFIG_ESDHC_DETECT_QUIRK  qixis_esdhc_detect_quirk()
-#endif
-
 /* MAC/PHY configuration */
 
 /* EEPROM */
include/configs/lx2162aqds.h +0 -10
index 729c2707e990..d1ae40347314 100644
@@ -13,16 +13,6 @@
 /* RTC */
 #define CONFIG_SYS_RTC_BUS_NUM		0
 
-/*
- * MMC
- */
-#ifdef CONFIG_MMC
-#ifndef __ASSEMBLY__
-u8 qixis_esdhc_detect_quirk(void);
-#endif
-#define CONFIG_ESDHC_DETECT_QUIRK  qixis_esdhc_detect_quirk()
-#endif
-
 /* EEPROM */
 #define CONFIG_SYS_I2C_EEPROM_NXID
 #define CONFIG_SYS_EEPROM_BUS_NUM		0
Signature · 1 line
2.25.1
author
#6 lore raw

PATCH 7/8 Convert CONFIG_SYS_FSL_SEC_MON et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_FSL_SEC_MON
CONFIG_SYS_FSL_SEC_MON_BE
CONFIG_SYS_FSL_SEC_MON_LE

---
 arch/Kconfig.nxp                                  |  1 +
 arch/arm/include/asm/arch-fsl-layerscape/config.h | 15 ---------------
 arch/arm/include/asm/arch-ls102xa/config.h        |  1 -
 arch/arm/include/asm/fsl_secure_boot.h            |  2 --
 arch/powerpc/include/asm/config_mpc85xx.h         |  1 -
 arch/powerpc/include/asm/fsl_secure_boot.h        |  2 --
 configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig    |  1 +
 configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig     |  1 +
 configs/ls1012aqds_tfa_SECURE_BOOT_defconfig      |  1 +
 configs/ls1012ardb_qspi_SECURE_BOOT_defconfig     |  1 +
 configs/ls1012ardb_tfa_SECURE_BOOT_defconfig      |  1 +
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig      |  1 +
 configs/ls1043ardb_SECURE_BOOT_defconfig          |  1 +
 configs/ls1043ardb_nand_SECURE_BOOT_defconfig     |  1 +
 configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig   |  1 +
 configs/ls1043ardb_tfa_SECURE_BOOT_defconfig      |  1 +
 configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig     |  1 +
 configs/ls1046aqds_SECURE_BOOT_defconfig          |  1 +
 configs/ls1046aqds_tfa_SECURE_BOOT_defconfig      |  1 +
 configs/ls1046ardb_qspi_SECURE_BOOT_defconfig     |  1 +
 configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig   |  1 +
 configs/ls1046ardb_tfa_SECURE_BOOT_defconfig      |  1 +
 drivers/misc/Kconfig                              | 14 ++++++++++++++
 include/fsl_sec_mon.h                             |  2 --
 24 files changed, 31 insertions(+), 23 deletions(-)
arch/Kconfig.nxp +1 -0
index e002ab40152b..015f57f7d0f3 100644
@@ -3,6 +3,7 @@ config CHAIN_OF_TRUST
 	imply CMD_BLOB
 	imply CMD_HASH if ARM
 	select FSL_CAAM
+	select FSL_SEC_MON
 	select SPL_BOARD_INIT if (ARM && SPL)
 	select SPL_HASH if (ARM && SPL)
 	select SHA_HW_ACCEL
arch/arm/include/asm/arch-fsl-layerscape/config.h +0 -15
index 709c2933bae0..fd41d30c28cd 100644
@@ -60,9 +60,6 @@
 #define CONFIG_SYS_FSL_SFP_LE
 #define CONFIG_SYS_FSL_SRK_LE
 
-/* Security Monitor */
-#define CONFIG_SYS_FSL_SEC_MON_LE
-
 /* DCFG - GUR */
 #define CONFIG_SYS_FSL_CCSR_GUR_LE
 
@@ -162,9 +159,6 @@
 #define CONFIG_SYS_FSL_SFP_LE
 #define CONFIG_SYS_FSL_SRK_LE
 
-/* Security Monitor */
-#define CONFIG_SYS_FSL_SEC_MON_LE
-
 /* DCFG - GUR */
 #define CONFIG_SYS_FSL_CCSR_GUR_LE
 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC	1
@@ -214,9 +208,6 @@
 #define CONFIG_SYS_FSL_SFP_LE
 #define CONFIG_SYS_FSL_SRK_LE
 
-/* Security Monitor */
-#define CONFIG_SYS_FSL_SEC_MON_LE
-
 /* DCFG - GUR */
 #define CONFIG_SYS_FSL_CCSR_GUR_LE
 
@@ -273,9 +264,6 @@
 /* SEC */
 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC		1
 
-/* Security Monitor */
-#define CONFIG_SYS_FSL_SEC_MON_LE
-
 /* DCFG - GUR */
 #define CONFIG_SYS_FSL_CCSR_GUR_LE
 
@@ -310,7 +298,6 @@
 
 #define CONFIG_SYS_FSL_IFC_BE
 #define CONFIG_SYS_FSL_SFP_VER_3_2
-#define CONFIG_SYS_FSL_SEC_MON_BE
 #define CONFIG_SYS_FSL_SFP_BE
 #define CONFIG_SYS_FSL_SRK_LE
 #define CONFIG_KEY_REVOCATION
@@ -350,7 +337,6 @@
 #define GICD_BASE		0x01401000
 #define GICC_BASE		0x01402000
 #define CONFIG_SYS_FSL_SFP_VER_3_2
-#define CONFIG_SYS_FSL_SEC_MON_BE
 #define CONFIG_SYS_FSL_SFP_BE
 #define CONFIG_SYS_FSL_SRK_LE
 #define CONFIG_KEY_REVOCATION
@@ -369,7 +355,6 @@
 
 #define CONFIG_SYS_FSL_IFC_BE
 #define CONFIG_SYS_FSL_SFP_VER_3_2
-#define CONFIG_SYS_FSL_SEC_MON_BE
 #define CONFIG_SYS_FSL_SFP_BE
 #define CONFIG_SYS_FSL_SRK_LE
 #define CONFIG_KEY_REVOCATION
arch/arm/include/asm/arch-ls102xa/config.h +0 -1
index aa790ab54c31..06ead24bf627 100644
@@ -87,7 +87,6 @@
 #define CONFIG_SYS_FSL_ESDHC_BE
 #define CONFIG_SYS_FSL_WDOG_BE
 #define CONFIG_SYS_FSL_DSPI_BE
-#define CONFIG_SYS_FSL_SEC_MON_LE
 #define CONFIG_SYS_FSL_SFP_VER_3_2
 #define CONFIG_SYS_FSL_SFP_BE
 #define CONFIG_SYS_FSL_SRK_LE
arch/arm/include/asm/fsl_secure_boot.h +0 -2
index 154663e192c2..d6a7c3dcbd7e 100644
@@ -8,8 +8,6 @@
 #define __FSL_SECURE_BOOT_H
 
 #ifdef CONFIG_CHAIN_OF_TRUST
-#define CONFIG_FSL_SEC_MON
-
 #ifdef CONFIG_SPL_BUILD
 /*
  * Define the key hash for U-Boot here if public/private key pair used to
arch/powerpc/include/asm/config_mpc85xx.h +0 -1
index 225befb3a5e3..47b462504799 100644
@@ -19,7 +19,6 @@
 /* IP endianness */
 #define CONFIG_SYS_FSL_IFC_BE
 #define CONFIG_SYS_FSL_SFP_BE
-#define CONFIG_SYS_FSL_SEC_MON_BE
 
 #if defined(CONFIG_ARCH_MPC8548)
 #define CONFIG_SYS_FSL_SRIO_MAX_PORTS	1
arch/powerpc/include/asm/fsl_secure_boot.h +0 -2
index 3a1d858ec645..e073025ebfb3 100644
@@ -92,8 +92,6 @@
 #define CONFIG_SPL_UBOOT_KEY_HASH	NULL
 #endif /* ifdef CONFIG_SPL_BUILD */
 
-#define CONFIG_FSL_SEC_MON
-
 #ifndef CONFIG_SPL_BUILD
 /*
  * fsl_setenv_chain_of_trust() must be called from
configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig +1 -0
index 7c69d56d52c9..512181936730 100644
@@ -47,6 +47,7 @@ CONFIG_SATA_CEVA=y
 CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig +1 -0
index 21c989cff9f8..155c47487f11 100644
@@ -45,6 +45,7 @@ CONFIG_SATA_CEVA=y
 CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
configs/ls1012aqds_tfa_SECURE_BOOT_defconfig +1 -0
index a77e124b4b74..b97cbaf8c36c 100644
@@ -52,6 +52,7 @@ CONFIG_DM=y
 CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +1 -0
index 02d6e0f2e116..a39cb99cc0ec 100644
@@ -50,6 +50,7 @@ CONFIG_SATA_CEVA=y
 CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
configs/ls1012ardb_tfa_SECURE_BOOT_defconfig +1 -0
index 6dc5674dbf1a..bcd9d73ee068 100644
@@ -48,6 +48,7 @@ CONFIG_SATA_CEVA=y
 CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig +1 -0
index 885ab7701bf4..8a0b0c209c25 100644
@@ -64,6 +64,7 @@ CONFIG_DM_I2C=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_EARLY_INIT=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
configs/ls1043ardb_SECURE_BOOT_defconfig +1 -0
index a8328681ec8e..70e360aad1df 100644
@@ -50,6 +50,7 @@ CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x53
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
configs/ls1043ardb_nand_SECURE_BOOT_defconfig +1 -0
index 401bc393b237..51436de011ee 100644
@@ -73,6 +73,7 @@ CONFIG_SPL_DM=y
 CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x53
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +1 -0
index 9d29c365c6eb..1f7128e31094 100644
@@ -73,6 +73,7 @@ CONFIG_SPL_DM=y
 CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x53
 # CONFIG_SPL_DM_MMC is not set
 CONFIG_FSL_ESDHC=y
configs/ls1043ardb_tfa_SECURE_BOOT_defconfig +1 -0
index 38442c19b4ea..1b46f5528ffa 100644
@@ -49,6 +49,7 @@ CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x53
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig +1 -0
index 00444420b9d3..8cb86e1ffcac 100644
@@ -45,6 +45,7 @@ CONFIG_SATA_CEVA=y
 CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x52
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
configs/ls1046aqds_SECURE_BOOT_defconfig +1 -0
index 8b1713099d82..d4284728d4ef 100644
@@ -64,6 +64,7 @@ CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
 CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
configs/ls1046aqds_tfa_SECURE_BOOT_defconfig +1 -0
index 58bc95d91c38..295cc66c8669 100644
@@ -64,6 +64,7 @@ CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_EARLY_INIT=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x57
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +1 -0
index 2a7c730aa004..3b870788f77f 100644
@@ -57,6 +57,7 @@ CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
 CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x53
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +1 -0
index 4301d38eb77e..149d155d1367 100644
@@ -80,6 +80,7 @@ CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 # CONFIG_SPL_DM_I2C is not set
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x53
 # CONFIG_SPL_DM_MMC is not set
 CONFIG_FSL_ESDHC=y
configs/ls1046ardb_tfa_SECURE_BOOT_defconfig +1 -0
index 62020ee6c896..827db1851f81 100644
@@ -51,6 +51,7 @@ CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
 CONFIG_MPC8XXX_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_FSL_SEC_MON_BE=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x53
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD=y
drivers/misc/Kconfig +14 -0
index f368d52c5612..ec1ee33bde47 100644
@@ -275,6 +275,20 @@ config FSL_SEC_MON
 	  Security Monitor can be transitioned on any security failures,
 	  like software violations or hardware security violations.
 
+choice
+	prompt "Security monitor interaction endianess"
+	depends on FSL_SEC_MON
+	default SYS_FSL_SEC_MON_BE if PPC
+	default SYS_FSL_SEC_MON_LE
+
+config SYS_FSL_SEC_MON_LE
+	bool "Security monitor interactions are little endian"
+
+config SYS_FSL_SEC_MON_BE
+	bool "Security monitor interactions are big endian"
+
+endchoice
+
 config IRQ
 	bool "Interrupt controller"
 	help
include/fsl_sec_mon.h +0 -2
index fb838db0b53f..3092a0ea62a0 100644
@@ -23,8 +23,6 @@
 #define sec_mon_in16(a)       in_be16(a)
 #define sec_mon_clrbits32     clrbits_be32
 #define sec_mon_setbits32     setbits_be32
-#else
-#error Neither CONFIG_SYS_FSL_SEC_MON_LE nor CONFIG_SYS_FSL_SEC_MON_BE defined
 #endif
 
 struct ccsr_sec_mon_regs {
Signature · 1 line
2.25.1
author
#7 lore raw

PATCH 8/8 Convert CONFIG_SYS_FSL_SFP_BE et al to Kconfig

In reply to Tom Rini

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.

---
 arch/Kconfig.nxp                              | 33 +++++++++++++++++++
 .../include/asm/arch-fsl-layerscape/config.h  | 32 ------------------
 arch/arm/include/asm/arch-ls102xa/config.h    |  3 --
 arch/arm/include/asm/fsl_secure_boot.h        |  2 --
 arch/powerpc/cpu/mpc85xx/Kconfig              |  8 ++---
 arch/powerpc/include/asm/config_mpc85xx.h     |  7 ----
 arch/powerpc/include/asm/fsl_secure_boot.h    |  5 ---
 include/fsl_sfp.h                             |  2 --
 8 files changed, 37 insertions(+), 55 deletions(-)
arch/Kconfig.nxp +33 -0
index 015f57f7d0f3..1e26f1dc5372 100644
@@ -33,6 +33,39 @@ config ESBC_ADDR_64BIT
 	help
 	  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
 	bool "Enable SoC deep sleep feature"
 	depends on ARCH_T1024 || ARCH_T1040 || ARCH_T1042 || ARCH_LS1021A
arch/arm/include/asm/arch-fsl-layerscape/config.h +0 -32
index fd41d30c28cd..cd795d6919ac 100644
@@ -55,11 +55,6 @@
 /* SMMU Defintions */
 #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 */
 #define CONFIG_SYS_FSL_CCSR_GUR_LE
 
@@ -154,11 +149,6 @@
 
 #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 */
 #define CONFIG_SYS_FSL_CCSR_GUR_LE
 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC	1
@@ -203,11 +193,6 @@
 /* SMMU Definitions */
 #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 */
 #define CONFIG_SYS_FSL_CCSR_GUR_LE
 
@@ -256,11 +241,6 @@
 
 #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 */
 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC		1
 
@@ -297,10 +277,6 @@
 #define QE_NUM_OF_SNUM		28
 
 #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 */
 #define SMMU_BASE		0x09000000
@@ -336,10 +312,6 @@
 #elif defined(CONFIG_ARCH_LS1012A)
 #define GICD_BASE		0x01401000
 #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_DDR_BLOCK1_SIZE	((phys_size_t)2 << 30)
 #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_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 */
 #define SMMU_BASE		0x09000000
arch/arm/include/asm/arch-ls102xa/config.h +0 -3
index 06ead24bf627..796e2b218e56 100644
@@ -87,9 +87,6 @@
 #define CONFIG_SYS_FSL_ESDHC_BE
 #define CONFIG_SYS_FSL_WDOG_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
 
arch/arm/include/asm/fsl_secure_boot.h +0 -2
index d6a7c3dcbd7e..09c88841e0c0 100644
@@ -21,8 +21,6 @@
 #define CONFIG_SPL_UBOOT_KEY_HASH	NULL
 #endif /* ifdef CONFIG_SPL_BUILD */
 
-#define CONFIG_KEY_REVOCATION
-
 #ifndef CONFIG_SPL_BUILD
 #ifndef CONFIG_SYS_RAMBOOT
 /* The key used for verification of next level images
arch/powerpc/cpu/mpc85xx/Kconfig +4 -4
index 2cc0185c3778..0ef5e730bdc2 100644
@@ -196,7 +196,7 @@ config ARCH_B4420
 	select SYS_FSL_ERRATUM_A006475
 	select SYS_FSL_ERRATUM_A006593
 	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_A009942
 	select SYS_FSL_HAS_DDR3
@@ -224,7 +224,7 @@ config ARCH_B4860
 	select SYS_FSL_ERRATUM_A006475
 	select SYS_FSL_ERRATUM_A006593
 	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_A007907
 	select SYS_FSL_ERRATUM_A009942
@@ -735,7 +735,7 @@ config ARCH_T2080
 	select SYS_FSL_DDR_VER_47
 	select SYS_FSL_ERRATUM_A006379
 	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_A007815
 	select SYS_FSL_ERRATUM_A007907
@@ -768,7 +768,7 @@ config ARCH_T4240
 	select SYS_FSL_ERRATUM_A006261
 	select SYS_FSL_ERRATUM_A006379
 	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_A007815
 	select SYS_FSL_ERRATUM_A007907
arch/powerpc/include/asm/config_mpc85xx.h +0 -7
index 47b462504799..e82adc6b4545 100644
@@ -18,7 +18,6 @@
 
 /* IP endianness */
 #define CONFIG_SYS_FSL_IFC_BE
-#define CONFIG_SYS_FSL_SFP_BE
 
 #if defined(CONFIG_ARCH_MPC8548)
 #define CONFIG_SYS_FSL_SRIO_MAX_PORTS	1
@@ -199,7 +198,6 @@
 #define CONFIG_SYS_FSL_SRIO_LIODN
 #define CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE
 #define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
-#define CONFIG_SYS_FSL_SFP_VER_3_0
 #define CONFIG_SYS_FSL_PCI_VER_3_X
 
 #elif defined(CONFIG_ARCH_B4860) || defined(CONFIG_ARCH_B4420)
@@ -216,7 +214,6 @@
 #define CONFIG_SYS_FSL_TBCLK_DIV	16
 #define CONFIG_SYS_FSL_PCIE_COMPAT	"fsl,qoriq-pcie-v2.4"
 #define CONFIG_SYS_FSL_USB1_PHY_ENABLE
-#define CONFIG_SYS_FSL_SFP_VER_3_0
 
 #ifdef CONFIG_ARCH_B4860
 #define CONFIG_SYS_FSL_CORES_PER_CLUSTER 4
@@ -264,7 +261,6 @@
 #define QE_MURAM_SIZE			0x6000UL
 #define MAX_QE_RISC			1
 #define QE_NUM_OF_SNUM			28
-#define CONFIG_SYS_FSL_SFP_VER_3_0
 
 #elif defined(CONFIG_ARCH_T1024)
 #define CONFIG_FSL_CORENET	     /* Freescale CoreNet platform */
@@ -291,7 +287,6 @@
 #define QE_MURAM_SIZE			0x6000UL
 #define MAX_QE_RISC			1
 #define QE_NUM_OF_SNUM			28
-#define CONFIG_SYS_FSL_SFP_VER_3_0
 
 #elif defined(CONFIG_ARCH_T2080)
 #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_USB_DUAL_PHY_ENABLE
 #define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
-#define CONFIG_SYS_FSL_SFP_VER_3_0
 #define CONFIG_SYS_FSL_ISBC_VER		2
 #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
-#define CONFIG_SYS_FSL_SFP_VER_3_0
 
 
 #elif defined(CONFIG_ARCH_C29X)
arch/powerpc/include/asm/fsl_secure_boot.h +0 -5
index e073025ebfb3..9ae4c590f1d5 100644
@@ -31,7 +31,6 @@
 #ifndef CONFIG_SYS_RAMBOOT
 #define CONFIG_SYS_CPC_REINIT_F
 #endif
-#define CONFIG_KEY_REVOCATION
 #undef CONFIG_SYS_INIT_L3_ADDR
 #define CONFIG_SYS_INIT_L3_ADDR			0xbff00000
 #endif
@@ -47,10 +46,6 @@
 #endif
 #endif
 
-#if defined(CONFIG_TARGET_C29XPCIE)
-#define CONFIG_KEY_REVOCATION
-#endif
-
 #if defined(CONFIG_ARCH_P3041)	||	\
 	defined(CONFIG_ARCH_P4080) ||	\
 	defined(CONFIG_ARCH_P5040) ||	\
include/fsl_sfp.h +0 -2
index 613814d9057c..e7674c1bff2a 100644
@@ -24,8 +24,6 @@
 #define sfp_in32(a)       in_be32(a)
 #define sfp_out32(a, v)   out_be32(a, v)
 #define sfp_in16(a)       in_be16(a)
-#else
-#error Neither CONFIG_SYS_FSL_SFP_LE nor CONFIG_SYS_FSL_SFP_BE is defined
 #endif
 
 /* Number of SRKH registers */
Signature · 1 line
2.25.1