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

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

Browse Source 
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 <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-06-16 14:04:35 -04:00
parent 1e7750f1bc
commit 93145335fb
45 changed files with 14 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/Kconfig
View File

@ -451,6 +451,7 @@ source "arch/x86/Kconfig"
source "arch/xtensa/Kconfig"
source "arch/riscv/Kconfig"
source "board/freescale/common/Kconfig"
source "board/keymile/Kconfig"
if MIPS || MICROBLAZE

2
board/advantech/imx8mp_rsb3720a1/Kconfig
View File

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

2
board/advantech/imx8qm_rom7720_a1/Kconfig
View File

@ -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

2
board/beacon/imx8mm/Kconfig
View File

@ -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

2
board/beacon/imx8mn/Kconfig
View File

@ -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

4
board/bsh/imx8mn_smm_s2/Kconfig
View File

@ -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

2
board/engicam/imx8mm/Kconfig
View File

@ -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

12
board/freescale/common/Kconfig
View File

@ -16,7 +16,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:
@ -25,26 +26,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.
@ -103,6 +106,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"

6
board/freescale/corenet_ds/Kconfig
View File

@ -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

2
board/freescale/imx8mn_evk/Kconfig
View File

@ -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

2
board/freescale/imx8mp_evk/Kconfig
View File

@ -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

2
board/freescale/imx8qm_mek/Kconfig
View File

@ -12,6 +12,4 @@ config SYS_CONFIG_NAME
config IMX_CONFIG
default "board/freescale/imx8qm_mek/imximage.cfg"
source "board/freescale/common/Kconfig"
endif

2
board/freescale/imx8qxp_mek/Kconfig
View File

@ -12,6 +12,4 @@ config SYS_CONFIG_NAME
config IMX_CONFIG
default "board/freescale/imx8qxp_mek/imximage.cfg"
source "board/freescale/common/Kconfig"
endif

2
board/freescale/imx8ulp_evk/Kconfig
View File

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

4
board/freescale/ls1012afrdm/Kconfig
View File

@ -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

3
board/freescale/ls1012aqds/Kconfig
View File

@ -77,7 +77,4 @@ config PFE_SGMII_2500_PHY2_ADDR
endif
source "board/freescale/common/Kconfig"
endif

4
board/freescale/ls1012ardb/Kconfig
View File

@ -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

2
board/freescale/ls1021aiot/Kconfig
View File

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

2
board/freescale/ls1021aqds/Kconfig
View File

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

2
board/freescale/ls1021atsn/Kconfig
View File

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

2
board/freescale/ls1021atwr/Kconfig
View File

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

4
board/freescale/ls1028a/Kconfig
View File

@ -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

2
board/freescale/ls1043aqds/Kconfig
View File

@ -28,6 +28,4 @@ config SYS_LS_PPA_ESBC_ADDR
endif
endif
source "board/freescale/common/Kconfig"
endif

2
board/freescale/ls1043ardb/Kconfig
View File

@ -27,6 +27,4 @@ config SYS_LS_PPA_ESBC_ADDR
endif
endif
source "board/freescale/common/Kconfig"
endif

1
board/freescale/ls1046afrwy/Kconfig
View File

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

2
board/freescale/ls1046aqds/Kconfig
View File

@ -28,6 +28,4 @@ config SYS_LS_PPA_ESBC_ADDR
endif
endif
source "board/freescale/common/Kconfig"
endif

1
board/freescale/ls1046ardb/Kconfig
View File

@ -27,5 +27,4 @@ config SYS_LS_PPA_ESBC_ADDR
endif
endif
source "board/freescale/common/Kconfig"
endif

2
board/freescale/ls1088a/Kconfig
View File

@ -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

2
board/freescale/ls2080aqds/Kconfig
View File

@ -29,6 +29,4 @@ config SYS_LS_PPA_ESBC_ADDR
endif
endif
source "board/freescale/common/Kconfig"
endif

4
board/freescale/ls2080ardb/Kconfig
View File

@ -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

3
board/freescale/lx2160a/Kconfig
View File

@ -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

2
board/freescale/p1010rdb/Kconfig
View File

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

2
board/freescale/p1_p2_rdb_pc/Kconfig
View File

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

2
board/freescale/p2041rdb/Kconfig
View File

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

2
board/freescale/t102xrdb/Kconfig
View File

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

2
board/freescale/t104xrdb/Kconfig
View File

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

2
board/freescale/t208xqds/Kconfig
View File

@ -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

2
board/freescale/t208xrdb/Kconfig
View File

@ -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

2
board/freescale/t4rdb/Kconfig
View File

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

2
board/variscite/imx8mn_var_som/Kconfig
View File

@ -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

1
configs/kmcent2_defconfig
View File

@ -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

1
configs/pg_wcom_expu1_defconfig
View File

@ -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

1
configs/pg_wcom_expu1_update_defconfig
View File

@ -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

1
configs/pg_wcom_seli8_defconfig
View File

@ -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

1
configs/pg_wcom_seli8_update_defconfig
View File

@ -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