Skip to content
Snippets Groups Projects
Commit 918319c7 authored by Albin Tonnerre's avatar Albin Tonnerre Committed by Wolfgang Denk
Browse files

Update the mtd driver name in bootargs for at91-based boards


The name of the atmel nand driver in the kernel changed from at91_nand
to atmel_nand back in June 2008, but the at91-based boards config files
still refer to at91_nand. This patch updates them with the new name

Signed-off-by: default avatarAlbin Tonnerre <albin.tonnerre@free-electrons.com>
parent 8fa656aa
No related branches found
No related tags found
No related merge requests found
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock1 " \ "root=/dev/mtdblock1 " \
"mtdparts=physmap-flash.0:-(nor);" \ "mtdparts=physmap-flash.0:-(nor);" \
"at91_nand:-(root) " \ "atmel_nand:-(root) " \
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
#else #else
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
"root=/dev/mtdblock4 " \ "root=/dev/mtdblock4 " \
"mtdparts=physmap-flash.0:16k(bootstrap)ro,"\ "mtdparts=physmap-flash.0:16k(bootstrap)ro,"\
"16k(env),224k(uboot)ro,-(linux);" \ "16k(env),224k(uboot)ro,-(linux);" \
"at91_nand:-(root) " \ "atmel_nand:-(root) " \
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
#endif #endif
......
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \ "root=/dev/mtdblock0 " \
"mtdparts=at91_nand:-(root) " \ "mtdparts=atmel_nand:-(root) " \
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
#elif CONFIG_SYS_USE_DATAFLASH_CS1 #elif CONFIG_SYS_USE_DATAFLASH_CS1
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \ "root=/dev/mtdblock0 " \
"mtdparts=at91_nand:-(root) " \ "mtdparts=atmel_nand:-(root) " \
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
#else /* CONFIG_SYS_USE_NANDFLASH */ #else /* CONFIG_SYS_USE_NANDFLASH */
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \ "root=/dev/mtdblock5 " \
"mtdparts=at91_nand:128k(bootstrap)ro," \ "mtdparts=atmel_nand:128k(bootstrap)ro," \
"256k(uboot)ro,128k(env1)ro," \ "256k(uboot)ro,128k(env1)ro," \
"128k(env2)ro,2M(linux),-(root) " \ "128k(env2)ro,2M(linux),-(root) " \
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
......
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \ "root=/dev/mtdblock0 " \
"mtdparts=at91_nand:-(root) " \ "mtdparts=atmel_nand:-(root) " \
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
#elif CONFIG_SYS_USE_DATAFLASH_CS3 #elif CONFIG_SYS_USE_DATAFLASH_CS3
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \ "root=/dev/mtdblock0 " \
"mtdparts=at91_nand:-(root) " \ "mtdparts=atmel_nand:-(root) " \
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
#else /* CONFIG_SYS_USE_NANDFLASH */ #else /* CONFIG_SYS_USE_NANDFLASH */
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \ "root=/dev/mtdblock5 " \
"mtdparts=at91_nand:128k(bootstrap)ro," \ "mtdparts=atmel_nand:128k(bootstrap)ro," \
"256k(uboot)ro,128k(env1)ro," \ "256k(uboot)ro,128k(env1)ro," \
"128k(env2)ro,2M(linux),-(root) " \ "128k(env2)ro,2M(linux),-(root) " \
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
......
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \ "root=/dev/mtdblock0 " \
"mtdparts=at91_nand:-(root) "\ "mtdparts=atmel_nand:-(root) "\
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
#elif CONFIG_SYS_USE_NANDFLASH #elif CONFIG_SYS_USE_NANDFLASH
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \ "root=/dev/mtdblock5 " \
"mtdparts=at91_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) " \ "mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) " \
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
#endif #endif
......
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \ "root=/dev/mtdblock0 " \
"mtdparts=at91_nand:-(root) "\ "mtdparts=atmel_nand:-(root) "\
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
#else /* CONFIG_SYS_USE_NANDFLASH */ #else /* CONFIG_SYS_USE_NANDFLASH */
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
#define CONFIG_BOOTCOMMAND "nand read 0x72000000 0x200000 0x200000; bootm" #define CONFIG_BOOTCOMMAND "nand read 0x72000000 0x200000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \ "root=/dev/mtdblock5 " \
"mtdparts=at91_nand:128k(bootstrap)ro, \ "mtdparts=atmel_nand:128k(bootstrap)ro, \
256k(uboot)ro,128k(env1)ro,128k(env2)ro, \ 256k(uboot)ro,128k(env1)ro,128k(env2)ro, \
2M(linux),-(root) " \ 2M(linux),-(root) " \
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
......
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \ "root=/dev/mtdblock0 " \
"mtdparts=at91_nand:-(root) "\ "mtdparts=atmel_nand:-(root) "\
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
#else /* CONFIG_SYS_USE_NANDFLASH */ #else /* CONFIG_SYS_USE_NANDFLASH */
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \ "root=/dev/mtdblock5 " \
"mtdparts=at91_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) " \ "mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) " \
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
#endif #endif
......
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \ "root=/dev/mtdblock0 " \
"mtdparts=at91_nand:-(root) " \ "mtdparts=atmel_nand:-(root) " \
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
#elif defined(CONFIG_SYS_USE_NANDFLASH) /* CONFIG_SYS_USE_NANDFLASH */ #elif defined(CONFIG_SYS_USE_NANDFLASH) /* CONFIG_SYS_USE_NANDFLASH */
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \ "root=/dev/mtdblock5 " \
"mtdparts=at91_nand:128k(bootstrap)ro," \ "mtdparts=atmel_nand:128k(bootstrap)ro," \
"256k(uboot)ro,128k(env1)ro," \ "256k(uboot)ro,128k(env1)ro," \
"128k(env2)ro,2M(linux),-(root) " \ "128k(env2)ro,2M(linux),-(root) " \
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
......
...@@ -310,7 +310,7 @@ ...@@ -310,7 +310,7 @@
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" #define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \ "root=/dev/mtdblock0 " \
"mtdparts=at91_nand:-(root) "\ "mtdparts=atmel_nand:-(root) "\
"rw rootfstype=jffs2" "rw rootfstype=jffs2"
#elif defined(CONFIG_SYS_USE_NANDFLASH) /* CFG_USE_NANDFLASH */ #elif defined(CONFIG_SYS_USE_NANDFLASH) /* CFG_USE_NANDFLASH */
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \ "root=/dev/mtdblock5 " \
"mtdparts=at91_nand:" \ "mtdparts=atmel_nand:" \
"128k(bootstrap)ro," \ "128k(bootstrap)ro," \
"256k(uboot)ro," \ "256k(uboot)ro," \
"128k(env1)ro," \ "128k(env1)ro," \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment