summaryrefslogtreecommitdiff
path: root/configs/Sinovoip_BPI_M3_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/Sinovoip_BPI_M3_defconfig
parent9f69ab86d0592d528a0372f01fa23684291243fa (diff)
downloadu-boot-adad96e60d0eb1bbc4d0b96c89decf385a426e42.tar.gz
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/Sinovoip_BPI_M3_defconfig')
-rw-r--r--configs/Sinovoip_BPI_M3_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/Sinovoip_BPI_M3_defconfig b/configs/Sinovoip_BPI_M3_defconfig
index d3fd857ec0..4b699963a3 100644
--- a/configs/Sinovoip_BPI_M3_defconfig
+++ b/configs/Sinovoip_BPI_M3_defconfig
@@ -14,6 +14,8 @@ CONFIG_AXP_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a83t-sinovoip-bpi-m3"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPD(25)"
+CONFIG_HUSH_PARSER=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set
@@ -21,4 +23,3 @@ CONFIG_AXP_DCDC5_VOLT=1200
CONFIG_AXP_DLDO3_VOLT=2500
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_MUSB_HOST=y
-CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPD(25)"