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/socfpga_socrates_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configs/socfpga_socrates_defconfig') diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 562052c3f7..77648793e5 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -9,6 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates" CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y +CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y @@ -16,6 +17,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_DWAPB_GPIO=y CONFIG_DM_MMC=y CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_DM_ETH=y @@ -23,7 +25,6 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_SYS_NS16550=y CONFIG_CADENCE_QSPI=y CONFIG_DESIGNWARE_SPI=y -CONFIG_SPI_FLASH_BAR=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y -- cgit v1.2.1