Move default y configs out of arch/board Kconfig
Some archs/boards specify their own default by pre-defining the config which causes the Kconfig system to mix up the order of the configs in the defconfigs... This will cause merge pain if allowed to proliferate. Remove the configs that behave this way from the archs. A few configs still remain, but that is because they only exist as defaults and do not have a proper Kconfig entry. Those appear to be: SPIFLASH DISPLAY_BOARDINFO Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> [trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates, drop DM_USB from MSI_Primo81 as USB_MUSB_SUNXI isn't converted yet to DM] Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
committed by
Tom Rini
parent
3c85c8b9f9
commit
c9bb942e2f
@@ -4,9 +4,6 @@ menu "ARC architecture"
|
||||
config SYS_ARCH
|
||||
default "arc"
|
||||
|
||||
config USE_PRIVATE_LIBGCC
|
||||
default y
|
||||
|
||||
config SYS_CPU
|
||||
default "arcv1" if ISA_ARCOMPACT
|
||||
default "arcv2" if ISA_ARCV2
|
||||
|
||||
@@ -74,9 +74,6 @@ endchoice
|
||||
config SYS_SOC
|
||||
default "exynos"
|
||||
|
||||
config DM_USB
|
||||
default y
|
||||
|
||||
source "board/samsung/smdkv310/Kconfig"
|
||||
source "board/samsung/trats/Kconfig"
|
||||
source "board/samsung/universal_c210/Kconfig"
|
||||
|
||||
@@ -15,9 +15,6 @@ config TARGET_RPI_2
|
||||
|
||||
endchoice
|
||||
|
||||
config PHYS_TO_BUS
|
||||
default y
|
||||
|
||||
config SYS_BOARD
|
||||
default "rpi" if TARGET_RPI
|
||||
default "rpi_2" if TARGET_RPI_2
|
||||
|
||||
@@ -21,18 +21,6 @@ endchoice
|
||||
config SYS_MALLOC_F_LEN
|
||||
default 0x1800
|
||||
|
||||
config USE_PRIVATE_LIBGCC
|
||||
default y
|
||||
|
||||
config DM_USB
|
||||
default y
|
||||
|
||||
config SPL_DM
|
||||
default y
|
||||
|
||||
config SPL_DISABLE_OF_CONTROL
|
||||
default y
|
||||
|
||||
source "arch/arm/mach-tegra/tegra20/Kconfig"
|
||||
source "arch/arm/mach-tegra/tegra30/Kconfig"
|
||||
source "arch/arm/mach-tegra/tegra114/Kconfig"
|
||||
|
||||
@@ -8,9 +8,6 @@ config SYS_CPU
|
||||
default "mips32" if CPU_MIPS32_R1 || CPU_MIPS32_R2
|
||||
default "mips64" if CPU_MIPS64_R1 || CPU_MIPS64_R2
|
||||
|
||||
config USE_PRIVATE_LIBGCC
|
||||
default y
|
||||
|
||||
choice
|
||||
prompt "Target select"
|
||||
optional
|
||||
|
||||
@@ -125,9 +125,6 @@ config SYS_CPU
|
||||
default "sh3" if CPU_SH3
|
||||
default "sh4" if CPU_SH4
|
||||
|
||||
config USE_PRIVATE_LIBGCC
|
||||
default y
|
||||
|
||||
source "board/alphaproject/ap_sh4a_4a/Kconfig"
|
||||
source "board/espt/Kconfig"
|
||||
source "board/mpr2/Kconfig"
|
||||
|
||||
@@ -4,12 +4,6 @@ menu "x86 architecture"
|
||||
config SYS_ARCH
|
||||
default "x86"
|
||||
|
||||
config USE_PRIVATE_LIBGCC
|
||||
default y
|
||||
|
||||
config SYS_VSNPRINTF
|
||||
default y
|
||||
|
||||
choice
|
||||
prompt "Mainboard vendor"
|
||||
default VENDOR_EMULATION
|
||||
@@ -335,13 +329,4 @@ config PCIE_ECAM_BASE
|
||||
assigned to PCI devices - i.e. the memory and prefetch regions, as
|
||||
passed to pci_set_region().
|
||||
|
||||
config BOOTSTAGE
|
||||
default y
|
||||
|
||||
config BOOTSTAGE_REPORT
|
||||
default y
|
||||
|
||||
config CMD_BOOTSTAGE
|
||||
default y
|
||||
|
||||
endmenu
|
||||
|
||||
Reference in New Issue
Block a user