Commit c9bb942e authored by Joe Hershberger's avatar Joe Hershberger Committed by Tom Rini

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: default avatarJoe 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: default avatarTom Rini <trini@konsulko.com>
parent 3c85c8b9
......@@ -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
......@@ -12,14 +12,6 @@ config SYS_CONFIG_NAME
string
default "UCP1020"
config SPI_FLASH
bool
default y
config SPI_PCI
bool
default y
choice
prompt "Target image select"
......
......@@ -566,25 +566,4 @@ config GMAC_TX_DELAY
---help---
Set the GMAC Transmit Clock Delay Chain value.
config SYS_MALLOC_CLEAR_ON_INIT
default n
config NETDEVICES
default y
config DM_ETH
default y
config DM_SERIAL
default y
config DM_USB
default y if !USB_MUSB_SUNXI
config CMD_SETEXPR
default y
config CMD_NET
default y
endif
......@@ -5,5 +5,13 @@ CONFIG_DRAM_CLK=480
CONFIG_DRAM_EMR1=4
CONFIG_SYS_CLK_FREQ=912000000
CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_DM_ETH=y
CONFIG_NETDEVICES=y
CONFIG_DM_SERIAL=y
CONFIG_USB=y
CONFIG_DM_USB=y
......@@ -7,5 +7,13 @@ CONFIG_MMC1_CD_PIN="PG13"
CONFIG_MMC_SUNXI_SLOT_EXTRA=1
CONFIG_USB1_VBUS_PIN="PB10"
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-olinuxino-micro"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC,USB_EHCI"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_DM_ETH=y
CONFIG_NETDEVICES=y
CONFIG_DM_SERIAL=y
CONFIG_USB=y
CONFIG_DM_USB=y
......@@ -11,5 +11,13 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo
CONFIG_VIDEO_LCD_POWER="PB10"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino-micro"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,USB_EHCI"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_DM_ETH=y
CONFIG_NETDEVICES=y
CONFIG_DM_SERIAL=y
CONFIG_USB=y
CONFIG_DM_USB=y
......@@ -12,5 +12,13 @@ CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo
CONFIG_VIDEO_LCD_POWER="AXP0-0"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER,USB_EHCI"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_DM_ETH=y
CONFIG_NETDEVICES=y
CONFIG_DM_SERIAL=y
CONFIG_USB=y
CONFIG_DM_USB=y
......@@ -6,6 +6,14 @@ CONFIG_MMC0_CD_PIN="PH1"
CONFIG_USB0_VBUS_PIN="PC17"
CONFIG_USB0_VBUS_DET="PH5"
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_DM_ETH=y
CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_DM_SERIAL=y
CONFIG_USB=y
CONFIG_DM_USB=y
......@@ -3,6 +3,14 @@ CONFIG_ARCH_SUNXI=y
CONFIG_MACH_SUN7I=y
CONFIG_DRAM_CLK=480
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_DM_ETH=y
CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_DM_SERIAL=y
CONFIG_USB=y
CONFIG_DM_USB=y
......@@ -7,6 +7,14 @@ CONFIG_MMC3_CD_PIN="PH11"
CONFIG_MMC_SUNXI_SLOT_EXTRA=3
CONFIG_VIDEO_VGA=y
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_DM_ETH=y
CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_DM_SERIAL=y
CONFIG_USB=y
CONFIG_DM_USB=y
......@@ -13,5 +13,11 @@ CONFIG_VIDEO_LCD_BL_EN="PH7"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-ainol-aw1"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_DM_ETH=y
CONFIG_NETDEVICES=y
CONFIG_DM_SERIAL=y
......@@ -12,5 +12,11 @@ CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
CONFIG_VIDEO_LCD_BL_PWM="PB2"
CONFIG_USB_MUSB_SUNXI=y
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ampe-a76"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_DM_ETH=y
CONFIG_NETDEVICES=y
CONFIG_DM_SERIAL=y
......@@ -4,5 +4,13 @@ CONFIG_MACH_SUN5I=y
CONFIG_DRAM_CLK=432
CONFIG_USB1_VBUS_PIN="PG13"
CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-auxtek-t004"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_DM_ETH=y
CONFIG_NETDEVICES=y
CONFIG_DM_SERIAL=y
CONFIG_USB=y
CONFIG_DM_USB=y
......@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4420"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,SECURE_BOOT"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_B4860QDS=y
CONFIG_SYS_EXTRA_OPTIONS="PPC_B4860"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND,SYS_CLK_100"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,NAND"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9131RDB=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH,SYS_CLK_100"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9131RDB=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9131RDB,SPIFLASH"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_100,SECURE_BOOT"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_100"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND_SECBOOT,SYS_CLK_100_DDR_133,SECURE_BOOT"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -5,3 +5,4 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,NAND,SYS_CLK_100_DDR_133"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100,SECURE_BOOT"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_100"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133,SECURE_BOOT"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SYS_CLK_100_DDR_133"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100,SECURE_BOOT"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_100"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133,SECURE_BOOT"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SDCARD,SYS_CLK_100_DDR_133"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y
......@@ -4,3 +4,4 @@ CONFIG_TARGET_BSC9132QDS=y
CONFIG_SYS_EXTRA_OPTIONS="BSC9132QDS,SPIFLASH,SYS_CLK_100_DDR_100,SECURE_BOOT"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
CONFIG_SPI_FLASH=y