From c5151ab339c9a37a6c95cabebe328aeba88636f9 Mon Sep 17 00:00:00 2001 From: "Haoran.Wang" Date: Tue, 9 Jul 2019 12:16:23 +0800 Subject: [PATCH] MA-15087-4 Support mmc loader for imx8mn_evk Align using emmc loader when there is no Trusty OS for Android standard boot in SD/EMMC. Add hook for getting correct offset when load uboot. Change-Id: I5898cf196e734ffaca1a513918a049ce504b14e9 Signed-off-by: Haoran.Wang --- board/freescale/imx8mn_evk/spl.c | 16 ++++++++++++++++ configs/imx8mn_ddr4_evk_android_defconfig | 3 --- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c index 2f8aeb5778..b9980e2975 100644 --- a/board/freescale/imx8mn_evk/spl.c +++ b/board/freescale/imx8mn_evk/spl.c @@ -233,3 +233,19 @@ void board_init_f(ulong dummy) board_init_r(NULL, 0); } + +#ifdef CONFIG_SPL_MMC_SUPPORT + +#define UBOOT_RAW_SECTOR_OFFSET 0x40 +unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc) +{ + u32 boot_dev = spl_boot_device(); + switch (boot_dev) { + case BOOT_DEVICE_MMC1: + return CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR; + case BOOT_DEVICE_MMC2: + return CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR - UBOOT_RAW_SECTOR_OFFSET; + } + return CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR; +} +#endif diff --git a/configs/imx8mn_ddr4_evk_android_defconfig b/configs/imx8mn_ddr4_evk_android_defconfig index 15a227ee26..ec13edd39f 100644 --- a/configs/imx8mn_ddr4_evk_android_defconfig +++ b/configs/imx8mn_ddr4_evk_android_defconfig @@ -81,9 +81,6 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_VIDEO=y CONFIG_IMX_SEC_MIPI_DSI=y -CONFIG_SPL_IMX_ROMAPI_SUPPORT=y -CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 - CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_APPEND_BOOTARGS=y CONFIG_LZ4=y -- 2.17.1