ARM: uniphier: merge two defconfig files

[oweals/u-boot.git] / configs / e2220-1170_defconfig

diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig
index 03eed5d55ac00620d15554389a5b73b32a1ffc70..db2d159fd276030b7060f12086ff14d69d76abca 100644 (file)
--- a/configs/e2220-1170_defconfig
+++ b/configs/e2220-1170_defconfig
@@ -1,18 +1,18 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
 CONFIG_TEGRA210=y
-CONFIG_TARGET_E2220_1170=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra210-e2220-1170"
+CONFIG_SYS_PROMPT="Tegra210 (E2220-1170) # "
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
-CONFIG_SPL_DM=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_USE_PRIVATE_LIBGCC=y
-CONFIG_SYS_PROMPT="Tegra210 (E2220-1170) # "