diff options
| author | Ye Li <ye.li@nxp.com> | 2019-02-19 00:14:18 -0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2019-02-19 00:43:52 -0800 |
| commit | f21f2571befdad09b9c9df4fe1fc8e27cf315019 (patch) | |
| tree | 3f36c5ebded2c80fa94868096e15ec33554b096c | |
| parent | cf8468482ec3cceb05700a326df044dc41f38793 (diff) | |
MLK-20945-7 imx8qm/qxp: Update MEK SPL configurations
Update MEK SPL configs to enable SPL NOR support and change ENV to
SD as default.
Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
| -rw-r--r-- | configs/imx8qm_mek_spl_fspi_defconfig | 5 | ||||
| -rw-r--r-- | configs/imx8qxp_mek_spl_fspi_defconfig | 4 | ||||
| -rw-r--r-- | include/configs/imx8qm_mek.h | 7 | ||||
| -rw-r--r-- | include/configs/imx8qxp_mek.h | 6 |
4 files changed, 18 insertions, 4 deletions
diff --git a/configs/imx8qm_mek_spl_fspi_defconfig b/configs/imx8qm_mek_spl_fspi_defconfig index 1a490b0dbc..9c0770b610 100644 --- a/configs/imx8qm_mek_spl_fspi_defconfig +++ b/configs/imx8qm_mek_spl_fspi_defconfig @@ -27,6 +27,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OF_CONTROL=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y +CONFIG_SPL_NOR_SUPPORT=y CONFIG_PANIC_HANG=y CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y @@ -73,7 +74,7 @@ CONFIG_MMC_HS400_SUPPORT=y CONFIG_EFI_PARTITION=y CONFIG_FSL_FSPI=y CONFIG_DM_SPI=y -CONFIG_QSPI_BOOT=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_4BYTES_ADDR=y CONFIG_SPI_FLASH_STMICRO=y @@ -101,7 +102,7 @@ CONFIG_IMX8_POWER_DOMAIN=y CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y -CONFIG_ENV_IS_IN_SPL_FLASH=y +CONFIG_ENV_IS_IN_MMC=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_mek_spl_fspi_defconfig b/configs/imx8qxp_mek_spl_fspi_defconfig index e885645e11..e752e0a28e 100644 --- a/configs/imx8qxp_mek_spl_fspi_defconfig +++ b/configs/imx8qxp_mek_spl_fspi_defconfig @@ -75,7 +75,7 @@ CONFIG_MMC_HS400_SUPPORT=y CONFIG_EFI_PARTITION=y CONFIG_FSL_FSPI=y CONFIG_DM_SPI=y -CONFIG_QSPI_BOOT=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_4BYTES_ADDR=y CONFIG_SPI_FLASH_STMICRO=y @@ -102,7 +102,7 @@ CONFIG_IMX8_POWER_DOMAIN=y CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y -CONFIG_ENV_IS_IN_SPL_FLASH=y +CONFIG_ENV_IS_IN_MMC=y CONFIG_SMC_FUSE=y CONFIG_CMD_MEMTEST=y diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 9b4edb86aa..b5d493856b 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -24,6 +24,13 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x1040 /* (flash.bin_offset + 2Mb)/sector_size */ #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x200000 + +/* + * 0x08081000 - 0x08180FFF is for m4_0 xip image, + * 0x08181000 - 0x008280FFF is for m4_1 xip image + * So 3rd container image may start from 0x8281000 + */ +#define CONFIG_SYS_UBOOT_BASE 0x08281000 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 0 diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index f1566a2718..258d06b1b0 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -25,6 +25,12 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x1040 /* (32K + 2Mb)/sector_size */ #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x200000 + +/* + * 0x08081000 - 0x08180FFF is for m4_0 xip image, + * So 3rd container image may start from 0x8181000 + */ +#define CONFIG_SYS_UBOOT_BASE 0x08181000 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 0 |