From 6736f4f750e66431330d6405dbe78042a3b20110 Mon Sep 17 00:00:00 2001 From: Ji Luo Date: Fri, 26 Jul 2019 09:34:17 +0800 Subject: MA-15217-2 Enable dual bootloader for imx8m Open configs to enable dual bootloader feature for imx8m platforms. Test: A/B slot switch and spl recovery mode test. Change-Id: I3fe0217c858b4cb1e06bd76f829a4f8977370cde Signed-off-by: Ji Luo --- include/configs/imx8mm_evk_android.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'include/configs/imx8mm_evk_android.h') diff --git a/include/configs/imx8mm_evk_android.h b/include/configs/imx8mm_evk_android.h index e9e70ece53..ddfda6cba2 100644 --- a/include/configs/imx8mm_evk_android.h +++ b/include/configs/imx8mm_evk_android.h @@ -59,9 +59,6 @@ #define ANDROID_MCU_FIRMWARE_HEADER_STACK 0x20020000 #endif -#ifdef CONFIG_FSL_CAAM_KB -#undef CONFIG_FSL_CAAM_KB -#endif #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED #ifdef CONFIG_IMX_TRUSTY_OS @@ -69,13 +66,28 @@ #define KEYSLOT_HWPARTITION_ID 2 #define KEYSLOT_BLKS 0x1FFF #define NS_ARCH_ARM64 1 +#endif -#ifdef CONFIG_SPL_BUILD -#undef CONFIG_BLK +#ifdef CONFIG_DUAL_BOOTLOADER +#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 + +#ifdef CONFIG_IMX_TRUSTY_OS +#define BOOTLOADER_RBIDX_OFFSET 0x3FE000 +#define BOOTLOADER_RBIDX_START 0x3FF000 +#define BOOTLOADER_RBIDX_LEN 0x08 +#define BOOTLOADER_RBIDX_INITVAL 0 #endif #endif +#if !defined(CONFIG_IMX_TRUSTY_OS) || !defined(CONFIG_DUAL_BOOTLOADER) +#undef CONFIG_FSL_CAAM_KB +#endif + +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_BLK +#endif + /* Enable CONFIG_ANDROID_LOW_MEMORY to config 1GB ddr */ #ifdef CONFIG_ANDROID_LOW_MEMORY #undef PHYS_SDRAM_SIZE -- cgit v1.2.3