From ef0f2f57524ec85fb9058a23298f2c4995e0d950 Mon Sep 17 00:00:00 2001 From: Joe Hershberger Date: Mon, 22 Jun 2015 16:15:30 -0500 Subject: Move defaults from config_cmd_default.h to Kconfig This sets the default commands Kconfig to match include/config_cmd_default.h commands in the common/Kconfig and removes them from include/configs. Signed-off-by: Joe Hershberger [trini: rastaban, am43xx_evm_usbhost_boot, am43xx_evm_ethboot updates] Signed-off-by: Tom Rini --- configs/Merrii_A80_Optimus_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configs/Merrii_A80_Optimus_defconfig') diff --git a/configs/Merrii_A80_Optimus_defconfig b/configs/Merrii_A80_Optimus_defconfig index 4a0dce78b8..b02b1a34c8 100644 --- a/configs/Merrii_A80_Optimus_defconfig +++ b/configs/Merrii_A80_Optimus_defconfig @@ -9,10 +9,10 @@ CONFIG_MMC0_CD_PIN="PH18" # CONFIG_USB_KEYBOARD is not set CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CMD_SETEXPR=y -CONFIG_CMD_NET=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set CONFIG_DM_ETH=y -CONFIG_NETDEVICES=y CONFIG_DM_SERIAL=y CONFIG_USB=y CONFIG_DM_USB=y -- cgit v1.2.3