ColdFire: Cache update for all platforms

[oweals/u-boot.git] / include / configs / pm9261.h

diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index ac09cf29479299809d265c19c13f556bfcc54f6a..47bb8c09aa415499c3b14512013076006f86ad7f 100644 (file)
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -28,15 +28,17 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#define CONFIG_AT91_LEGACY
+
 /* ARM asynchronous clock */
-#define AT91_CPU_NAME          "AT91SAM9261"
+#define CONFIG_SYS_AT91_CPU_NAME       "AT91SAM9261"
 
 #define CONFIG_DISPLAY_BOARDINFO
 
 #define MASTER_PLL_DIV         15
 #define MASTER_PLL_MUL         162
 #define MAIN_PLL_DIV           2
-#define AT91_MAIN_CLOCK                18432000
+#define CONFIG_SYS_AT91_MAIN_CLOCK     18432000
 
 #define CONFIG_SYS_HZ          1000
 
@@ -157,6 +159,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO       1
 #define CONFIG_ATMEL_USART     1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
@@ -236,7 +239,6 @@
 #define CONFIG_SYS_NAND_ENABLE_PIN             AT91_PIN_PC14
 #define CONFIG_SYS_NAND_READY_PIN              AT91_PIN_PA16
 
-
 /* NOR flash */
 #define CONFIG_SYS_FLASH_CFI                   1
 #define CONFIG_FLASH_CFI_DRIVER                        1
@@ -253,6 +255,7 @@
 #define CONFIG_DM9000_USE_16BIT                        1
 #define CONFIG_NET_RETRY_COUNT                 20
 #define CONFIG_RESET_PHY_R                     1
+#define CONFIG_NET_MULTI
 
 /* USB */
 #define CONFIG_USB_ATMEL
@@ -286,7 +289,7 @@
 #define CONFIG_BOOTCOMMAND     "cp.b 0xC0042000 0x22000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock0 "                  \
-                               "mtdparts=at91_nand:-(root) "           \
+                               "mtdparts=atmel_nand:-(root) "          \
                                "rw rootfstype=jffs2"
 
 #elif defined(CONFIG_SYS_USE_NANDFLASH) /* CONFIG_SYS_USE_NANDFLASH */
@@ -299,7 +302,7 @@
 #define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock5 "                  \
-                               "mtdparts=at91_nand:128k(bootstrap)ro," \
+                               "mtdparts=atmel_nand:128k(bootstrap)ro,"        \
                                "256k(uboot)ro,128k(env1)ro,"           \
                                "128k(env2)ro,2M(linux),-(root) "       \
                                "rw rootfstype=jffs2"
@@ -365,7 +368,6 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING 1
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */