From 4550f93fb7dce8cda421cd8a673d3717a5b176c0 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Jun 2014 10:03:07 +0200 Subject: [PATCH] ARM: friendlyarm_mini2440: refresh defconfig Fixes: arch/arm/configs/friendlyarm_mini2440_defconfig:38:warning: override: reassigning to symbol CMD_TFTP arch/arm/configs/friendlyarm_mini2440_defconfig:46:warning: override: reassigning to symbol FS_TFTP Signed-off-by: Sascha Hauer --- .../configs/friendlyarm_mini2440_defconfig | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/arch/arm/configs/friendlyarm_mini2440_defconfig b/arch/arm/configs/friendlyarm_mini2440_defconfig index acd5e42da..6cbafef4b 100644 --- a/arch/arm/configs/friendlyarm_mini2440_defconfig +++ b/arch/arm/configs/friendlyarm_mini2440_defconfig @@ -7,36 +7,33 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_TEXT_BASE=0x33e00000 CONFIG_BROKEN=y CONFIG_PROMPT="mini2440:" -CONFIG_LONGHELP=y CONFIG_GLOB=y -CONFIG_HUSH_GETOPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/friendlyarm-mini2440/env" CONFIG_DEBUG_INFO=y -CONFIG_CMD_EDIT=y -CONFIG_CMD_SLEEP=y -CONFIG_CMD_SAVEENV=y -CONFIG_CMD_LOADENV=y -CONFIG_CMD_EXPORT=y -CONFIG_CMD_PRINTENV=y -CONFIG_CMD_READLINE=y -CONFIG_CMD_GLOBAL=y -CONFIG_CMD_TFTP=y +CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=y -CONFIG_CMD_CRC=y -CONFIG_CMD_CRC_CMP=y -CONFIG_CMD_FLASH=y -CONFIG_CMD_RESET=y CONFIG_CMD_GO=y -CONFIG_CMD_TIMEOUT=y +CONFIG_CMD_RESET=y CONFIG_CMD_PARTITION=y -CONFIG_CMD_GPIO=y -CONFIG_NET=y +CONFIG_CMD_EXPORT=y +CONFIG_CMD_GLOBAL=y +CONFIG_CMD_LOADENV=y +CONFIG_CMD_PRINTENV=y +CONFIG_CMD_SAVEENV=y +CONFIG_CMD_SLEEP=y CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y -CONFIG_FS_TFTP=y +CONFIG_CMD_EDIT=y +CONFIG_CMD_READLINE=y +CONFIG_CMD_TIMEOUT=y +CONFIG_CMD_CRC=y +CONFIG_CMD_CRC_CMP=y +CONFIG_CMD_FLASH=y +CONFIG_CMD_GPIO=y +CONFIG_NET=y CONFIG_DRIVER_NET_DM9K=y # CONFIG_SPI is not set CONFIG_USB=y