Merge branch 'Makefile' of git://git.denx.de/u-boot-arm

[platform/kernel/u-boot.git] / include / configs / dbau1x00.h

diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index b2f606f..8941c5e 100644 (file)
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -30,21 +30,21 @@
 
 #define CONFIG_MIPS32          1  /* MIPS32 CPU core   */
 #define CONFIG_DBAU1X00                1
-#define CONFIG_AU1X00          1  /* alchemy series cpu */
+#define CONFIG_SOC_AU1X00      1  /* alchemy series cpu */
 
 #ifdef CONFIG_DBAU1000
 /* Also known as Merlot */
-#define CONFIG_AU1000          1
+#define CONFIG_SOC_AU1000      1
 #else
 #ifdef CONFIG_DBAU1100
-#define CONFIG_AU1100          1
+#define CONFIG_SOC_AU1100      1
 #else
 #ifdef CONFIG_DBAU1500
-#define CONFIG_AU1500          1
+#define CONFIG_SOC_AU1500      1
 #else
 #ifdef CONFIG_DBAU1550
 /* Cabernet */
-#define CONFIG_AU1550           1
+#define CONFIG_SOC_AU1550      1
 #else
 #error "No valid board set"
 #endif
@@ -148,7 +148,9 @@
 #error "Invalid CPU frequency - must be multiple of 12!"
 #endif
 
-#define CFG_HZ                  (CFG_MHZ * 1000000) /* FIXME causes overflow in net.c */
+#define CFG_MIPS_TIMER_FREQ    (CFG_MHZ * 1000000)
+
+#define CFG_HZ                 1000
 
 #define CFG_SDRAM_BASE         0x80000000     /* Cached addr */
 
@@ -181,7 +183,7 @@
 #define CFG_FLASH_BANKS_LIST {PHYS_FLASH_1, PHYS_FLASH_2}
 
 #define CFG_FLASH_CFI           1
-#define CFG_FLASH_CFI_DRIVER    1
+#define CONFIG_FLASH_CFI_DRIVER    1
 
 /* The following #defines are needed to get flash environment right */
 #define        CFG_MONITOR_BASE        TEXT_BASE