summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguoyin.chen <guoyin.chen@freescale.com>2014-12-02 17:56:50 +0800
committerguoyin.chen <guoyin.chen@freescale.com>2014-12-04 14:13:19 +0800
commit3d0a63d591a698ef2aa813859695452657987c37 (patch)
treee4726463c53a4e240f3f7c0a94d06d45c532891a
parentdb79603eeb96ca2e55336fc25b0529c249247454 (diff)
downloadu-boot-imx-3d0a63d591a698ef2aa813859695452657987c37.zip
u-boot-imx-3d0a63d591a698ef2aa813859695452657987c37.tar.gz
u-boot-imx-3d0a63d591a698ef2aa813859695452657987c37.tar.bz2
MA-5830 Align Fastboot NAND config with bootloader partition 64M
Align the "MLK-9918: Reserve more space in uboot partition for NAND boot configurations" to enlarge the bootloader partition to be 64M Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
-rw-r--r--board/freescale/mx6qsabreauto/mx6qsabreauto.c3
-rw-r--r--board/freescale/mx6sxsabreauto/mx6sxsabreauto.c3
-rw-r--r--include/configs/mx6sabreandroid_common.h4
-rw-r--r--include/configs/mx6sxsabreautoandroid.h4
4 files changed, 10 insertions, 4 deletions
diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
index 9663013..f34c796 100644
--- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c
+++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
@@ -1007,8 +1007,7 @@ void board_fastboot_setup(void)
if (!getenv("fastboot_dev"))
setenv("fastboot_dev", "nand");
if (!getenv("fbparts"))
- setenv("fbparts",
- "16m@16m(boot) 16m@32m(recovery) 810m@48m(android_root)ubifs");
+ setenv("fbparts", ANDROID_FASTBOOT_NAND_PARTS);
if (!getenv("bootcmd"))
setenv("bootcmd",
"nand read ${loadaddr} ${boot_nand_offset} "
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index 0f0afb9..c18a83d 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -964,8 +964,7 @@ void board_fastboot_setup(void)
if (!getenv("fastboot_dev"))
setenv("fastboot_dev", "nand");
if (!getenv("fbparts"))
- setenv("fbparts",
- "16m@16m(boot) 16m@32m(recovery) 810m@48m(android_root)ubifs");
+ setenv("fbparts", ANDROID_FASTBOOT_NAND_PARTS);
if (!getenv("bootcmd"))
setenv("bootcmd",
"nand read ${loadaddr} ${boot_nand_offset} "
diff --git a/include/configs/mx6sabreandroid_common.h b/include/configs/mx6sabreandroid_common.h
index 6602c7d..c9d9576 100644
--- a/include/configs/mx6sabreandroid_common.h
+++ b/include/configs/mx6sabreandroid_common.h
@@ -54,4 +54,8 @@
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
+#if defined(CONFIG_FASTBOOT_STORAGE_NAND)
+#define ANDROID_FASTBOOT_NAND_PARTS "16m@64m(boot) 16m@80m(recovery) 810m@96m(android_root)ubifs"
+#endif
+
#endif /* MX6_SABRE_ANDROID_COMMON_H */
diff --git a/include/configs/mx6sxsabreautoandroid.h b/include/configs/mx6sxsabreautoandroid.h
index ec1cc76..905debf 100644
--- a/include/configs/mx6sxsabreautoandroid.h
+++ b/include/configs/mx6sxsabreautoandroid.h
@@ -53,4 +53,8 @@
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
+#if defined(CONFIG_FASTBOOT_STORAGE_NAND)
+#define ANDROID_FASTBOOT_NAND_PARTS "16m@64m(boot) 16m@80m(recovery) 810m@96m(android_root)ubifs"
+#endif
+
#endif