Drop support for CONFIG_SKIP_RELOCATE_UBOOT

[karo-tx-uboot.git] / include / configs / at91sam9260ek.h

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 6cee59368ceb194c55a9ff0c56463c86f7f2037f..5e7dee5299fed0438174957fe4a2473cdab8eaa1 100644 (file)
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -27,8 +27,10 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#define CONFIG_AT91_LEGACY
+
 /* ARM asynchronous clock */
-#define AT91_MAIN_CLOCK                18432000        /* 18.432 MHz crystal */
+#define CONFIG_SYS_AT91_MAIN_CLOCK     18432000        /* 18.432 MHz crystal */
 #define CONFIG_SYS_HZ          1000
 
 #define CONFIG_ARM926EJS       1       /* This is an ARM926EJS Core    */
@@ -47,11 +49,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
@@ -123,7 +125,6 @@
 #define CONFIG_SYS_NAND_ENABLE_PIN             AT91_PIN_PC14
 #define CONFIG_SYS_NAND_READY_PIN              AT91_PIN_PC13
 
-#define CONFIG_SYS_64BIT_VSPRINTF              /* needed for nand_util.c */
 #endif
 
 /* NOR flash - no real flash on this board */
@@ -163,7 +164,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 CONFIG_SYS_USE_DATAFLASH_CS1
@@ -177,7 +178,7 @@
 #define CONFIG_BOOTCOMMAND     "cp.b 0xD0042000 0x22000000 0x210000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock0 "                  \
-                               "mtdparts=at91_nand:-(root) "           \
+                               "mtdparts=atmel_nand:-(root) "          \
                                "rw rootfstype=jffs2"
 
 #else /* CONFIG_SYS_USE_NANDFLASH */
@@ -190,7 +191,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"
@@ -211,7 +212,6 @@
  * 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 */