From f303f969ebb0f525c413c47519725275d00025a1 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Sun, 28 Apr 2019 01:21:44 -0700 Subject: [PATCH] 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 Reviewed-by: Peng Fan --- configs/imx8qm_mek_fspi_defconfig | 1 + configs/imx8qxp_mek_fspi_defconfig | 1 + include/configs/imx8qm_mek.h | 7 +++++++ include/configs/imx8qxp_mek.h | 6 ++++++ 4 files changed, 15 insertions(+) diff --git a/configs/imx8qm_mek_fspi_defconfig b/configs/imx8qm_mek_fspi_defconfig index 55274b9446..c5d702677c 100644 --- a/configs/imx8qm_mek_fspi_defconfig +++ b/configs/imx8qm_mek_fspi_defconfig @@ -14,6 +14,7 @@ CONFIG_SPL_DOS_PARTITION=n CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_NOR_SUPPORT=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8qxp_mek_fspi_defconfig b/configs/imx8qxp_mek_fspi_defconfig index 93ec51560c..348f2c2773 100644 --- a/configs/imx8qxp_mek_fspi_defconfig +++ b/configs/imx8qxp_mek_fspi_defconfig @@ -14,6 +14,7 @@ CONFIG_SPL_DOS_PARTITION=n CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_NOR_SUPPORT=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index f24a847622..254ca1674f 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -17,6 +17,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 #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 2551fcd02f..3ab24d03bb 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -17,6 +17,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 #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv8/u-boot-spl.lds" -- 2.17.1