diff options
| author | Peng Fan <Peng.Fan@freescale.com> | 2015-03-14 17:21:24 +0800 |
|---|---|---|
| committer | Peng Fan <Peng.Fan@freescale.com> | 2015-04-29 14:52:33 +0800 |
| commit | 532d5e69a1642bd8d1c1f928d3a35b414bbce81b (patch) | |
| tree | 2eed368a791e133d0a7d94b9e01b7f2e850e0e52 /include/configs/mx6sabre_common.h | |
| parent | 77ca54d246cf90af88afe4eb93e63823b1de1e4a (diff) | |
| download | u-boot-imx-532d5e69a1642bd8d1c1f928d3a35b414bbce81b.zip u-boot-imx-532d5e69a1642bd8d1c1f928d3a35b414bbce81b.tar.gz u-boot-imx-532d5e69a1642bd8d1c1f928d3a35b414bbce81b.tar.bz2 | |
MLK-10774-7 Auto check if boot from usb
If boot from usb, reset environment to default value.
Auto apply mfgtools setting and boot mfgtools kernel.
Signed-off-by: Frank Li <Frank.li@freescale.com>
Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Diffstat (limited to 'include/configs/mx6sabre_common.h')
| -rw-r--r-- | include/configs/mx6sabre_common.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 1b4ec5b..e4165c2 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -100,6 +100,24 @@ #define CONFIG_LOADADDR 0x12000000 #define CONFIG_SYS_TEXT_BASE 0x17800000 +#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=" 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 "\ + 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" \ #ifdef CONFIG_SUPPORT_EMMC_BOOT #define EMMC_ENV \ @@ -122,6 +140,7 @@ #endif #define CONFIG_EXTRA_ENV_SETTINGS \ + CONFIG_MFG_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ |