From 4012174f7d35baad9ce7f6503b90ba3c1b908a0c Mon Sep 17 00:00:00 2001 From: Justin Waters Date: Tue, 5 May 2009 09:45:32 -0400 Subject: Fix Atmel NAND driver name in default boot arguments. The default bootargs in the Atmel AT91 boards uses the old name of the Atmel NAND driver, at91_nand. Kernels 2.6.28 and newer use atmel_nand. This changes those values to match the newer kernels. Signed-off-by: Justin Waters --- include/configs/at91cap9adk.h | 4 ++-- include/configs/at91sam9260ek.h | 6 +++--- include/configs/at91sam9261ek.h | 6 +++--- include/configs/at91sam9263ek.h | 4 ++-- include/configs/at91sam9rlek.h | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index d8e6a29f6e..1981607006 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -165,7 +165,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 @@ -181,7 +181,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 diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 25bb184a9d..9d07f8650c 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -158,7 +158,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 @@ -172,7 +172,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 */ @@ -185,7 +185,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" diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index b119d96d53..aeb11a57e7 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -159,7 +159,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_CS3 @@ -173,7 +173,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 */ @@ -186,7 +186,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" diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 979d7a38c9..975aabffad 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -166,7 +166,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" #else /* CONFIG_SYS_USE_NANDFLASH */ @@ -179,7 +179,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,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" #endif diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 5d837a07af..5066159476 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -134,7 +134,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" #else /* CONFIG_SYS_USE_NANDFLASH */ @@ -147,7 +147,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,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" #endif -- cgit v1.2.3