From fca3686b5760dc069e165b7b6b94a1c9a42f4fe8 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Thu, 31 Oct 2013 04:59:11 +0800 Subject: ENGR00285646 add NAND partition info for mfgtool must add initrd_high, otherwise initrd will be relocated to random address. Signed-off-by: Frank Li --- include/configs/mx6qsabre_common.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h index 5f4fe20..3790f30 100644 --- a/include/configs/mx6qsabre_common.h +++ b/include/configs/mx6qsabre_common.h @@ -101,14 +101,23 @@ #define CONFIG_SYS_TEXT_BASE 0x17800000 #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) " +#else +#define CONFIG_MFG_NAND_PARTITION "" +#endif + #define CONFIG_MFG_ENV_SETTINGS \ - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ + "mfgtool_args=setenv bootargs console=" CONFIG_CONSOLE_DEV ",115200 " \ "rdinit=/linuxrc " \ "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\ "g_mass_storage.iSerialNumber=\"\" "\ - "enable_wait_mode=off \0"\ + "enable_wait_mode=off "\ + CONFIG_MFG_NAND_PARTITION \ + "\0" \ "initrd_addr=0x12C00000\0" \ + "initrd_high=0xffffffff\0" \ "bootcmd_mfg=run mfgtool_args;bootm ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ -- cgit v1.1