aboutsummaryrefslogtreecommitdiff
path: root/configs/harmony_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-04-21 21:37:19 -0400
committerTom Rini <trini@konsulko.com>2016-04-25 14:22:43 -0400
commitadad96e60d0eb1bbc4d0b96c89decf385a426e42 (patch)
tree8c4ff2e78356f00cdb53c8935ea06db69633d1a2 /configs/harmony_defconfig
parent9f69ab86d0592d528a0372f01fa23684291243fa (diff)
downloadu-boot-adad96e60d0eb1bbc4d0b96c89decf385a426e42.zip
u-boot-adad96e60d0eb1bbc4d0b96c89decf385a426e42.tar.gz
u-boot-adad96e60d0eb1bbc4d0b96c89decf385a426e42.tar.bz2
configs: Re-sync HUSH options
Move all cases of CONFIG_SYS_HUSH_PARSER out of the config.h files. Remove all cases of CONFIG_SYS_PROMPT_HUSH_PS2 as everyone uses the default. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/harmony_defconfig')
-rw-r--r--configs/harmony_defconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index d4aafe9..00dc37d 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -5,6 +5,7 @@ CONFIG_TEGRA20=y
CONFIG_TARGET_HARMONY=y
CONFIG_DEFAULT_DEVICE_TREE="tegra20-harmony"
CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Tegra20 (Harmony) # "
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
@@ -19,8 +20,8 @@ CONFIG_PWM_TEGRA=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_DM_USB=y
+CONFIG_USB_ULPI_VIEWPORT=y
+CONFIG_USB_ULPI=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_TEGRA20=y
-CONFIG_USB_ULPI=y
-CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USE_PRIVATE_LIBGCC=y