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

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

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 7eef9a38ef509066a4550085fce8000f836f7ae7..3507de2936b1bdb346695b75bab24717ccc2be02 100644 (file)
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -163,7 +163,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 +177,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 +190,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"
@@ -207,7 +207,6 @@
 #define CONFIG_SYS_LONGHELP            1
 #define CONFIG_CMDLINE_EDITING 1
 
-#define ROUND(A, B)            (((A) + (B)) & ~((B) - 1))
 /*
  * Size of malloc() pool
  */