diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 27c5b93fe13f102058c818891083bf94876427f6..ff9cb64049702c7d391423f591c221d513276030 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -43,7 +43,7 @@ #undef CONFIG_MFG_NAND_PARTITION #ifdef CONFIG_SYS_BOOT_NAND -#define CONFIG_MFG_NAND_PARTITION "mtdparts=8000000.nor:1m(boot),-(rootfs)\\\\;gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) " +#define CONFIG_MFG_NAND_PARTITION "mtdparts=8000000.nor:1m(boot),-(rootfs)\\\\;gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " #else #define CONFIG_MFG_NAND_PARTITION "" #endif diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 839ca9670424057952ce69e4ddbd2004b3fe17c6..7f468af8f2793adfd126703102d0fa11a5702df3 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -53,7 +53,7 @@ #define CONFIG_CMD_BMODE #ifdef CONFIG_SYS_BOOT_NAND -#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) " +#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " #else #define CONFIG_MFG_NAND_PARTITION "" #endif @@ -108,9 +108,9 @@ CONFIG_MFG_ENV_SETTINGS \ "fdt_addr=0x18000000\0" \ "fdt_high=0xffffffff\0" \ - "bootargs=console=" CONFIG_CONSOLE_DEV ",115200 ubi.mtd=4 " \ + "bootargs=console=" CONFIG_CONSOLE_DEV ",115200 ubi.mtd=5 " \ "root=ubi0:rootfs rootfstype=ubifs " \ - "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\ + "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs)\0"\ "bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\ "nand read ${fdt_addr} 0x5000000 0x100000;"\ "bootz ${loadaddr} - ${fdt_addr}\0" diff --git a/include/configs/mx6sx_arm2.h b/include/configs/mx6sx_arm2.h index 30034f0b27930a0ba32aca0cecf59f02f42ee656..1e08b07c59162ae8d7c0efba4a62daaeb091a24f 100644 --- a/include/configs/mx6sx_arm2.h +++ b/include/configs/mx6sx_arm2.h @@ -99,7 +99,7 @@ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #ifdef CONFIG_SYS_BOOT_NAND -#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) " +#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " #else #define CONFIG_MFG_NAND_PARTITION "" #endif @@ -131,9 +131,9 @@ "fdt_addr=0x83000000\0" \ "fdt_high=0xffffffff\0" \ "console=ttymxc0\0" \ - "bootargs=console=ttymxc0,115200 ubi.mtd=3 " \ + "bootargs=console=ttymxc0,115200 ubi.mtd=4 " \ "root=ubi0:rootfs rootfstype=ubifs " \ - "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\ + "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs)\0"\ "bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\ "nand read ${fdt_addr} 0x5000000 0x100000;"\ "bootz ${loadaddr} - ${fdt_addr}\0" diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index b0053cb9104250ccd223aab47709ae070dccc608..39ec2623ea39e1c5a096f6891377eb83c1a560d1 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -36,7 +36,7 @@ #define CONFIG_MXC_UART_BASE UART1_BASE #ifdef CONFIG_SYS_BOOT_NAND -#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) " +#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " #else #define CONFIG_MFG_NAND_PARTITION "" #endif @@ -83,9 +83,9 @@ "fdt_addr=0x83000000\0" \ "fdt_high=0xffffffff\0" \ "console=ttymxc0\0" \ - "bootargs=console=ttymxc0,115200 ubi.mtd=5 " \ + "bootargs=console=ttymxc0,115200 ubi.mtd=6 " \ "root=ubi0:rootfs rootfstype=ubifs " \ - "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\ + "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs)\0"\ "bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\ "nand read ${fdt_addr} 0x5000000 0x100000;"\ "bootz ${loadaddr} - ${fdt_addr}\0" diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 85b8b70cb0f8bdc301e3a88ba26fbac679b69cac..c2dad4fc3e7ce0b4ac4e01115c657b23cd967c76 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -93,7 +93,7 @@ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #ifdef CONFIG_SYS_BOOT_NAND -#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) " +#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " #else #define CONFIG_MFG_NAND_PARTITION "" #endif @@ -120,10 +120,10 @@ "fdt_addr=0x83000000\0" \ "fdt_high=0xffffffff\0" \ "console=ttymxc0\0" \ - "bootargs=console=ttymxc0,115200 ubi.mtd=3 " \ + "bootargs=console=ttymxc0,115200 ubi.mtd=4 " \ "root=ubi0:rootfs rootfstype=ubifs " \ CONFIG_BOOTARGS_CMA_SIZE \ - "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\ + "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs)\0"\ "bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\ "nand read ${fdt_addr} 0x5000000 0x100000;"\ "bootz ${loadaddr} - ${fdt_addr}\0" diff --git a/include/configs/mx6ul_arm2.h b/include/configs/mx6ul_arm2.h index 528b7f755de7fdeb133bdf3baace866f802a0249..ed63849cf3a26722913f169ad5495b0cc563ec4b 100644 --- a/include/configs/mx6ul_arm2.h +++ b/include/configs/mx6ul_arm2.h @@ -49,7 +49,7 @@ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #ifdef CONFIG_SYS_BOOT_NAND -#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) " +#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " #else #define CONFIG_MFG_NAND_PARTITION "" #endif @@ -83,10 +83,10 @@ "fdt_addr=0x83000000\0" \ "fdt_high=0xffffffff\0" \ "console=ttymxc0\0" \ - "bootargs=console=ttymxc0,115200 ubi.mtd=3 " \ + "bootargs=console=ttymxc0,115200 ubi.mtd=4 " \ "root=ubi0:rootfs rootfstype=ubifs " \ CONFIG_BOOTARGS_CMA_SIZE \ - "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\ + "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs)\0"\ "bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\ "nand read ${fdt_addr} 0x5000000 0x100000;"\ "bootz ${loadaddr} - ${fdt_addr}\0" diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index bf849f38fd2479b3bd12ce5c0bc3cb275f87c182..ad8afade3acec7509c889948081913d51f2c1cb1 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -90,7 +90,7 @@ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #ifdef CONFIG_SYS_BOOT_NAND -#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) " +#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " #else #define CONFIG_MFG_NAND_PARTITION "" #endif @@ -117,10 +117,10 @@ "fdt_addr=0x83000000\0" \ "fdt_high=0xffffffff\0" \ "console=ttymxc0\0" \ - "bootargs=console=ttymxc0,115200 ubi.mtd=3 " \ + "bootargs=console=ttymxc0,115200 ubi.mtd=4 " \ "root=ubi0:rootfs rootfstype=ubifs " \ CONFIG_BOOTARGS_CMA_SIZE \ - "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\ + "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs)\0"\ "bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\ "nand read ${fdt_addr} 0x5000000 0x100000;"\ "bootz ${loadaddr} - ${fdt_addr}\0" diff --git a/include/configs/mx7d_arm2.h b/include/configs/mx7d_arm2.h index 3e1eb8f806eb1400e20d5ecccb6390da5954c81a..29f94fe1c3a61a571415249b8b73b1b5a2995f81 100644 --- a/include/configs/mx7d_arm2.h +++ b/include/configs/mx7d_arm2.h @@ -71,7 +71,7 @@ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #ifdef CONFIG_SYS_BOOT_NAND -#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) " +#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " #else #define CONFIG_MFG_NAND_PARTITION "" #endif @@ -111,9 +111,9 @@ "fdt_addr=0x83000000\0" \ "fdt_high=0xffffffff\0" \ "console=ttymxc0\0" \ - "bootargs=console=ttymxc0,115200 ubi.mtd=4 " \ + "bootargs=console=ttymxc0,115200 ubi.mtd=5 " \ "root=ubi0:rootfs rootfstype=ubifs " \ - "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\ + "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs)\0"\ "bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\ "nand read ${fdt_addr} 0x5000000 0x100000;"\ "bootz ${loadaddr} - ${fdt_addr}\0" diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 03a3dc8200e21b55cf92a2c87279695babcc65a3..278b92b8fac7009baa0d7c1af2273b250d6efcc5 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -115,7 +115,7 @@ #endif #ifdef CONFIG_SYS_BOOT_NAND -#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) " +#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " #else #define CONFIG_MFG_NAND_PARTITION "" #endif @@ -146,9 +146,9 @@ "fdt_addr=0x83000000\0" \ "fdt_high=0xffffffff\0" \ "console=ttymxc0\0" \ - "bootargs=console=ttymxc0,115200 ubi.mtd=3 " \ + "bootargs=console=ttymxc0,115200 ubi.mtd=4 " \ "root=ubi0:rootfs rootfstype=ubifs " \ - "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\ + "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs)\0"\ "bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\ "nand read ${fdt_addr} 0x5000000 0x100000;"\ "bootz ${loadaddr} - ${fdt_addr}\0"