From aed6349cf82fb0baf673b254b17f586316003d41 Mon Sep 17 00:00:00 2001 From: Guillaume Deroire Date: Mon, 23 Jul 2018 15:16:14 +0200 Subject: [PATCH 1/2] configs: at91: Adjust mtdparts to match CONFIG_ENV_OFFSET It seems not all configs have been updated in the commit to match sama5 address (4744f870b23d7f84d13aa767835b3a457e34e181) --- include/configs/at91sam9260ek.h | 2 +- include/configs/at91sam9263ek.h | 2 +- include/configs/at91sam9m10g45ek.h | 2 +- include/configs/at91sam9n12ek.h | 2 +- include/configs/at91sam9rlek.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index f4ca852e4fe..995f7e7ccde 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -185,7 +185,7 @@ #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk " \ "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256k(env),256k(env_redundant),256k(spare)," \ + "256k(spare),256k(env_redundant),256k(env)," \ "512k(dtb),6M(kernel)ro,-(rootfs) " \ "root=/dev/mtdblock7 rw rootfstype=jffs2" diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index fb6a55c8462..5a2a87148e6 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -276,7 +276,7 @@ #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk " \ "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256k(env),256k(env_redundant),256k(spare)," \ + "256k(spare),256k(env_redundant),256k(env)," \ "512k(dtb),6M(kernel)ro,-(rootfs) " \ "root=/dev/mtdblock7 rw rootfstype=jffs2" #endif diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 7da731f1edb..0c13ab146ff 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -102,7 +102,7 @@ #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk " \ "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256k(env),256k(env_redundant),256k(spare)," \ + "256k(spare),256k(env_redundant),256k(env)," \ "512k(dtb),6M(kernel)ro,-(rootfs) " \ "root=/dev/mtdblock7 rw rootfstype=jffs2" #elif CONFIG_SYS_USE_MMC diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 760f41f3f99..4ab9eb6a951 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -98,7 +98,7 @@ #define MTDIDS_DEFAULT "nand0=atmel_nand" #define MTDPARTS_DEFAULT \ "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256k(env),256k(env_redundant),256k(spare)," \ + "256k(spare),256k(env_redundant),256k(env)," \ "512k(dtb),6M(kernel)ro,-(rootfs)" #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 6a3b3f67bf9..5a9523f0657 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -123,7 +123,7 @@ #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk " \ "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256K(env),256k(env_redundant),256k(spare)," \ + "256K(spare),256k(env_redundant),256k(env)," \ "512k(dtb),6M(kernel)ro,-(rootfs) " \ "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs" From abb22d2cfccbdde66ae43b493a7c15c1db89ba78 Mon Sep 17 00:00:00 2001 From: Guillaume Deroire Date: Mon, 23 Jul 2018 15:17:14 +0200 Subject: [PATCH 2/2] configs: at91: Adjust CONFIG_ENV_OFFSET to match sama5 address for at91sam9261ek It seems sam9261ek was skipped in the commit to match sama5 address (4744f870b23d7f84d13aa767835b3a457e34e181) --- include/configs/at91sam9261ek.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 263e92bd33a..728e3c1f944 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -170,14 +170,14 @@ /* bootstrap + u-boot + env + linux in nandflash */ #define CONFIG_ENV_IS_IN_NAND -#define CONFIG_ENV_OFFSET 0xc0000 +#define CONFIG_ENV_OFFSET 0x140000 #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm" #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk " \ "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256k(env),256k(env_redundant),256k(spare)," \ + "256k(spare),256k(env_redundant),256k(env)," \ "512k(dtb),6M(kernel)ro,-(rootfs) " \ "root=/dev/mtdblock7 rw rootfstype=jffs2" #endif