summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAllen Xu <b45815@freescale.com>2014-11-22 08:39:03 -0600
committerAllen Xu <b45815@freescale.com>2014-11-22 15:50:32 -0600
commit306ab0de05cdbeba05ca689496f614109d27deb6 (patch)
tree05028b016a10a31053de9246e0d64e2cddd6cd99 /include
parent0168d205fae0c0cd76b8964a0bbfa2e2b67c699d (diff)
downloadu-boot-imx-306ab0de05cdbeba05ca689496f614109d27deb6.zip
u-boot-imx-306ab0de05cdbeba05ca689496f614109d27deb6.tar.gz
u-boot-imx-306ab0de05cdbeba05ca689496f614109d27deb6.tar.bz2
MLK-9918: Reserve more space in uboot partition for NAND boot configurations
Expand the uboot space to 64m to reserve enough space for FCB, DBBT and u-boot. Signed-off-by: Allen Xu <b45815@freescale.com> (cherry picked from commit 54b3f6ba9097f4ed4cc8953a806c872444875a29)
Diffstat (limited to 'include')
-rw-r--r--include/configs/mx6qsabreauto.h2
-rw-r--r--include/configs/mx6sabre_common.h4
-rw-r--r--include/configs/mx6sx_arm2.h4
-rw-r--r--include/configs/mx6sxsabreauto.h4
4 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index 5614964..456dbe1 100644
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -21,7 +21,7 @@
#undef CONFIG_MFG_NAND_PARTITION
#ifdef CONFIG_SYS_BOOT_NAND
-#define CONFIG_MFG_NAND_PARTITION "mtdparts=8000000.nor:1m(boot),-(rootfs)\\\\;gpmi-nand:16m(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),-(rootfs) "
#else
#define CONFIG_MFG_NAND_PARTITION ""
#endif
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index ba49884..87cd38a 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.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:16m(boot),16m(kernel),16m(dtb),-(rootfs) "
+#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) "
#else
#define CONFIG_MFG_NAND_PARTITION ""
#endif
@@ -132,7 +132,7 @@
"fdt_high=0xffffffff\0" \
"bootargs=console=" CONFIG_CONSOLE_DEV ",115200 ubi.mtd=4 " \
"root=ubi0:rootfs rootfstype=ubifs " \
- "mtdparts=gpmi-nand:16m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\
+ "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\
"bootcmd=nand read ${loadaddr} 0x1000000 0x800000;"\
"nand read ${fdt_addr} 0x2000000 0x100000;"\
"bootz ${loadaddr} - ${fdt_addr}\0"
diff --git a/include/configs/mx6sx_arm2.h b/include/configs/mx6sx_arm2.h
index 014f65b..05c4bd1 100644
--- a/include/configs/mx6sx_arm2.h
+++ b/include/configs/mx6sx_arm2.h
@@ -143,7 +143,7 @@
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
#ifdef CONFIG_SYS_BOOT_NAND
-#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:16m(boot),16m(kernel),16m(dtb),-(rootfs) "
+#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) "
#else
#define CONFIG_MFG_NAND_PARTITION ""
#endif
@@ -176,7 +176,7 @@
"console=ttymxc0\0" \
"bootargs=console=ttymxc0,115200 ubi.mtd=3 " \
"root=ubi0:rootfs rootfstype=ubifs " \
- "mtdparts=gpmi-nand:16m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\
+ "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\
"bootcmd=nand read ${loadaddr} 0x1000000 0x800000;"\
"nand read ${fdt_addr} 0x2000000 0x100000;"\
"bootz ${loadaddr} - ${fdt_addr}\0"
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index f8d4b69..326242b 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -160,7 +160,7 @@
#endif
#ifdef CONFIG_SYS_BOOT_NAND
-#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:16m(boot),16m(kernel),16m(dtb),-(rootfs) "
+#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) "
#else
#define CONFIG_MFG_NAND_PARTITION ""
#endif
@@ -186,7 +186,7 @@
"console=ttymxc0\0" \
"bootargs=console=ttymxc0,115200 ubi.mtd=5 " \
"root=ubi0:rootfs rootfstype=ubifs " \
- "mtdparts=gpmi-nand:16m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\
+ "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\
"bootcmd=nand read ${loadaddr} 0x1000000 0x800000;"\
"nand read ${fdt_addr} 0x2000000 0x100000;"\
"bootz ${loadaddr} - ${fdt_addr}\0"