arm: ca9x4_ct_vxp: enable pxe command support

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

diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h
index 5547d55eecd25c24d53b69ce6fc3f5d9e44e8aff..d68607ffc6bd062204c8e3b1d177476b8c3c7430 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,18 +38,18 @@
 
 #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)
-#define CONFIG_SYS_GBL_DATA_SIZE       128
 
 #define SCTL_BASE                      0x10001000
 #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
@@ -71,6 +69,8 @@
 /* Command line configuration */
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_DHCP
+#define CONFIG_CMD_PXE
+#define CONFIG_MENU
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_FLASH
@@ -79,7 +79,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
@@ -87,6 +86,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
@@ -116,20 +119,22 @@
 
 /* additions for new relocation code */
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_RAM_END                0x1000
+#define CONFIG_SYS_INIT_RAM_SIZE               0x1000
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_SDRAM_BASE + \
-                                        CONFIG_SYS_INIT_RAM_END - \
-                                        CONFIG_SYS_GBL_DATA_SIZE)
+                                        CONFIG_SYS_INIT_RAM_SIZE - \
+                                        GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SYS_GBL_DATA_OFFSET
 
 /* Basic environment settings */
 #define CONFIG_BOOTCOMMAND             "run bootflash;"
 #define CONFIG_EXTRA_ENV_SETTINGS \
                "loadaddr=0x80008000\0" \
-               "initrd=0x61000000\0" \
-               "kerneladdr=0x44100000\0" \
-               "initrdaddr=0x44800000\0" \
-               "maxinitrd=0x1800000\0" \
+               "ramdisk_addr_r=0x61000000\0" \
+               "kernel_addr=0x44100000\0" \
+               "ramdisk_addr=0x44800000\0" \
+               "maxramdisk=0x1800000\0" \
+               "pxefile_addr_r=0x88000000\0" \
+               "kernel_addr_r=0x80008000\0" \
                "console=ttyAMA0,38400n8\0" \
                "dram=1024M\0" \
                "root=/dev/sda1 rw\0" \
@@ -139,8 +144,8 @@
                        "mem=${dram} mtdparts=${mtd} mmci.fmax=190000 " \
                        "devtmpfs.mount=0  vmalloc=256M\0" \
                "bootflash=run flashargs; " \
-                       "cp ${initrdaddr} ${initrd} ${maxinitrd}; " \
-                       "bootm ${kerneladdr} ${initrd}\0"
+                       "cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \
+                       "bootm ${kernel_addr} ${ramdisk_addr_r}\0"
 
 /* FLASH and environment organization */
 #define PHYS_FLASH_SIZE                        0x04000000      /* 64MB */