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
Signed-off-by: Tom Rini <tr...@konsulko.com>
---
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(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index 12de8a11650d..b7f9d644ef28 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -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"
diff --git a/board/advantech/imx8mp_rsb3720a1/Kconfig
b/board/advantech/imx8mp_rsb3720a1/Kconfig
index 4486ed6d335a..95cac7c4f09f 100644
--- a/board/advantech/imx8mp_rsb3720a1/Kconfig
+++ b/board/advantech/imx8mp_rsb3720a1/Kconfig
@@ -9,6 +9,4 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "imx8mp_rsb3720"
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/advantech/imx8qm_rom7720_a1/Kconfig
b/board/advantech/imx8qm_rom7720_a1/Kconfig
index 8bf3a7d34846..c846537f7432 100644
--- a/board/advantech/imx8qm_rom7720_a1/Kconfig
+++ b/board/advantech/imx8qm_rom7720_a1/Kconfig
@@ -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
diff --git a/board/beacon/imx8mm/Kconfig b/board/beacon/imx8mm/Kconfig
index 63f064e8cb85..e5d8aa3ec9cd 100644
--- a/board/beacon/imx8mm/Kconfig
+++ b/board/beacon/imx8mm/Kconfig
@@ -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
diff --git a/board/beacon/imx8mn/Kconfig b/board/beacon/imx8mn/Kconfig
index fb301397b1ad..e11286c5c3ac 100644
--- a/board/beacon/imx8mn/Kconfig
+++ b/board/beacon/imx8mn/Kconfig
@@ -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
diff --git a/board/bsh/imx8mn_smm_s2/Kconfig b/board/bsh/imx8mn_smm_s2/Kconfig
index f43d058f2188..041a9c78a66d 100644
--- a/board/bsh/imx8mn_smm_s2/Kconfig
+++ b/board/bsh/imx8mn_smm_s2/Kconfig
@@ -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
diff --git a/board/engicam/imx8mm/Kconfig b/board/engicam/imx8mm/Kconfig
index 5495b3bf99be..3b3b93bb2f0a 100644
--- a/board/engicam/imx8mm/Kconfig
+++ b/board/engicam/imx8mm/Kconfig
@@ -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
diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig
index c13c865fd1f1..9c305b3748eb 100644
--- a/board/freescale/common/Kconfig
+++ b/board/freescale/common/Kconfig
@@ -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"
diff --git a/board/freescale/corenet_ds/Kconfig
b/board/freescale/corenet_ds/Kconfig
index e92b0d099da7..dbcd1afcbad1 100644
--- a/board/freescale/corenet_ds/Kconfig
+++ b/board/freescale/corenet_ds/Kconfig
@@ -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
diff --git a/board/freescale/imx8mn_evk/Kconfig
b/board/freescale/imx8mn_evk/Kconfig
index 0adf87bd42a1..a148a9b998c5 100644
--- a/board/freescale/imx8mn_evk/Kconfig
+++ b/board/freescale/imx8mn_evk/Kconfig
@@ -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
diff --git a/board/freescale/imx8mp_evk/Kconfig
b/board/freescale/imx8mp_evk/Kconfig
index 42625fd58889..cafa6329a40b 100644
--- a/board/freescale/imx8mp_evk/Kconfig
+++ b/board/freescale/imx8mp_evk/Kconfig
@@ -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
diff --git a/board/freescale/imx8qm_mek/Kconfig
b/board/freescale/imx8qm_mek/Kconfig
index aed6ab25ce18..5f2413f8dbfc 100644
--- a/board/freescale/imx8qm_mek/Kconfig
+++ b/board/freescale/imx8qm_mek/Kconfig
@@ -12,6 +12,4 @@ config SYS_CONFIG_NAME
config IMX_CONFIG
default "board/freescale/imx8qm_mek/imximage.cfg"
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/imx8qxp_mek/Kconfig
b/board/freescale/imx8qxp_mek/Kconfig
index b9aab3789ee4..6533b4d9535e 100644
--- a/board/freescale/imx8qxp_mek/Kconfig
+++ b/board/freescale/imx8qxp_mek/Kconfig
@@ -12,6 +12,4 @@ config SYS_CONFIG_NAME
config IMX_CONFIG
default "board/freescale/imx8qxp_mek/imximage.cfg"
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/imx8ulp_evk/Kconfig
b/board/freescale/imx8ulp_evk/Kconfig
index 1e461ee1da71..4637b969be6d 100644
--- a/board/freescale/imx8ulp_evk/Kconfig
+++ b/board/freescale/imx8ulp_evk/Kconfig
@@ -9,6 +9,4 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "imx8ulp_evk"
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/ls1012afrdm/Kconfig
b/board/freescale/ls1012afrdm/Kconfig
index 4ac69d711748..75de782afc9c 100644
--- a/board/freescale/ls1012afrdm/Kconfig
+++ b/board/freescale/ls1012afrdm/Kconfig
@@ -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
diff --git a/board/freescale/ls1012aqds/Kconfig
b/board/freescale/ls1012aqds/Kconfig
index 59b1a876655f..991ba6044db8 100644
--- a/board/freescale/ls1012aqds/Kconfig
+++ b/board/freescale/ls1012aqds/Kconfig
@@ -77,7 +77,4 @@ config PFE_SGMII_2500_PHY2_ADDR
endif
-
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/ls1012ardb/Kconfig
b/board/freescale/ls1012ardb/Kconfig
index c4acea3ae2db..aa15f5a027e8 100644
--- a/board/freescale/ls1012ardb/Kconfig
+++ b/board/freescale/ls1012ardb/Kconfig
@@ -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
diff --git a/board/freescale/ls1021aiot/Kconfig
b/board/freescale/ls1021aiot/Kconfig
index c6b16063a4a6..4a12c1687fce 100644
--- a/board/freescale/ls1021aiot/Kconfig
+++ b/board/freescale/ls1021aiot/Kconfig
@@ -12,6 +12,4 @@ 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 60b8472990da..119b9550410c 100644
--- a/board/freescale/ls1021aqds/Kconfig
+++ b/board/freescale/ls1021aqds/Kconfig
@@ -12,6 +12,4 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "ls1021aqds"
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/ls1021atsn/Kconfig
b/board/freescale/ls1021atsn/Kconfig
index d999fa469002..aa42a06c663f 100644
--- a/board/freescale/ls1021atsn/Kconfig
+++ b/board/freescale/ls1021atsn/Kconfig
@@ -13,6 +13,4 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "ls1021atsn"
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/ls1021atwr/Kconfig
b/board/freescale/ls1021atwr/Kconfig
index a4641cbca09b..bc50b8d96689 100644
--- a/board/freescale/ls1021atwr/Kconfig
+++ b/board/freescale/ls1021atwr/Kconfig
@@ -12,6 +12,4 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "ls1021atwr"
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/ls1028a/Kconfig b/board/freescale/ls1028a/Kconfig
index 40939816ad89..5c27f0f726dd 100644
--- a/board/freescale/ls1028a/Kconfig
+++ b/board/freescale/ls1028a/Kconfig
@@ -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
diff --git a/board/freescale/ls1043aqds/Kconfig
b/board/freescale/ls1043aqds/Kconfig
index 182900efb7b2..4be445e8c8f8 100644
--- a/board/freescale/ls1043aqds/Kconfig
+++ b/board/freescale/ls1043aqds/Kconfig
@@ -28,6 +28,4 @@ config SYS_LS_PPA_ESBC_ADDR
endif
endif
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/ls1043ardb/Kconfig
b/board/freescale/ls1043ardb/Kconfig
index d66c7804b13e..56502f9f9c63 100644
--- a/board/freescale/ls1043ardb/Kconfig
+++ b/board/freescale/ls1043ardb/Kconfig
@@ -27,6 +27,4 @@ config SYS_LS_PPA_ESBC_ADDR
endif
endif
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/ls1046afrwy/Kconfig
b/board/freescale/ls1046afrwy/Kconfig
index 6a4c3e92f7ba..68329d78caf3 100644
--- a/board/freescale/ls1046afrwy/Kconfig
+++ b/board/freescale/ls1046afrwy/Kconfig
@@ -13,5 +13,4 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "ls1046afrwy"
-source "board/freescale/common/Kconfig"
endif
diff --git a/board/freescale/ls1046aqds/Kconfig
b/board/freescale/ls1046aqds/Kconfig
index 1616dcc683eb..adf325f4efd0 100644
--- a/board/freescale/ls1046aqds/Kconfig
+++ b/board/freescale/ls1046aqds/Kconfig
@@ -28,6 +28,4 @@ config SYS_LS_PPA_ESBC_ADDR
endif
endif
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/ls1046ardb/Kconfig
b/board/freescale/ls1046ardb/Kconfig
index 4c31e0e88572..1fb391c991c6 100644
--- a/board/freescale/ls1046ardb/Kconfig
+++ b/board/freescale/ls1046ardb/Kconfig
@@ -27,5 +27,4 @@ config SYS_LS_PPA_ESBC_ADDR
endif
endif
-source "board/freescale/common/Kconfig"
endif
diff --git a/board/freescale/ls1088a/Kconfig b/board/freescale/ls1088a/Kconfig
index 8bb828e3fd66..f1a45236061b 100644
--- a/board/freescale/ls1088a/Kconfig
+++ b/board/freescale/ls1088a/Kconfig
@@ -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
diff --git a/board/freescale/ls2080aqds/Kconfig
b/board/freescale/ls2080aqds/Kconfig
index 6b2b64581d60..1036f33c61fa 100644
--- a/board/freescale/ls2080aqds/Kconfig
+++ b/board/freescale/ls2080aqds/Kconfig
@@ -29,6 +29,4 @@ config SYS_LS_PPA_ESBC_ADDR
endif
endif
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/ls2080ardb/Kconfig
b/board/freescale/ls2080ardb/Kconfig
index 678d58257303..c8b0b94596b5 100644
--- a/board/freescale/ls2080ardb/Kconfig
+++ b/board/freescale/ls2080ardb/Kconfig
@@ -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
diff --git a/board/freescale/lx2160a/Kconfig b/board/freescale/lx2160a/Kconfig
index 7556f7dd2156..0e4b4158a7f1 100644
--- a/board/freescale/lx2160a/Kconfig
+++ b/board/freescale/lx2160a/Kconfig
@@ -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
diff --git a/board/freescale/p1010rdb/Kconfig b/board/freescale/p1010rdb/Kconfig
index 3adac4af1e3c..159bcc4f54d9 100644
--- a/board/freescale/p1010rdb/Kconfig
+++ b/board/freescale/p1010rdb/Kconfig
@@ -9,6 +9,4 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "P1010RDB"
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/p1_p2_rdb_pc/Kconfig
b/board/freescale/p1_p2_rdb_pc/Kconfig
index db7b47a4635b..cd36150f6377 100644
--- a/board/freescale/p1_p2_rdb_pc/Kconfig
+++ b/board/freescale/p1_p2_rdb_pc/Kconfig
@@ -11,6 +11,4 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "p1_p2_rdb_pc"
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/p2041rdb/Kconfig b/board/freescale/p2041rdb/Kconfig
index 7e187dde7255..78e11214a5b8 100644
--- a/board/freescale/p2041rdb/Kconfig
+++ b/board/freescale/p2041rdb/Kconfig
@@ -9,6 +9,4 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "P2041RDB"
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/t102xrdb/Kconfig b/board/freescale/t102xrdb/Kconfig
index 6deeb248a300..d538386d4344 100644
--- a/board/freescale/t102xrdb/Kconfig
+++ b/board/freescale/t102xrdb/Kconfig
@@ -9,6 +9,4 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "T102xRDB"
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/freescale/t104xrdb/Kconfig b/board/freescale/t104xrdb/Kconfig
index e6e46fa126fb..e33d3173650c 100644
--- a/board/freescale/t104xrdb/Kconfig
+++ b/board/freescale/t104xrdb/Kconfig
@@ -11,6 +11,4 @@ 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 58a31b65278e..c419a59dbb62 100644
--- a/board/freescale/t208xqds/Kconfig
+++ b/board/freescale/t208xqds/Kconfig
@@ -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
diff --git a/board/freescale/t208xrdb/Kconfig b/board/freescale/t208xrdb/Kconfig
index d4c061a5eabc..35d884e6ccbd 100644
--- a/board/freescale/t208xrdb/Kconfig
+++ b/board/freescale/t208xrdb/Kconfig
@@ -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
diff --git a/board/freescale/t4rdb/Kconfig b/board/freescale/t4rdb/Kconfig
index 542e574fed14..d93e4532ac4a 100644
--- a/board/freescale/t4rdb/Kconfig
+++ b/board/freescale/t4rdb/Kconfig
@@ -9,6 +9,4 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "T4240RDB"
-source "board/freescale/common/Kconfig"
-
endif
diff --git a/board/variscite/imx8mn_var_som/Kconfig
b/board/variscite/imx8mn_var_som/Kconfig
index cfe6fc8c2c78..9a4003aa11b0 100644
--- a/board/variscite/imx8mn_var_som/Kconfig
+++ b/board/variscite/imx8mn_var_som/Kconfig
@@ -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
diff --git a/configs/kmcent2_defconfig b/configs/kmcent2_defconfig
index 8540923f8911..37529f21df39 100644
--- a/configs/kmcent2_defconfig
+++ b/configs/kmcent2_defconfig
@@ -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
diff --git a/configs/pg_wcom_expu1_defconfig b/configs/pg_wcom_expu1_defconfig
index c5d657408343..fe864c75b7f0 100644
--- a/configs/pg_wcom_expu1_defconfig
+++ b/configs/pg_wcom_expu1_defconfig
@@ -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
diff --git a/configs/pg_wcom_expu1_update_defconfig
b/configs/pg_wcom_expu1_update_defconfig
index c2b079df3790..787fe554bad2 100644
--- a/configs/pg_wcom_expu1_update_defconfig
+++ b/configs/pg_wcom_expu1_update_defconfig
@@ -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
diff --git a/configs/pg_wcom_seli8_defconfig b/configs/pg_wcom_seli8_defconfig
index 56e922a241cc..51919dc6cbbb 100644
--- a/configs/pg_wcom_seli8_defconfig
+++ b/configs/pg_wcom_seli8_defconfig
@@ -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
diff --git a/configs/pg_wcom_seli8_update_defconfig
b/configs/pg_wcom_seli8_update_defconfig
index 9d25094a9a6b..0f22511dabc8 100644
--- a/configs/pg_wcom_seli8_update_defconfig
+++ b/configs/pg_wcom_seli8_update_defconfig
@@ -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
--
2.25.1
