From 48d58d07b9005c94c62fcdc345e65b0a8236d378 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Thu, 27 Dec 2018 18:04:13 -0800 Subject: [PATCH] MLK-20664-3 imx8m: Enable redundant offset for SPL NAND FIT The new uuu will change to burn entire boot image to nandfit mtdpart not only the FIT image. We enable REDUND offset configuration here, so that SPL will try to find FIT header at two locations: the begin of nandfit mtdpart and the 0x57c00 offset of nandfit mtdpart. This helps to be compatible with both old and new uuu. Signed-off-by: Ye Li --- include/configs/imx8mm_evk.h | 4 ++++ include/configs/imx8mq_arm2.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 10e1a46..0edf071 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -66,6 +66,10 @@ #define CONFIG_SPL_DMA_SUPPORT #define CONFIG_SPL_NAND_MXS #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x4000000 /* Put the FIT out of first 64MB boot area */ + +/* Set a redundant offset in nand FIT mtdpart. The new uuu will burn full boot image (not only FIT part) to the mtdpart, so we check both two offsets */ +#define CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND \ + (CONFIG_SYS_NAND_U_BOOT_OFFS + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512 - 0x8400) #endif #endif diff --git a/include/configs/imx8mq_arm2.h b/include/configs/imx8mq_arm2.h index c9aec6a..d601601 100644 --- a/include/configs/imx8mq_arm2.h +++ b/include/configs/imx8mq_arm2.h @@ -67,6 +67,10 @@ #define CONFIG_SPL_DMA_SUPPORT #define CONFIG_SPL_NAND_MXS #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x4000000 /* Put the FIT out of first 64MB boot area */ + +/* Set a redundant offset in nand FIT mtdpart. The new uuu will burn full boot image (not only FIT part) to the mtdpart, so we check both two offsets */ +#define CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND \ + (CONFIG_SYS_NAND_U_BOOT_OFFS + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512 - 0x8400) #endif #endif /* CONFIG_SPL_BUILD*/ -- 1.9.1