Merge branch 'karo-tx-uboot' into kc-merge

[karo-tx-uboot.git] / include / configs / vf610twr.h

diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 6fd0b173ebb9a1a45f2a514bdb9b6eff3eee8b45..d5d296b9a39c2478936790a849e7edb021f4b5e0 100644 (file)
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -12,7 +12,6 @@
 #include <asm/arch/imx-regs.h>
 #include <config_cmd_default.h>
 
-#define CONFIG_VF610
 
 #define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DISPLAY_CPUINFO
@@ -60,11 +59,8 @@
 /* UBI */
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
-#define CONFIG_CMD_MTDPARTS
 #define CONFIG_RBTREE
 #define CONFIG_LZO
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
 
 /* Dynamic MTD partition support */
 #define CONFIG_CMD_MTDPARTS
@@ -125,7 +121,10 @@
 #define CONFIG_BOOTDELAY               3
 
 #define CONFIG_LOADADDR                        0x82000000
-#define CONFIG_SYS_TEXT_BASE           0x3f008000
+
+/* We boot from the gfxRAM area of the OCRAM. */
+#define CONFIG_SYS_TEXT_BASE           0x3f408000
+#define CONFIG_BOARD_SIZE_LIMIT                524288
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \