Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

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

diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
index e967e7cdfa2b3b04c4c38aeffba161074820b574..d2394235f193f109340c76a63f5ad5b8780f9ee2 100644 (file)
--- a/include/configs/cpu9260.h
+++ b/include/configs/cpu9260.h
@@ -35,7 +35,7 @@
 
 #define CONFIG_DISPLAY_CPUINFO 1
 
-#define AT91_MAIN_CLOCK                18432000
+#define CONFIG_SYS_AT91_MAIN_CLOCK     18432000
 #define CONFIG_SYS_HZ          1000
 
 #define CONFIG_ARM926EJS       1
@@ -244,6 +244,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO       1
 #define CONFIG_ATMEL_USART     1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
@@ -444,7 +445,6 @@
  */
 #define CONFIG_SYS_MALLOC_LEN          \
                ROUND(3 * CONFIG_ENV_SIZE + 128 * 1024, 0x1000)
-#define CONFIG_SYS_GBL_DATA_SIZE       128
 
 #define CONFIG_STACKSIZE               (32 * 1024)