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

[platform/kernel/u-boot.git] / include / configs / ca9x4_ct_vxp.h

diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h
index 63f003d..2675c56 100644 (file)
--- a/include/configs/ca9x4_ct_vxp.h
+++ b/include/configs/ca9x4_ct_vxp.h
@@ -30,9 +30,7 @@
 /* Board info register */
 #define SYS_ID                         0x10000000
 #define CONFIG_REVISION_TAG            1
-
-/* High Level Configuration Options */
-#define CONFIG_ARMV7                   1
+#define CONFIG_SYS_TEXT_BASE           0x60800000
 
 #define CONFIG_SYS_MEMTEST_START       0x60000000
 #define CONFIG_SYS_MEMTEST_END         0x20000000
@@ -40,9 +38,11 @@
 
 #define CONFIG_CMDLINE_TAG             1       /* enable passing of ATAGs */
 #define CONFIG_SETUP_MEMORY_TAGS       1
-#define CONFIG_L2_OFF                  1
+#define CONFIG_SYS_L2CACHE_OFF         1
 #define CONFIG_INITRD_TAG              1
 
+#define CONFIG_OF_LIBFDT               1
+
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128 * 1024)
 
@@ -50,7 +50,6 @@
 #define VEXPRESS_FLASHPROG_FLVPPEN     (1 << 0)
 
 /* SMSC9115 Ethernet from SMSC9118 family */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X                 1
 #define CONFIG_SMC911X_32_BIT          1
 #define CONFIG_SMC911X_BASE            0x4E000000
@@ -78,7 +77,6 @@
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVEENV
-#define CONFIG_NET_MULTI
 #define CONFIG_CMD_RUN
 
 #define CONFIG_CMD_FAT
@@ -86,6 +84,10 @@
 #define CONFIG_MMC                     1
 #define CONFIG_CMD_MMC
 #define CONFIG_GENERIC_MMC
+#define CONFIG_ARM_PL180_MMCI
+#define CONFIG_ARM_PL180_MMCI_BASE     0x10005000
+#define CONFIG_SYS_MMC_MAX_BLK_COUNT   127
+#define CONFIG_ARM_PL180_MMCI_CLOCK_FREQ 6250000
 
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE