aboutsummaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorQuentin Armitage <quentin@armitage.org.uk>2015-10-28 00:47:17 +0000
committerLuka Perkov <luka.perkov@sartura.hr>2015-11-17 23:41:41 +0100
commit5e69947f51d72a2f75f2132c2cc8bae3f0ebcdef (patch)
tree42a1c3bd173018c2c65d114a0d072dc63006c964 /configs
parent82a19de3d2d5430ce401b6933dbfce39a45bb26c (diff)
downloadu-boot-5e69947f51d72a2f75f2132c2cc8bae3f0ebcdef.zip
u-boot-5e69947f51d72a2f75f2132c2cc8bae3f0ebcdef.tar.gz
u-boot-5e69947f51d72a2f75f2132c2cc8bae3f0ebcdef.tar.bz2
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 <quentin@armitage.org.uk>
Diffstat (limited to 'configs')
-rw-r--r--configs/dreamplug_defconfig5
-rw-r--r--configs/guruplug_defconfig5
-rw-r--r--configs/sheevaplug_defconfig5
3 files changed, 15 insertions, 0 deletions
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