| Message ID | 1490349948-28394-1-git-send-email-wenbin.song@nxp.com |
|---|---|
| State | Accepted |
| Commit | 7f33963289e73f5d29a5574a2ca908f99a93be23 |
| Delegated to: | York Sun |
| Headers | show |
On 03/24/2017 03:20 AM, Wenbin song wrote: > Fix the offsets of MTD partitions on Nor flash on ls1043ardb, ls1043aqds > and ls1046aqds boards. > Delete the rcw, uboot env and fman partitions. > Add user partitions for general usage. > > Signed-off-by: Wenbin Song <wenbin.song@nxp.com> > --- > Changes for v1: > Delete the rcw, uboot env and fman partitions. > Add user partitions for general usage. > --- > include/configs/ls1043a_common.h | 14 ++++++++------ > include/configs/ls1046aqds.h | 14 ++++++++------ > 2 files changed, 16 insertions(+), 12 deletions(-) > > diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h > index 9a01e48..d5d1388 100644 > --- a/include/configs/ls1043a_common.h > +++ b/include/configs/ls1043a_common.h > @@ -188,12 +188,14 @@ > #define MTDPARTS_DEFAULT "mtdparts=spi0.0:1m(uboot)," \ > "5m(kernel),1m(dtb),9m(file_system)" > #else > -#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:1m(nor_bank0_rcw)," \ > - "1m(nor_bank0_uboot),1m(nor_bank0_uboot_env)," \ > - "1m(nor_bank0_fman_uconde),40m(nor_bank0_fit)," \ > - "1m(nor_bank4_rcw),1m(nor_bank4_uboot)," \ > - "1m(nor_bank4_uboot_env),1m(nor_bank4_fman_ucode)," \ > - "40m(nor_bank4_fit);7e800000.flash:" \ > +#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:" \ > + "2m@0x100000(nor_bank0_uboot),"\ > + "40m@0x1100000(nor_bank0_fit)," \ > + "7m(nor_bank0_user)," \ > + "2m@0x4100000(nor_bank4_uboot)," \ > + "40m@0x5100000(nor_bank4_fit),"\ > + "-(nor_bank4_user);" \ > + "7e800000.flash:" \ > "1m(nand_uboot),1m(nand_uboot_env)," \ > "20m(nand_fit);spi0.0:1m(uboot)," \ > "5m(kernel),1m(dtb),9m(file_system)" > diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h > index 4b3b21e..476387d 100644 > --- a/include/configs/ls1046aqds.h > +++ b/include/configs/ls1046aqds.h > @@ -485,12 +485,14 @@ unsigned long get_board_ddr_clk(void); > #define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:2m(uboot)," \ > "14m(free)" > #else > -#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:1m(nor_bank0_rcw)," \ > - "1m(nor_bank0_uboot),1m(nor_bank0_uboot_env)," \ > - "1m(nor_bank0_fman_uconde),40m(nor_bank0_fit)," \ > - "1m(nor_bank4_rcw),1m(nor_bank4_uboot)," \ > - "1m(nor_bank4_uboot_env),1m(nor_bank4_fman_ucode)," \ > - "40m(nor_bank4_fit);7e800000.flash:" \ > +#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:" \ > + "2m@0x100000(nor_bank0_uboot),"\ > + "40m@0x1100000(nor_bank0_fit)," \ > + "7m(nor_bank0_user)," \ > + "2m@0x4100000(nor_bank4_uboot)," \ > + "40m@0x5100000(nor_bank4_fit),"\ > + "-(nor_bank4_user);" \ > + "7e800000.flash:" \ > "4m(nand_uboot),36m(nand_kernel)," \ > "472m(nand_free);spi0.0:2m(uboot)," \ > "14m(free)" > Thanks. This looks better. York
On 03/24/2017 03:20 AM, Wenbin song wrote: > Fix the offsets of MTD partitions on Nor flash on ls1043ardb, ls1043aqds > and ls1046aqds boards. > Delete the rcw, uboot env and fman partitions. > Add user partitions for general usage. > > Signed-off-by: Wenbin Song <wenbin.song@nxp.com> > --- > Changes for v1: > Delete the rcw, uboot env and fman partitions. > Add user partitions for general usage. Minor adjustment to subject and commit message. Applied to fsl-qoriq master, awaiting upstream. Thanks. York
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 9a01e48..d5d1388 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -188,12 +188,14 @@ #define MTDPARTS_DEFAULT "mtdparts=spi0.0:1m(uboot)," \ "5m(kernel),1m(dtb),9m(file_system)" #else -#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:1m(nor_bank0_rcw)," \ - "1m(nor_bank0_uboot),1m(nor_bank0_uboot_env)," \ - "1m(nor_bank0_fman_uconde),40m(nor_bank0_fit)," \ - "1m(nor_bank4_rcw),1m(nor_bank4_uboot)," \ - "1m(nor_bank4_uboot_env),1m(nor_bank4_fman_ucode)," \ - "40m(nor_bank4_fit);7e800000.flash:" \ +#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:" \ + "2m@0x100000(nor_bank0_uboot),"\ + "40m@0x1100000(nor_bank0_fit)," \ + "7m(nor_bank0_user)," \ + "2m@0x4100000(nor_bank4_uboot)," \ + "40m@0x5100000(nor_bank4_fit),"\ + "-(nor_bank4_user);" \ + "7e800000.flash:" \ "1m(nand_uboot),1m(nand_uboot_env)," \ "20m(nand_fit);spi0.0:1m(uboot)," \ "5m(kernel),1m(dtb),9m(file_system)" diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 4b3b21e..476387d 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -485,12 +485,14 @@ unsigned long get_board_ddr_clk(void); #define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:2m(uboot)," \ "14m(free)" #else -#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:1m(nor_bank0_rcw)," \ - "1m(nor_bank0_uboot),1m(nor_bank0_uboot_env)," \ - "1m(nor_bank0_fman_uconde),40m(nor_bank0_fit)," \ - "1m(nor_bank4_rcw),1m(nor_bank4_uboot)," \ - "1m(nor_bank4_uboot_env),1m(nor_bank4_fman_ucode)," \ - "40m(nor_bank4_fit);7e800000.flash:" \ +#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:" \ + "2m@0x100000(nor_bank0_uboot),"\ + "40m@0x1100000(nor_bank0_fit)," \ + "7m(nor_bank0_user)," \ + "2m@0x4100000(nor_bank4_uboot)," \ + "40m@0x5100000(nor_bank4_fit),"\ + "-(nor_bank4_user);" \ + "7e800000.flash:" \ "4m(nand_uboot),36m(nand_kernel)," \ "472m(nand_free);spi0.0:2m(uboot)," \ "14m(free)"
Fix the offsets of MTD partitions on Nor flash on ls1043ardb, ls1043aqds and ls1046aqds boards. Delete the rcw, uboot env and fman partitions. Add user partitions for general usage. Signed-off-by: Wenbin Song <wenbin.song@nxp.com> --- Changes for v1: Delete the rcw, uboot env and fman partitions. Add user partitions for general usage. --- include/configs/ls1043a_common.h | 14 ++++++++------ include/configs/ls1046aqds.h | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-)