From fe6af144930a0a32cbc4599635a96c8a629432a1 Mon Sep 17 00:00:00 2001 From: Teo Hall Date: Mon, 15 Oct 2018 17:03:45 -0500 Subject: MLK-19877-1: iMX8QXP: Add NAND SPL support Add implementation necessary for supporting SPL on QXP ARM2 board with dynamic offset detection from container header. Signed-off-by: Teo Hall --- common/spl/spl_nand.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'common') diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index d075985374..93d4774fff 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -13,15 +13,23 @@ #include #if defined(CONFIG_SPL_NAND_RAW_ONLY) +uint32_t __weak spl_nand_get_uboot_raw_page(void) +{ + return CONFIG_SYS_NAND_U_BOOT_OFFS; +} + int spl_nand_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { nand_init(); - - nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS, - CONFIG_SYS_NAND_U_BOOT_SIZE, - (void *)CONFIG_SYS_NAND_U_BOOT_DST); + nand_spl_load_image(spl_nand_get_uboot_raw_page(), + CONFIG_SYS_NAND_U_BOOT_SIZE, + (void *)CONFIG_SYS_NAND_U_BOOT_DST); +#if defined(CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE) + spl_set_header_raw_atf(spl_image); +#else spl_set_header_raw_uboot(spl_image); +#endif nand_deselect(); return 0; -- cgit v1.2.3