From c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Mon, 22 Jun 2015 16:15:29 -0500 Subject: 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 [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 --- board/Arcturus/ucp1020/Kconfig | 8 -------- board/sunxi/Kconfig | 21 --------------------- 2 files changed, 29 deletions(-) (limited to 'board') diff --git a/board/Arcturus/ucp1020/Kconfig b/board/Arcturus/ucp1020/Kconfig index feca03aeef..fe2c3be1b7 100644 --- a/board/Arcturus/ucp1020/Kconfig +++ b/board/Arcturus/ucp1020/Kconfig @@ -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" diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index b2eca51ffb..aa44f50b32 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -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 -- cgit