-#undef CONFIG_ISO_PARTITION
-#else
-#define BOOTENV
-#endif
-
-/* Initial environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS \
- BOOTENV \
- MEM_LAYOUT_ENV_SETTINGS \
- "script=boot.scr\0" \
- "bootm_size=0x10000000\0" \
- "dev=2\0" \
- "preboot=gsc wd-disable\0" \
- "console=ttymxc1,115200\0" \
- "update_firmware=" \
- "tftpboot $loadaddr $image && " \
- "setexpr blkcnt $filesize + 0x1ff && " \
- "setexpr blkcnt $blkcnt / 0x200 && " \
- "mmc dev $dev && " \
- "mmc write $loadaddr 0x40 $blkcnt\0" \
- "boot_net=" \
- "tftpboot $kernel_addr_r $image && " \
- "booti $kernel_addr_r - $fdtcontroladdr\0" \
- "update_rootfs=" \
- "tftpboot $loadaddr $image && " \
- "gzwrite mmc $dev $loadaddr $filesize 100000 1000000\0" \
- "update_all=" \
- "tftpboot $loadaddr $image && " \
- "gzwrite mmc $dev $loadaddr $filesize\0" \
- "erase_env=mmc dev $dev; mmc erase 0x7f08 0x40\0"
-
-#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
-#define CONFIG_SYS_INIT_RAM_SIZE SZ_2M
-#define CONFIG_SYS_INIT_SP_OFFSET \
- (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
- (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-
-#define CONFIG_SYS_SDRAM_BASE 0x40000000
-
-/* SDRAM configuration */
-#define PHYS_SDRAM 0x40000000
-#define PHYS_SDRAM_SIZE SZ_1G
-#define CONFIG_SYS_BOOTM_LEN SZ_256M
-
-/* UART */
-#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR
-
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE SZ_2K
-#define CONFIG_SYS_MAXARGS 64
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
-/* USDHC */
-#define CONFIG_SYS_FSL_USDHC_NUM 2
-#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-
-/* FEC */
-#define CONFIG_ETHPRIME "eth0"
-#define CONFIG_FEC_XCV_TYPE RGMII
-#define CONFIG_FEC_MXC_PHYADDR 0
-#define FEC_QUIRK_ENET_MAC
+#define CFG_EXTRA_ENV_SETTINGS \
+ BOOTENV
+
+#define CFG_SYS_INIT_RAM_ADDR 0x40000000
+#define CFG_SYS_INIT_RAM_SIZE SZ_2M
+
+/* SDRAM configuration: 4GiB */
+#define CFG_SYS_SDRAM_BASE 0x40000000
+#define PHYS_SDRAM 0x40000000
+#define PHYS_SDRAM_SIZE 0x80000000 /* 2 GB */
+#define PHYS_SDRAM_2 0xC0000000
+#define PHYS_SDRAM_2_SIZE 0x80000000 /* 2 GB */