Move setting CONFIG_BOOTP_VCI_STRING to before including the vexpress-common header

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

diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index ccc7bd0a8aa70f88750499e83dbb1793c5c2bf19..271e071cbba9ffb6079d7f4cdd8c939f72a6bb2b 100644 (file)
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -36,15 +36,11 @@
 #define CONFIG_SYS_TEXT_BASE           0x00000000
 #else
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_TEXT_BASE           0x21f00000
+#define CONFIG_SYS_TEXT_BASE           0x21800000
 #endif
 #define CONFIG_SYS_LOAD_ADDR           0x21000000  /* default load address */
 #define CONFIG_STANDALONE_LOAD_ADDR    0x21000000
 
-#define CONFIG_SYS_BOOT_SIZE           0x00 /* 0 KBytes */
-#define CONFIG_SYS_U_BOOT_BASE         PHYS_FLASH_1
-#define CONFIG_SYS_U_BOOT_SIZE         0x60000 /* 384 KBytes */
-
 #define CONFIG_BOOT_RETRY_TIME         30
 #define CONFIG_CMDLINE_EDITING
 
@@ -60,7 +56,6 @@
 
 #define AT91C_MAIN_CLOCK       179404800       /* from 12.288 MHz * 73 / 5 */
 #define AT91C_MASTER_CLOCK     (AT91C_MAIN_CLOCK / 3)
-#define CONFIG_SYS_HZ          1000
 #define CONFIG_SYS_HZ_CLOCK    (AT91C_MASTER_CLOCK / 2)
 
 #define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock */
@@ -83,7 +78,7 @@
  * Size of malloc() pool
  */
 
-#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 520*1024)
+#define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)
 
 /*
  * sdram
@@ -117,9 +112,6 @@
 /*
  * Command line configuration
  */
-
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BMP
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
@@ -133,6 +125,7 @@
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_CMD_UBIFS
+
 #define CONFIG_SYS_LONGHELP
 
 /*
@@ -162,6 +155,7 @@
  * Hardware drivers
  */
 #define CONFIG_USB_ATMEL
+#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
 #define CONFIG_USB_OHCI_NEW
 #define CONFIG_AT91C_PQFP_UHPBUG
 #define CONFIG_USB_STORAGE