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

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

diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 94e1eb9d8a4579259836a9ba16a1caf8995dbca2..6761c182d7a6a6de63f6c831e65eb17326e89741 100644 (file)
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -258,6 +258,8 @@
 #define CONFIG_SYS_NAND_MASK_CLE       (1 << 22)
 #define CONFIG_SYS_NAND_ENABLE_PIN     AT91_PIN_PD15
 #define CONFIG_SYS_NAND_READY_PIN      AT91_PIN_PB30
+
+#define CONFIG_SYS_64BIT_VSPRINTF              /* needed for nand_util.c */
 #endif
 
 #define CONFIG_CMD_JFFS2               1
@@ -308,7 +310,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) /* CFG_USE_NANDFLASH */
@@ -321,7 +323,7 @@
 #define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
 #define CONFIG_BOOTARGS                "console=ttyS0,115200 "         \
                                "root=/dev/mtdblock5 "          \
-                               "mtdparts=at91_nand:"           \
+                               "mtdparts=atmel_nand:"          \
                                        "128k(bootstrap)ro,"    \
                                        "256k(uboot)ro,"        \
                                        "128k(env1)ro,"         \
@@ -395,7 +397,6 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING         1
 
-#define ROUND(A, B)                    (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */