From 1594150dba4bef6f3277854b9b005a37c6967e4c Mon Sep 17 00:00:00 2001 From: Ji Luo Date: Mon, 14 Jan 2019 18:28:47 +0800 Subject: [PATCH] MA-13940 [Auto] imx8q: Enable dual bootloader Open configs to enable dual bootloader feature for imx8q Android Auto. Test: Build and boot on imx8q. Change-Id: I99da2ee6b87efd201e16df1046188ae86cab1466 Signed-off-by: Ji Luo --- configs/imx8qm_mek_androidauto_trusty_defconfig | 3 +++ configs/imx8qxp_mek_androidauto_trusty_defconfig | 3 +++ include/configs/imx8qm_mek_android_auto.h | 7 +++++++ include/configs/imx8qxp_mek_android_auto.h | 7 +++++++ scripts/config_whitelist.txt | 1 + 5 files changed, 21 insertions(+) diff --git a/configs/imx8qm_mek_androidauto_trusty_defconfig b/configs/imx8qm_mek_androidauto_trusty_defconfig index e08bacc..bc6a97d 100644 --- a/configs/imx8qm_mek_androidauto_trusty_defconfig +++ b/configs/imx8qm_mek_androidauto_trusty_defconfig @@ -117,3 +117,6 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_NOT_UUU_BUILD=y +CONFIG_SHA256=y +CONFIG_SPL_MMC_WRITE=y +CONFIG_DUAL_BOOTLOADER=y diff --git a/configs/imx8qxp_mek_androidauto_trusty_defconfig b/configs/imx8qxp_mek_androidauto_trusty_defconfig index 909a583..e501c40 100644 --- a/configs/imx8qxp_mek_androidauto_trusty_defconfig +++ b/configs/imx8qxp_mek_androidauto_trusty_defconfig @@ -118,3 +118,6 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_NOT_UUU_BUILD=y +CONFIG_SHA256=y +CONFIG_SPL_MMC_WRITE=y +CONFIG_DUAL_BOOTLOADER=y diff --git a/include/configs/imx8qm_mek_android_auto.h b/include/configs/imx8qm_mek_android_auto.h index 968e7e7..c0a0683 100644 --- a/include/configs/imx8qm_mek_android_auto.h +++ b/include/configs/imx8qm_mek_android_auto.h @@ -106,6 +106,13 @@ #ifdef CONFIG_IMX_TRUSTY_OS #define AVB_RPMB +#ifdef CONFIG_DUAL_BOOTLOADER +#define BOOTLOADER_RBIDX_OFFSET 0x3FE000 +#define BOOTLOADER_RBIDX_START 0x3FF000 +#define BOOTLOADER_RBIDX_LEN 0x08 +#define BOOTLOADER_RBIDX_INITVAL 0 +#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x801F8000 +#endif #endif #ifdef CONFIG_SPL_BUILD diff --git a/include/configs/imx8qxp_mek_android_auto.h b/include/configs/imx8qxp_mek_android_auto.h index 5c5216f..1ebd7ff 100644 --- a/include/configs/imx8qxp_mek_android_auto.h +++ b/include/configs/imx8qxp_mek_android_auto.h @@ -98,6 +98,13 @@ #ifdef CONFIG_IMX_TRUSTY_OS #define AVB_RPMB +#ifdef CONFIG_DUAL_BOOTLOADER +#define BOOTLOADER_RBIDX_OFFSET 0x3FE000 +#define BOOTLOADER_RBIDX_START 0x3FF000 +#define BOOTLOADER_RBIDX_LEN 0x08 +#define BOOTLOADER_RBIDX_INITVAL 0 +#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x801F8000 +#endif #endif #ifdef CONFIG_SPL_BUILD diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ec9ec35..80726e9 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4379,6 +4379,7 @@ CONFIG_SYS_SPL_ARGS_ADDR CONFIG_SYS_SPL_LEN CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_SPL_MALLOC_START +CONFIG_SYS_SPL_PTE_RAM_BASE CONFIG_SYS_SPR CONFIG_SYS_SRAM_BASE CONFIG_SYS_SRAM_SIZE -- 1.9.1