From: Bao Xiaowei xiaowei.bao@nxp.com

modify the include/configs/ls1046aqds.h file, according to the latest partion rules, norflash nandflash dspiflash detailed partion as follows:

mtd0: 00100000 00020000 "nor_bank0_rcw" mtd1: 00200000 00020000 "nor_bank0_uboot" mtd2: 00100000 00020000 "nor_bank0_uboot_env" mtd3: 00200000 00020000 "nor_bank0_ppa" mtd4: 00300000 00020000 "nor_bank0_secure_boot" mtd5: 00600000 00020000 "nor_bank0_dppa_qe" mtd6: 00100000 00020000 "nor_bank0_dtb" mtd7: 01000000 00020000 "nor_bank0_kernel" mtd8: 02000000 00020000 "nor_bank0_rootfs" mtd9: 00100000 00020000 "nor_bank4_rcw" mtd10: 00200000 00020000 "nor_bank4_uboot" mtd11: 00200000 00020000 "nor_bank4_uboot_env" mtd12: 00100000 00020000 "nor_bank4_ppa" mtd13: 00300000 00020000 "nor_bank4_secure_boot" mtd14: 00600000 00020000 "nor_bank4_dppa_qe" mtd15: 00100000 00020000 "nor_bank4_dtb" mtd16: 01000000 00020000 "nor_bank4_kernel" mtd17: 02000000 00020000 "nor_bank4_rootfs" mtd18: 00100000 00040000 "nand_rcw" mtd19: 00200000 00040000 "nand_uboot" mtd20: 00100000 00040000 "nand_uboot_env" mtd21: 00200000 00040000 "nand_ppa" mtd22: 00300000 00040000 "nand_secure_boot" mtd23: 00600000 00040000 "nand_dppa_qe" mtd24: 00100000 00040000 "nand_dtb" mtd25: 01000000 00040000 "nand_kernel" mtd26: 02000000 00040000 "nand_rootfs" mtd27: 1c000000 00040000 "nand_free" mtd28: 01000000 00010000 "spi0_free" mtd29: 00080000 00001000 "spi1_free" mtd30: 00800000 00001000 "spi2_free"

Signed-off-by: Bao Xiaowei xiaowei.bao@nxp.com --- include/configs/ls1046aqds.h | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 5d2e819..57aed04 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -479,17 +479,23 @@ unsigned long get_board_ddr_clk(void); #define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:2m(uboot)," \ "14m(free)" #else -#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)" +#define MTDPARTS_DEFAULT "mtdparts=60000000.nor:1m(nor_bank0_rcw)," \ + "2m(nor_bank0_uboot),1m(nor_bank0_uboot_env)," \ + "2m(nor_bank0_ppa),3m(nor_bank0_secure_boot)," \ + "6m(nor_bank0_dppa_qe),1m(nor_bank0_dtb)," \ + "16m(nor_bank0_kernel),32m(nor_bank0_rootfs)," \ + "1m(nor_bank4_rcw),2m(nor_bank4_uboot)," \ + "2m(nor_bank4_uboot_env),1m(nor_bank4_ppa)," \ + "3m(nor_bank4_secure_boot),6m(nor_bank4_dppa_qe)," \ + "1m(nor_bank4_dtb),16m(nor_bank4_kernel)," \ + "32m(nor_bank4_rootfs);7e800000.flash:" \ + "1m(nand_rcw),2m(nand_uboot)," \ + "1m(nand_uboot_env),2m(nand_ppa)," \ + "3m(nand_secure_boot),6m(nand_dppa_qe)," \ + "1m(nand_dtb),16m(nand_kernel)," \ + "32m(nand_rootfs),448m(nand_free);" \ + "spi0.0:16m(spi0_free);" \ + "spi0.1:512k(spi1_free);spi0.2:8m(spi2_free)" #endif

#include <asm/fsl_secure_boot.h>