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

[J-u-boot.git] / include / configs / afeb9260.h

diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index c5134a2140cc0faa7e6c66b77e1933c0a149d87c..36a2a461d16fb94071dc0b89f186b1d32483515c 100644 (file)
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -26,8 +26,10 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#define CONFIG_AT91_LEGACY
+
 /* ARM asynchronous clock */
-#define AT91_MAIN_CLOCK                18429952        /* from 18.432 MHz crystal */
+#define CONFIG_SYS_AT91_MAIN_CLOCK             18429952        /* from 18.432 MHz crystal */
 #define CONFIG_SYS_HZ          1000
 
 #define CONFIG_AT91SAM9260     1       /* It's an Atmel AT91SAM9260 SoC*/
@@ -40,11 +42,11 @@
 #define CONFIG_INITRD_TAG      1
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SKIP_RELOCATE_UBOOT
 
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO       1
 #define CONFIG_ATMEL_USART     1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
@@ -106,6 +108,7 @@
 #define CONFIG_SYS_NAND_MASK_CLE               (1 << 22)
 #define CONFIG_SYS_NAND_ENABLE_PIN             AT91_PIN_PC14
 #define CONFIG_SYS_NAND_READY_PIN              AT91_PIN_PC13
+
 #endif
 
 /* NOR flash - no real flash on this board */
@@ -159,12 +162,10 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING 1
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */
 #define CONFIG_SYS_MALLOC_LEN          ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
-#define CONFIG_SYS_GBL_DATA_SIZE       128     /* 128 bytes for initial data */
 
 #define CONFIG_STACKSIZE       (32 * 1024)     /* regular stack */