From 3ddc0dd0011ea1448191ecb2461ed9a0ff7bf387 Mon Sep 17 00:00:00 2001 From: "guoyin.chen" Date: Tue, 2 Dec 2014 17:56:50 +0800 Subject: [PATCH] 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 --- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 3 +-- board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 3 +-- include/configs/mx6sabreandroid_common.h | 4 ++++ include/configs/mx6sxsabreautoandroid.h | 4 ++++ 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 -- 1.9.1