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

[u-boot] / include / configs / ca9x4_ct_vxp.h

diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h
index d68607ffc6bd062204c8e3b1d177476b8c3c7430..312fd947beb2ced7449405fe8d878024a18b987e 100644 (file)
--- a/include/configs/ca9x4_ct_vxp.h
+++ b/include/configs/ca9x4_ct_vxp.h
@@ -62,7 +62,6 @@
 #define CONFIG_CONS_INDEX              0
 
 #define CONFIG_BAUDRATE                        38400
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_SERIAL0             0x10009000
 #define CONFIG_SYS_SERIAL1             0x1000A000
 
@@ -96,6 +95,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
@@ -103,13 +105,6 @@
 #define LINUX_BOOT_PARAM_ADDR          0x60000200
 #define CONFIG_BOOTDELAY               2
 
-/* Stack sizes are set up in start.S using the settings below */
-#define CONFIG_STACKSIZE               (128 * 1024)    /* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ           (4 * 1024)      /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ           (4 * 1024)      /* FIQ stack */
-#endif
-
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS           2
 #define PHYS_SDRAM_1                   0x60000000      /* SDRAM Bank #1 */