summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaoran.Wang <elven.wang@nxp.com>2019-07-09 12:16:23 +0800
committerHaoran.Wang <elven.wang@nxp.com>2019-07-12 09:03:47 +0800
commitf5dea5979aa57270e5ec4d1ec666441cf2f1a45c (patch)
treeeb5cc47dda2206fc5ff4b850828468e702a89fe0
parent040f7ec8c3d9c7a7d5fff9a8c7ed083090893377 (diff)
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 <elven.wang@nxp.com>
-rw-r--r--board/freescale/imx8mn_evk/spl.c16
-rw-r--r--configs/imx8mn_ddr4_evk_android_defconfig2
2 files changed, 16 insertions, 2 deletions
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index 17daed91f6..ca76124abf 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -232,3 +232,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 8025630b97..a6ae30ebf0 100644
--- a/configs/imx8mn_ddr4_evk_android_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_defconfig
@@ -64,8 +64,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_NOT_UUU_BUILD=y