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 --- configs/Mele_M9_defconfig | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'configs/Mele_M9_defconfig') diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig index 16881faf50..c3242b86d7 100644 --- a/configs/Mele_M9_defconfig +++ b/configs/Mele_M9_defconfig @@ -1,13 +1,3 @@ -# The Mele M9 is yet another Allwinnner based Android top set box from Mele. -# -# It uses the same PCB as the A1000G quad, but in a new case without a -# USM sata storage slot, and the space on the PCB for the usb to sata -# bridge connected to the otg controller is not populated, possible -# making the micro usb otg connector functional (untested) -# -# It features an A31 SoC, 2G RAM, 16G Nand, 100Mbit ethernet, HDMI out, -# 3 USB A receptacles, 3.5 mm jack for analog audio out, optical spdif, -# micro USB B receptacle, RTL R8188EU (USB) and a full size sdcard slot CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN6I=y @@ -15,10 +5,18 @@ CONFIG_DRAM_ZQ=120 CONFIG_USB1_VBUS_PIN="PC27" CONFIG_USB2_VBUS_PIN="" CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-m9" +# 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_DCDC1_VOLT=3300 CONFIG_AXP221_DLDO1_VOLT=3300 CONFIG_AXP221_DLDO4_VOLT=3300 CONFIG_AXP221_ALDO1_VOLT=3300 +CONFIG_USB=y +CONFIG_DM_USB=y -- cgit v1.2.1