From 5e69947f51d72a2f75f2132c2cc8bae3f0ebcdef Mon Sep 17 00:00:00 2001 From: Quentin Armitage Date: Wed, 28 Oct 2015 00:47:17 +0000 Subject: arm: kirkwood: Move configuration of some commands to _defconfig files For Marvell plugs, move the configuration of DHCP, NAND/SF, PING and USB commands, and HUSH_PARSER into the _defconfig file, rather than the include/configs/*plug.h files. This avoids compiler warnings of duplicate definitions if the option is selected in the .config, but also defined in the include/configs/*plug.h file. Signed-off-by: Quentin Armitage --- configs/dreamplug_defconfig | 5 +++++ configs/guruplug_defconfig | 5 +++++ configs/sheevaplug_defconfig | 5 +++++ 3 files changed, 15 insertions(+) (limited to 'configs') diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index 501fbbf..ec2a749 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -5,3 +5,8 @@ CONFIG_TARGET_DREAMPLUG=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_SF=y +CONFIG_CMD_PING=y +CONFIG_CMD_USB=y diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index 20b83e3..b7f79a3 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -4,3 +4,8 @@ CONFIG_TARGET_GURUPLUG=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PING=y +CONFIG_CMD_USB=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 54e2ad7..5a37eea 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -4,3 +4,8 @@ CONFIG_TARGET_SHEEVAPLUG=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PING=y +CONFIG_CMD_USB=y -- cgit v1.1 From ab71ece5055375f61dec144fc5a67b910d7aab03 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Sat, 31 Oct 2015 21:23:34 +0100 Subject: arm: kirkwood: ib62x0: make use of defconfig Signed-off-by: Luka Perkov --- configs/ib62x0_defconfig | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'configs') diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig index 194ef02..19cbfd5 100644 --- a/configs/ib62x0_defconfig +++ b/configs/ib62x0_defconfig @@ -5,3 +5,8 @@ CONFIG_SYS_PROMPT="ib62x0 => " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PING=y +CONFIG_CMD_USB=y -- cgit v1.1