diff options
| author | Ye Li <ye.li@nxp.com> | 2017-03-02 10:31:03 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-05 14:04:41 +0800 |
| commit | e1c8247f3460cc5742d4470731581f79d3a64198 (patch) | |
| tree | 67d37d8de64040b67a56c2d16b9881e1d63b2c3e /include/configs/mx6sxsabreauto.h | |
| parent | ddbfaf18c42e20f3babb78e64bdd1575ce911002 (diff) | |
| download | u-boot-imx-e1c8247f3460cc5742d4470731581f79d3a64198.zip u-boot-imx-e1c8247f3460cc5742d4470731581f79d3a64198.tar.gz u-boot-imx-e1c8247f3460cc5742d4470731581f79d3a64198.tar.bz2 | |
MLK-12436-17: imx: mx6sxsabreauto: update board and header
Align with imx_v2016.03
1. Update pmic settings to enable SD3 power and use PMIC common init codes.
2. Enable bmode.
3. Update MMC root parameters
4. Update AUXBOOT for M4
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 0816a496fbe3f7d0e4f1a9322c76908a5c557c8c)
Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'include/configs/mx6sxsabreauto.h')
| -rw-r--r-- | include/configs/mx6sxsabreauto.h | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 7f8fb86..d24e2c1 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -25,6 +25,28 @@ #define MFG_NAND_PARTITION "" #endif +#ifdef CONFIG_IMX_BOOTAUX +#define CONFIG_SYS_AUXCORE_BOOTDATA 0x62000000 /* Set to QSPI1 B flash at default */ + +#define UPDATE_M4_ENV \ + "m4image=m4_qspi.bin\0" \ + "loadm4image=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${m4image}\0" \ + "update_m4_from_sd=" \ + "if sf probe 1:0; then " \ + "if run loadm4image; then " \ + "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}; " \ + "fi; " \ + "fi\0" \ + "m4boot=sf probe 1:0; bootaux "__stringify(CONFIG_SYS_AUXCORE_BOOTDATA)"\0" +#else +#define UPDATE_M4_ENV "" +#endif + + #define CONFIG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ @@ -40,6 +62,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ + UPDATE_M4_ENV \ CONFIG_MFG_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ @@ -51,9 +74,9 @@ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ "panel=Hannstar-XGA\0" \ - "mmcdev=0\0" \ + "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=1\0" \ - "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ + "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ @@ -137,6 +160,9 @@ /* MMC Configuration */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR +#define CONFIG_SYS_MMC_ENV_DEV 0 /*USDHC3*/ +#define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ +#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */ /* I2C Configs */ #define CONFIG_SYS_I2C_MXC @@ -217,6 +243,8 @@ #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x30, 8}, {0x32, 8}, {0x34, 8} } +#define CONFIG_CMD_BMODE + #define CONFIG_VIDEO #define CONFIG_VIDEO_GIS #ifdef CONFIG_VIDEO |