From adad96e60d0eb1bbc4d0b96c89decf385a426e42 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 21 Apr 2016 21:37:19 -0400 Subject: 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 --- configs/orangepi_plus_defconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'configs/orangepi_plus_defconfig') diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig index e96a273..fa12937 100644 --- a/configs/orangepi_plus_defconfig +++ b/configs/orangepi_plus_defconfig @@ -6,14 +6,15 @@ CONFIG_DRAM_ZQ=3881979 CONFIG_DRAM_ODT_EN=y CONFIG_MMC0_CD_PIN="PF6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_USB1_VBUS_PIN="PG13" # CONFIG_VIDEO is not set CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-plus" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPG(11)" +CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_FPGA is not set CONFIG_SY8106A_POWER=y CONFIG_USB_EHCI_HCD=y -CONFIG_USB1_VBUS_PIN="PG13" -CONFIG_SYS_EXTRA_OPTIONS="SATAPWR=SUNXI_GPG(11)" -- cgit v1.1