Fix timer code for ARM systems: make sure that udelay() does not

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

diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 1d4daa7598ac0f592f472b325d65b76d35d3065c..6a9a05d31ad9181d46396e0d540eae282e4d88c5 100644 (file)
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2003-2004
+ * (C) Copyright 2003-2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -68,6 +68,8 @@
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x01000000
 
+#define CFG_XLB_PIPELINING     1
+
 #define CONFIG_NET_MULTI       1
 #define CONFIG_EEPRO100                1
 #define CFG_RX_ETH_BUFFER      8  /* use 8 rx buffer on eepro100  */
@@ -84,27 +86,31 @@
 /* Partitions */
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION
+#define CONFIG_ISO_PARTITION
 
 /* USB */
 #if 1
 #define CONFIG_USB_OHCI
 #define ADD_USB_CMD             CFG_CMD_USB | CFG_CMD_FAT
-#define CONFIG_DOS_PARTITION
 #define CONFIG_USB_STORAGE
 #else
 #define ADD_USB_CMD             0
 #endif
 
+#define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
+
 /*
  * Supported commands
  */
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
-                                CFG_CMD_EEPROM | \
-                                CFG_CMD_FAT    | \
-                                CFG_CMD_I2C    | \
-                                CFG_CMD_IDE    | \
-                                ADD_PCI_CMD    | \
-                                ADD_USB_CMD)
+#define CONFIG_COMMANDS               (CONFIG_CMD_DFL  | \
+                               CFG_CMD_EEPROM  | \
+                               CFG_CMD_FAT     | \
+                               CFG_CMD_I2C     | \
+                               CFG_CMD_IDE     | \
+                               CFG_CMD_NFS     | \
+                               CFG_CMD_SNTP    | \
+                               ADD_PCI_CMD     | \
+                               ADD_USB_CMD     )
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -174,16 +180,16 @@
 /*
  * Flash configuration
  */
-#define CFG_FLASH_BASE         0xff000000
+#define CFG_FLASH_BASE         0xFF000000
 #define CFG_FLASH_SIZE         0x01000000
 #if !defined(CFG_LOWBOOT)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x740000 + 0x800000)
+#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00740000 + 0x00800000)
 #else  /* CFG_LOWBOOT */
 #if defined(CFG_LOWBOOT08)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x30000 + 0x800000)
+#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00040000 + 0x00800000)
 #endif
 #if defined(CFG_LOWBOOT16)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x30000)
+#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00040000)
 #endif
 #endif /* CFG_LOWBOOT */
 #define CFG_MAX_FLASH_BANKS    2       /* max num of memory banks      */
@@ -207,7 +213,7 @@
 /*
  * Memory map
  */
-#define CFG_MBAR               0xf0000000
+#define CFG_MBAR               0xF0000000
 #define CFG_SDRAM_BASE         0x00000000
 #define CFG_DEFAULT_MBAR       0x80000000
 
@@ -233,7 +239,10 @@
  * Ethernet configuration
  */
 #define CONFIG_MPC5xxx_FEC     1
-#define CONFIG_FEC_10MBIT 1 /* Workaround for FEC 100Mbit problem */
+/*
+ * Define CONFIG_FEC_10MBIT to force FEC at 10Mb
+ */
+/* #define CONFIG_FEC_10MBIT 1 */
 #define CONFIG_PHY_ADDR                0x00
 
 /*
@@ -279,10 +288,10 @@
 
 #ifdef CONFIG_MPC5200_DDR
 
-#define CFG_BOOTCS_START       0xff800000
+#define CFG_BOOTCS_START       (CFG_CS1_START + CFG_CS1_SIZE)
 #define CFG_BOOTCS_SIZE                0x00800000
 #define CFG_BOOTCS_CFG         0x00047801
-#define CFG_CS1_START          0xff000000
+#define CFG_CS1_START          CFG_FLASH_BASE
 #define CFG_CS1_SIZE           0x00800000
 #define CFG_CS1_CFG            0x00047800
 
@@ -301,6 +310,13 @@
 
 #define CFG_RESET_ADDRESS      0xff000000
 
+/*-----------------------------------------------------------------------
+ * USB stuff
+ *-----------------------------------------------------------------------
+ */
+#define CONFIG_USB_CLOCK       0x0001BBBB
+#define CONFIG_USB_CONFIG      0x00001000
+
 /*-----------------------------------------------------------------------
  * IDE/ATA stuff Supports IDE harddisk
  *-----------------------------------------------------------------------
@@ -315,7 +331,7 @@
 #define CONFIG_IDE_PREINIT
 
 #define CFG_IDE_MAXBUS         1       /* max. 1 IDE bus               */
-#define CFG_IDE_MAXDEVICE      1       /* max. 1 drive per IDE bus     */
+#define CFG_IDE_MAXDEVICE      2       /* max. 1 drive per IDE bus     */
 
 #define CFG_ATA_IDE0_OFFSET    0x0000
 
@@ -328,9 +344,11 @@
 #define CFG_ATA_REG_OFFSET     (CFG_ATA_DATA_OFFSET)
 
 /* Offset for alternate registers      */
-#define CFG_ATA_ALT_OFFSET     (0x005c)
+#define CFG_ATA_ALT_OFFSET     (0x005C)
 
 /* Interval between registers                                                */
 #define CFG_ATA_STRIDE          4
 
+#define CONFIG_ATAPI            1
+
 #endif /* __CONFIG_H */