ARM: uniphier: merge two defconfig files

[oweals/u-boot.git] / configs / mx28evk_spi_defconfig

diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig
index df992fac31de9d8b0704dab12f31c1938413dcce..976ebc2c860b1476f5b7662ea034e584aefa1d4c 100644 (file)
--- a/configs/mx28evk_spi_defconfig
+++ b/configs/mx28evk_spi_defconfig
@@ -1,4 +1,9 @@
+CONFIG_ARM=y
+CONFIG_TARGET_MX28EVK=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_SPI_FLASH"
-+S:CONFIG_ARM=y
-+S:CONFIG_TARGET_MX28EVK=y
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_GPIO=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_SST=y