Hi Wolfgang and Jean-Christophe, Is this patch being left aside on purpose, or did it get under the radar ? I think it would be nice to have that fixed for the next release.
Regards, Albin On Wed, Jul 22, 2009 at 06:30:03PM +0200, Albin Tonnerre wrote : > 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: Albin Tonnerre <albin.tonne...@free-electrons.com> > --- > include/configs/at91cap9adk.h | 4 ++-- > include/configs/at91sam9260ek.h | 6 +++--- > include/configs/at91sam9261ek.h | 6 +++--- > include/configs/at91sam9263ek.h | 4 ++-- > include/configs/at91sam9m10g45ek.h | 4 ++-- > include/configs/at91sam9rlek.h | 4 ++-- > include/configs/pm9261.h | 4 ++-- > include/configs/pm9263.h | 4 ++-- > 8 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h > index 0ef3554..cc194d8 100644 > --- a/include/configs/at91cap9adk.h > +++ b/include/configs/at91cap9adk.h > @@ -172,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 > @@ -188,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 > diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h > index 6cee593..3507de2 100644 > --- 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" > diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h > index 3d108ab..f86698f 100644 > --- a/include/configs/at91sam9261ek.h > +++ b/include/configs/at91sam9261ek.h > @@ -181,7 +181,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 > @@ -195,7 +195,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 */ > @@ -208,7 +208,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 32f3f62..a1582fc 100644 > --- a/include/configs/at91sam9263ek.h > +++ b/include/configs/at91sam9263ek.h > @@ -304,7 +304,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_NANDFLASH > @@ -317,7 +317,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/at91sam9m10g45ek.h > b/include/configs/at91sam9m10g45ek.h > index 4b46c31..b460188 100644 > --- a/include/configs/at91sam9m10g45ek.h > +++ b/include/configs/at91sam9m10g45ek.h > @@ -179,7 +179,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 */ > @@ -192,7 +192,7 @@ > #define CONFIG_BOOTCOMMAND "nand read 0x72000000 0x200000 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/at91sam9rlek.h b/include/configs/at91sam9rlek.h > index 9167304..b83266d 100644 > --- a/include/configs/at91sam9rlek.h > +++ b/include/configs/at91sam9rlek.h > @@ -142,7 +142,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 */ > @@ -155,7 +155,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/pm9261.h b/include/configs/pm9261.h > index 203a14c..9bf49ba 100644 > --- a/include/configs/pm9261.h > +++ b/include/configs/pm9261.h > @@ -289,7 +289,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) /* CONFIG_SYS_USE_NANDFLASH */ > @@ -302,7 +302,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/pm9263.h b/include/configs/pm9263.h > index a6ff28c..6761c18 100644 > --- a/include/configs/pm9263.h > +++ b/include/configs/pm9263.h > @@ -310,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 */ > @@ -323,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," \ -- Albin Tonnerre, Free Electrons Kernel, drivers and embedded Linux development, consulting, training and support. http://free-electrons.com
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
