aboutsummaryrefslogtreecommitdiff
path: root/configs/guruplug_defconfig
diff options
context:
space:
mode:
authorTom Rini2017-08-28 07:16:32 -0400
committerTom Rini2017-08-28 07:16:32 -0400
commit5dc4dfd2a94744a6df0d3f84c98b30d1962d4beb (patch)
tree9311b40f30cc9dea47758aedde469817383aaea7 /configs/guruplug_defconfig
parent34f98a3d2e10a273bf5b707ce941b4b8c9fc0e87 (diff)
configs: Resync with savedefconfig
Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/guruplug_defconfig')
-rw-r--r--configs/guruplug_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
index be2f8466b7e..086417f71c4 100644
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -2,7 +2,6 @@ CONFIG_ARM=y
CONFIG_KIRKWOOD=y
CONFIG_TARGET_GURUPLUG=y
CONFIG_IDENT_STRING="\nMarvell-GuruPlug"
-CONFIG_ENV_IS_IN_NAND=y
CONFIG_BOOTDELAY=3
# CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_HUSH_PARSER=y
@@ -23,6 +22,7 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_JFFS2=y
CONFIG_CMD_UBI=y
CONFIG_ISO_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
# CONFIG_MMC is not set
CONFIG_SYS_NS16550=y
CONFIG_USB=y