Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

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

diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index b08de4a72efaf376bfa4c940083420e5d031d515..d4104de5f256d95b284dd4c7912b4c71807975c3 100644 (file)
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -61,8 +61,6 @@
 #define CONFIG_SYS_PBSIZE      \
        (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 
-#define CONFIG_STACKSIZE       (32*1024)       /* regular stack */
-
 /*
  * ARM asynchronous clock
  */
@@ -139,6 +137,8 @@
 #define CONFIG_CMD_PING
 #define CONFIG_I2C_CMD_NO_FLAT
 #define CONFIG_I2C_CMD_TREE
+#define CONFIG_CMD_USB
+#define CONFIG_CMD_FAT
 
 #define CONFIG_SYS_LONGHELP
 
@@ -169,13 +169,23 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_USB_ATMEL
+#define CONFIG_USB_OHCI_NEW
+#define CONFIG_AT91C_PQFP_UHPBUG
+#define CONFIG_USB_STORAGE
+#define CONFIG_DOS_PARTITION
+#define CONFIG_ISO_PARTITION
+#define CONFIG_EFI_PARTITION
+
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     1
+#define CONFIG_SYS_USB_OHCI_CPU_INIT
+#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00300000
+#define CONFIG_SYS_USB_OHCI_SLOT_NAME          "at91rm9200"
 
 /*
  * UART/CONSOLE
  */
 
-#define CONFIG_SYS_BAUDRATE_TABLE      { 115200, 19200, 38400, 57600, 9600 }
-
 #define CONFIG_BAUDRATE 115200
 #define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE      ATMEL_BASE_DBGU
@@ -270,13 +280,10 @@
 
 /* NAND */
 
-#define CONFIG_SYS_NAND_MAX_CHIPS      1
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           0x40000000
 #define CONFIG_SYS_NAND_DBW_8          1
 
-#define CONFIG_SYS_64BIT_VSPRINTF      1
-
 /* Status LED's */
 
 #define CONFIG_STATUS_LED              1