diff options
| author | Ye.Li <B37916@freescale.com> | 2014-10-22 13:32:35 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2014-10-24 20:42:43 +0800 |
| commit | 5047d3e58d95f84838cd52fd306e0ce87b15391b (patch) | |
| tree | b81c424a5b192840d68c1a6e61d5705eee098b9a | |
| parent | 708782f14565b41a265e3a45d93e9f690e15ff23 (diff) | |
| download | u-boot-imx-5047d3e58d95f84838cd52fd306e0ce87b15391b.zip u-boot-imx-5047d3e58d95f84838cd52fd306e0ce87b15391b.tar.gz u-boot-imx-5047d3e58d95f84838cd52fd306e0ce87b15391b.tar.bz2 | |
MLK-9734 imx: mx6sxsabreauto: Add NAND boot environment variables
For NAND boot, the kernel zImage and rootfs also need to load from
NAND. Add the environment variables for this.
Signed-off-by: Ye.Li <B37916@freescale.com>
| -rw-r--r-- | include/configs/mx6sxsabreauto.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 8caf676..291cc77 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -158,17 +158,39 @@ #define CONFIG_VIDEO_MODE "" #endif +#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} " \ "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=\"\" "\ + CONFIG_MFG_NAND_PARTITION \ "\0" \ "initrd_addr=0x83800000\0" \ "initrd_high=0xffffffff\0" \ "bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ +#if defined(CONFIG_SYS_BOOT_NAND) +#define CONFIG_EXTRA_ENV_SETTINGS \ + CONFIG_MFG_ENV_SETTINGS \ + CONFIG_VIDEO_MODE \ + "fdt_addr=0x83000000\0" \ + "fdt_high=0xffffffff\0" \ + "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"\ + "bootcmd=nand read ${loadaddr} 0x1000000 0x800000;"\ + "nand read ${fdt_addr} 0x2000000 0x100000;"\ + "bootz ${loadaddr} - ${fdt_addr}\0" + +#else #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ UPDATE_M4_ENV \ @@ -246,6 +268,7 @@ "fi; " \ "fi; " \ "else run netboot; fi" +#endif /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP |