diff options
| author | Ye Li <ye.li@nxp.com> | 2017-03-13 22:54:14 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-05 17:23:07 +0800 |
| commit | 32147576237ff9e49c4314084a1e8b7a6fa5e27a (patch) | |
| tree | 361e1052d389b556d3fd425ed8aec20c117be863 /include | |
| parent | 3b0609ca267baaf6a78bebaccc6896e6508d1844 (diff) | |
| download | u-boot-imx-32147576237ff9e49c4314084a1e8b7a6fa5e27a.zip u-boot-imx-32147576237ff9e49c4314084a1e8b7a6fa5e27a.tar.gz u-boot-imx-32147576237ff9e49c4314084a1e8b7a6fa5e27a.tar.bz2 | |
MLK-14418-13 imx: mx7dsabresd: Update Misc codes
1. Add BMODE support
2. Update environment variables to align with v2016.03
3. Remove the wdog WCR bit 4 clear. Since we have implemented reset_cpu for mx7d.
Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx7dsabresd.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 7f68def..75d2043 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -68,6 +68,7 @@ #ifdef CONFIG_IMX_BOOTAUX +#ifdef CONFIG_FSL_QSPI #define UPDATE_M4_ENV \ "m4image=m4_qspi.bin\0" \ "loadm4image=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${m4image}\0" \ @@ -77,12 +78,18 @@ "setexpr fw_sz ${filesize} + 0xffff; " \ "setexpr fw_sz ${fw_sz} / 0x10000; " \ "setexpr fw_sz ${fw_sz} * 0x10000; " \ - "sf erase 0x0 ${fw_sz}; " \ - "sf write ${loadaddr} 0x0 ${filesize}; " \ + "sf erase 0x100000 ${fw_sz}; " \ + "sf write ${loadaddr} 0x100000 ${filesize}; " \ "fi; " \ "fi\0" \ "m4boot=sf probe 1:0; bootaux "__stringify(CONFIG_SYS_AUXCORE_BOOTDATA)"\0" #else +#define UPDATE_M4_ENV \ + "m4image=m4_qspi.bin\0" \ + "loadm4image=fatload mmc ${mmcdev}:${mmcpart} "__stringify(CONFIG_SYS_AUXCORE_BOOTDATA)" ${m4image}\0" \ + "m4boot=run loadm4image; bootaux "__stringify(CONFIG_SYS_AUXCORE_BOOTDATA)"\0" +#endif +#else #define UPDATE_M4_ENV "" #endif @@ -113,7 +120,6 @@ #if defined(CONFIG_NAND_BOOT) #define CONFIG_EXTRA_ENV_SETTINGS \ - UPDATE_M4_ENV \ CONFIG_MFG_ENV_SETTINGS \ "panel=TFT43AB\0" \ "fdt_addr=0x83000000\0" \ @@ -291,6 +297,8 @@ #define CONFIG_IMX_THERMAL +#define CONFIG_CMD_BMODE + #define CONFIG_USBD_HS #define CONFIG_USB_FUNCTION_MASS_STORAGE |