summaryrefslogtreecommitdiff
path: root/configs/Colombus_defconfig
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2015-06-22 16:15:29 -0500
committerTom Rini <trini@konsulko.com>2015-06-25 22:17:55 -0400
commitc9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d (patch)
tree727c74825b6b09abddfb19b1ab7232e1d02d068c /configs/Colombus_defconfig
parent3c85c8b9f91334b001837123ffaba0a17cde51eb (diff)
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>
Diffstat (limited to 'configs/Colombus_defconfig')
-rw-r--r--configs/Colombus_defconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index e6bed2d432a..6a64568d9db 100644
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -5,7 +5,15 @@ CONFIG_DRAM_CLK=240
CONFIG_DRAM_ZQ=251
CONFIG_USB1_VBUS_PIN=""
CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC"
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_NET=y
+CONFIG_DM_ETH=y
+CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y
+CONFIG_DM_SERIAL=y
CONFIG_AXP221_ALDO1_VOLT=3300
+CONFIG_USB=y
+CONFIG_DM_USB=y