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

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

diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index c61af08be2688b3444179e2ac0d293bc75162f30..cc194d8b6be9cfeadb27f612e6b5e16b0bff08bb 100644 (file)
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -28,9 +28,8 @@
 #define __CONFIG_H
 
 /* ARM asynchronous clock */
-#define AT91_CPU_NAME          "AT91CAP9"
 #define AT91_MAIN_CLOCK                12000000        /* 12 MHz crystal */
-#define CONFIG_SYS_HZ          1000000         /* 1us resolution */
+#define CONFIG_SYS_HZ          1000
 
 #define CONFIG_ARM926EJS       1       /* This is an ARM926EJS Core    */
 #define CONFIG_AT91CAP9                1       /* It's an Atmel AT91CAP9 SoC   */
@@ -124,7 +123,6 @@
 /* our CLE is AD22 */
 #define CONFIG_SYS_NAND_MASK_CLE               (1 << 22)
 #define CONFIG_SYS_NAND_ENABLE_PIN             AT91_PIN_PD15
-#endif
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
@@ -133,6 +131,9 @@
 #define CONFIG_SYS_NAND_BASE                   0x40000000
 #define CONFIG_SYS_NAND_DBW_8                  1
 
+#define CONFIG_SYS_64BIT_VSPRINTF              /* needed for nand_util.c */
+#endif
+
 /* Ethernet */
 #define CONFIG_MACB                    1
 #define CONFIG_RMII                    1
@@ -171,7 +172,7 @@
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "                 \
                                "root=/dev/mtdblock1 "                  \
                                "mtdparts=physmap-flash.0:-(nor);"      \
-                               "at91_nand:-(root) "                    \
+                               "atmel_nand:-(root) "                   \
                                "rw rootfstype=jffs2"
 
 #else
@@ -187,7 +188,7 @@
                                "root=/dev/mtdblock4 "                  \
                                "mtdparts=physmap-flash.0:16k(bootstrap)ro,"\
                                "16k(env),224k(uboot)ro,-(linux);"      \
-                               "at91_nand:-(root) "                    \
+                               "atmel_nand:-(root) "                   \
                                "rw rootfstype=jffs2"
 
 #endif
@@ -202,7 +203,6 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING 1
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */