summaryrefslogtreecommitdiff
path: root/configs/socfpga_socrates_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/socfpga_socrates_defconfig
parent9f69ab86d0592d528a0372f01fa23684291243fa (diff)
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/socfpga_socrates_defconfig')
-rw-r--r--configs/socfpga_socrates_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig
index 562052c3f7f..77648793e58 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