Merge git://git.denx.de/u-boot-dm

[u-boot] / configs / display5_defconfig

diff --git a/configs/display5_defconfig b/configs/display5_defconfig
index dfd9c2c29881d74cf0d8a1a3d62d4b9be60e06a2..5da6cbad6f7253a43d6d847b47e4eb25f1270711 100644 (file)
--- a/configs/display5_defconfig
+++ b/configs/display5_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
+CONFIG_SYS_TEXT_BASE=0x17800000
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -27,7 +28,6 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_EEPROM=y
-# CONFIG_CMD_FPGA is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
@@ -60,3 +60,4 @@ CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
 # CONFIG_SPL_DM_SERIAL is not set
 CONFIG_MXC_UART=y
+CONFIG_MXC_SPI=y