summaryrefslogtreecommitdiff
path: root/configs/vining_2000_defconfig
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-12-07 22:10:25 +0900
committerTom Rini <trini@konsulko.com>2016-12-29 13:07:33 -0500
commit187809517da0f488f6f2069543783cf2923abb23 (patch)
treed6f7d6261cc75293546d142ebc32a4f690201d8c /configs/vining_2000_defconfig
parent47895838a4fbe867ba9a170c6d1ea6a794095025 (diff)
Sync defconfig files by savedefconfig
Generated by "tools/moveconfig -s". This will make config moves easier. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'configs/vining_2000_defconfig')
-rw-r--r--configs/vining_2000_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig
index b1f64f1c0f..9410703430 100644
--- a/configs/vining_2000_defconfig
+++ b/configs/vining_2000_defconfig
@@ -3,7 +3,6 @@ CONFIG_ARCH_MX6=y
CONFIG_TARGET_SAMTEC_VINING_2000=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/samtec/vining_2000/imximage.cfg"
CONFIG_BOOTDELAY=0
-CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
@@ -28,4 +27,3 @@ CONFIG_PCI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y
-CONFIG_MXC_USB_OTG_HACTIVE=y