ARM: dreamplug: Enable FDT support

[oweals/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 7f8324915ccc7f97a0d7ed15265cd95e4f1493b9..c5226ab143fe855ab6e5ed1119807ad08afafe9f 100644 (file)
--- a/include/configs/ca9x4_ct_vxp.h
+++ b/include/configs/ca9x4_ct_vxp.h
@@ -32,16 +32,13 @@
 #define CONFIG_REVISION_TAG            1
 #define CONFIG_SYS_TEXT_BASE           0x60800000
 
-/* High Level Configuration Options */
-#define CONFIG_ARMV7                   1
-
 #define CONFIG_SYS_MEMTEST_START       0x60000000
 #define CONFIG_SYS_MEMTEST_END         0x20000000
 #define CONFIG_SYS_HZ                  1000
 
 #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
@@ -53,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
@@ -73,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
@@ -81,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
@@ -99,6 +96,9 @@
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_PXE
+#define CONFIG_BOOTP_PXE_CLIENTARCH    0x100
+#define CONFIG_BOOTP_VCI_STRING                "U-boot.armv7.ca9x4_ct_vxp"
 
 /* Miscellaneous configurable options */
 #undef CONFIG_SYS_CLKS_IN_HZ
@@ -132,10 +132,12 @@
 #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" \
@@ -145,8 +147,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 */