summaryrefslogtreecommitdiffstats
path: root/configs/Colombus_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/Colombus_defconfig
parent9f69ab86d0592d528a0372f01fa23684291243fa (diff)
downloadblackbird-obmc-uboot-adad96e60d0eb1bbc4d0b96c89decf385a426e42.tar.gz
blackbird-obmc-uboot-adad96e60d0eb1bbc4d0b96c89decf385a426e42.zip
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/Colombus_defconfig')
-rw-r--r--configs/Colombus_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index 2ce8cb1996..85322d481b 100644
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -18,6 +18,7 @@ CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII"
+CONFIG_HUSH_PARSER=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
OpenPOWER on IntegriCloud