Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / configs / mx53cx9020_defconfig

diff --git a/configs/mx53cx9020_defconfig b/configs/mx53cx9020_defconfig
index 6954cf5f0e924f2c38e4b72442b31f38bf4d81c7..3923a36b0d48652a035f3816170effb232142846 100644 (file)
--- a/configs/mx53cx9020_defconfig
+++ b/configs/mx53cx9020_defconfig
@@ -1,35 +1,33 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX5=y
+CONFIG_SYS_TEXT_BASE=0x77800000
 CONFIG_TARGET_MX53CX9020=y
+# CONFIG_CMD_BMODE is not set
 CONFIG_DEFAULT_DEVICE_TREE="imx53-cx9020"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/beckhoff/mx53cx9020/imximage.cfg"
 CONFIG_BOOTDELAY=1
+CONFIG_SUPPORT_RAW_INITRD=y
 CONFIG_HUSH_PARSER=y
-# CONFIG_DM_MMC_OPS is not set
 CONFIG_CMD_BOOTZ=y
-# CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MMC=y
-#CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_VIDEO=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_PXE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
-CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_MXC_UART=y
 CONFIG_OF_CONTROL=y
+CONFIG_ENV_IS_IN_MMC=y
 CONFIG_FPGA_ALTERA=y
 CONFIG_FPGA_CYCLON2=y
-CONFIG_CMD_FPGA=y
+CONFIG_FSL_ESDHC=y
+CONFIG_NETDEVICES=y
+CONFIG_FEC_MXC=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX5=y
+CONFIG_MXC_UART=y
+CONFIG_VIDEO=y
 # CONFIG_VIDEO_SW_CURSOR is not set
-CONFIG_CFB_CONSOLE=y
-CONFIG_VGA_AS_SINGLE_DEVICE=y
-CONFIG_SYS_CONSOLE_BG_COL=0x00
-CONFIG_SYS_CONSOLE_FG_COL=0xa0