diff options
| author | Ji Luo <ji.luo@nxp.com> | 2020-11-18 20:14:51 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2020-11-19 09:45:44 +0800 |
| commit | 010173028e553b3ecde036402a46d7e33b928e00 (patch) | |
| tree | 930022dbd382f99f9cef67ae33c4c7d5091cd9f5 | |
| parent | 5434603dc85553f353a127594ca764c06e54de0a (diff) | |
MA-18292 Sync configs for Android 10 release
Virtual A/B is not supported for Android 10 release, disable
the configs here. And as the dual bootloader feature is enabled
for car2 on Android 10, enable CONFIG_DUAL_BOOTLOADER for car2.
Test: Boots on imx8qm_mek.
Change-Id: If50ccbb33bc23d56e169e48e0a0b8ecd5259005c
Signed-off-by: Ji Luo <ji.luo@nxp.com>
33 files changed, 32 insertions, 33 deletions
diff --git a/configs/imx8mm_ddr4_evk_android_defconfig b/configs/imx8mm_ddr4_evk_android_defconfig index 5b4266b181..3dd438f0d8 100644 --- a/configs/imx8mm_ddr4_evk_android_defconfig +++ b/configs/imx8mm_ddr4_evk_android_defconfig @@ -147,4 +147,4 @@ CONFIG_APPEND_BOOTARGS=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y diff --git a/configs/imx8mm_evk_android_defconfig b/configs/imx8mm_evk_android_defconfig index 90ff0f4557..5d4e1bd2e5 100644 --- a/configs/imx8mm_evk_android_defconfig +++ b/configs/imx8mm_evk_android_defconfig @@ -152,4 +152,4 @@ CONFIG_APPEND_BOOTARGS=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y diff --git a/configs/imx8mm_evk_android_dual_defconfig b/configs/imx8mm_evk_android_dual_defconfig index 206ee9f6d2..bf0d0e7ff0 100644 --- a/configs/imx8mm_evk_android_dual_defconfig +++ b/configs/imx8mm_evk_android_dual_defconfig @@ -154,4 +154,4 @@ CONFIG_SPL_MMC_WRITE=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y diff --git a/configs/imx8mm_evk_android_trusty_defconfig b/configs/imx8mm_evk_android_trusty_defconfig index 7c54c5fee1..3d1b2c8a5d 100644 --- a/configs/imx8mm_evk_android_trusty_defconfig +++ b/configs/imx8mm_evk_android_trusty_defconfig @@ -156,5 +156,5 @@ CONFIG_TRUSTY_UNLOCK_PERMISSION=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8mm_evk_android_trusty_dual_defconfig b/configs/imx8mm_evk_android_trusty_dual_defconfig index e1f7b54948..82b93db825 100644 --- a/configs/imx8mm_evk_android_trusty_dual_defconfig +++ b/configs/imx8mm_evk_android_trusty_dual_defconfig @@ -158,5 +158,5 @@ CONFIG_TRUSTY_UNLOCK_PERMISSION=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig index ac779c79a1..949e9fe195 100644 --- a/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig +++ b/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig @@ -158,5 +158,5 @@ CONFIG_IMX_HAB=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8mn_ddr4_evk_android_defconfig b/configs/imx8mn_ddr4_evk_android_defconfig index f22fbffcac..042f404594 100644 --- a/configs/imx8mn_ddr4_evk_android_defconfig +++ b/configs/imx8mn_ddr4_evk_android_defconfig @@ -152,4 +152,4 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y diff --git a/configs/imx8mn_evk_android_defconfig b/configs/imx8mn_evk_android_defconfig index ca4ca9a8d0..6c47ab3aab 100644 --- a/configs/imx8mn_evk_android_defconfig +++ b/configs/imx8mn_evk_android_defconfig @@ -152,4 +152,4 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y diff --git a/configs/imx8mn_evk_android_dual_defconfig b/configs/imx8mn_evk_android_dual_defconfig index df53184116..697bc301f7 100644 --- a/configs/imx8mn_evk_android_dual_defconfig +++ b/configs/imx8mn_evk_android_dual_defconfig @@ -154,4 +154,4 @@ CONFIG_SPL_MMC_WRITE=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y diff --git a/configs/imx8mn_evk_android_trusty_defconfig b/configs/imx8mn_evk_android_trusty_defconfig index 73e8790a9a..54efcdfa79 100644 --- a/configs/imx8mn_evk_android_trusty_defconfig +++ b/configs/imx8mn_evk_android_trusty_defconfig @@ -156,5 +156,5 @@ CONFIG_TRUSTY_UNLOCK_PERMISSION=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8mn_evk_android_trusty_dual_defconfig b/configs/imx8mn_evk_android_trusty_dual_defconfig index 4c4170826c..ca85a50e71 100644 --- a/configs/imx8mn_evk_android_trusty_dual_defconfig +++ b/configs/imx8mn_evk_android_trusty_dual_defconfig @@ -158,5 +158,5 @@ CONFIG_SPL_MMC_WRITE=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig index 0fb7d6a31f..2ae4be5ff9 100644 --- a/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig +++ b/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig @@ -158,5 +158,5 @@ CONFIG_IMX_HAB=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8mp_evk_android_defconfig b/configs/imx8mp_evk_android_defconfig index dd1efbccb7..057b2294e0 100644 --- a/configs/imx8mp_evk_android_defconfig +++ b/configs/imx8mp_evk_android_defconfig @@ -164,4 +164,4 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y diff --git a/configs/imx8mp_evk_android_dual_defconfig b/configs/imx8mp_evk_android_dual_defconfig index 070df50277..6ad083ed29 100644 --- a/configs/imx8mp_evk_android_dual_defconfig +++ b/configs/imx8mp_evk_android_dual_defconfig @@ -166,4 +166,4 @@ CONFIG_SPL_MMC_WRITE=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y diff --git a/configs/imx8mp_evk_android_trusty_defconfig b/configs/imx8mp_evk_android_trusty_defconfig index 1c3d97b50d..b3ce199aad 100644 --- a/configs/imx8mp_evk_android_trusty_defconfig +++ b/configs/imx8mp_evk_android_trusty_defconfig @@ -168,5 +168,5 @@ CONFIG_TRUSTY_UNLOCK_PERMISSION=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8mp_evk_android_trusty_dual_defconfig b/configs/imx8mp_evk_android_trusty_dual_defconfig index 8cf453bf16..d1adfd052c 100644 --- a/configs/imx8mp_evk_android_trusty_dual_defconfig +++ b/configs/imx8mp_evk_android_trusty_dual_defconfig @@ -170,5 +170,5 @@ CONFIG_TRUSTY_UNLOCK_PERMISSION=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8mp_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mp_evk_android_trusty_secure_unlock_defconfig index 48d13c0b1c..8ab36c8fbf 100644 --- a/configs/imx8mp_evk_android_trusty_secure_unlock_defconfig +++ b/configs/imx8mp_evk_android_trusty_secure_unlock_defconfig @@ -170,5 +170,5 @@ CONFIG_IMX_HAB=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8mq_evk_android_defconfig b/configs/imx8mq_evk_android_defconfig index 1ac4d8f571..c0ba6bb402 100644 --- a/configs/imx8mq_evk_android_defconfig +++ b/configs/imx8mq_evk_android_defconfig @@ -144,4 +144,4 @@ CONFIG_APPEND_BOOTARGS=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y diff --git a/configs/imx8mq_evk_android_dual_defconfig b/configs/imx8mq_evk_android_dual_defconfig index 4a1e1966c1..e7fa3c66bf 100644 --- a/configs/imx8mq_evk_android_dual_defconfig +++ b/configs/imx8mq_evk_android_dual_defconfig @@ -146,4 +146,4 @@ CONFIG_SPL_MMC_WRITE=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y diff --git a/configs/imx8mq_evk_android_trusty_defconfig b/configs/imx8mq_evk_android_trusty_defconfig index 22339db3b6..06ec9633e7 100644 --- a/configs/imx8mq_evk_android_trusty_defconfig +++ b/configs/imx8mq_evk_android_trusty_defconfig @@ -148,5 +148,5 @@ CONFIG_TRUSTY_UNLOCK_PERMISSION=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8mq_evk_android_trusty_dual_defconfig b/configs/imx8mq_evk_android_trusty_dual_defconfig index 921d9a3dfe..f7c8703853 100644 --- a/configs/imx8mq_evk_android_trusty_dual_defconfig +++ b/configs/imx8mq_evk_android_trusty_dual_defconfig @@ -150,5 +150,5 @@ CONFIG_TRUSTY_UNLOCK_PERMISSION=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig index dc9a7fa9a5..b24fe36efc 100644 --- a/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig +++ b/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig @@ -150,5 +150,5 @@ CONFIG_IMX_HAB=y CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8qm_mek_android_defconfig b/configs/imx8qm_mek_android_defconfig index 061987bd15..2f9327fceb 100644 --- a/configs/imx8qm_mek_android_defconfig +++ b/configs/imx8qm_mek_android_defconfig @@ -186,4 +186,4 @@ CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 CONFIG_PSCI_BOARD_REBOOT=y -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y diff --git a/configs/imx8qm_mek_android_hdmi_defconfig b/configs/imx8qm_mek_android_hdmi_defconfig index bf71acf55d..61702302d4 100644 --- a/configs/imx8qm_mek_android_hdmi_defconfig +++ b/configs/imx8qm_mek_android_hdmi_defconfig @@ -187,4 +187,4 @@ CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 CONFIG_PSCI_BOARD_REBOOT=y -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y diff --git a/configs/imx8qm_mek_android_trusty_defconfig b/configs/imx8qm_mek_android_trusty_defconfig index 61893c7996..309b9abe8b 100644 --- a/configs/imx8qm_mek_android_trusty_defconfig +++ b/configs/imx8qm_mek_android_trusty_defconfig @@ -191,5 +191,5 @@ CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 CONFIG_PSCI_BOARD_REBOOT=y -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8qm_mek_android_trusty_secure_unlock_defconfig b/configs/imx8qm_mek_android_trusty_secure_unlock_defconfig index e53beebc9c..344e54a17e 100644 --- a/configs/imx8qm_mek_android_trusty_secure_unlock_defconfig +++ b/configs/imx8qm_mek_android_trusty_secure_unlock_defconfig @@ -193,5 +193,5 @@ CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 CONFIG_PSCI_BOARD_REBOOT=y -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8qm_mek_androidauto2_trusty_defconfig b/configs/imx8qm_mek_androidauto2_trusty_defconfig index c1d5892984..a2af03de7a 100644 --- a/configs/imx8qm_mek_androidauto2_trusty_defconfig +++ b/configs/imx8qm_mek_androidauto2_trusty_defconfig @@ -172,7 +172,7 @@ CONFIG_CMD_MMC_RPMB=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_IMX_TRUSTY_OS=y CONFIG_TRUSTY_UNLOCK_PERMISSION=y +CONFIG_DUAL_BOOTLOADER=y CONFIG_SPL_MMC_WRITE=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_PSCI_BOARD_REBOOT=y -CONFIG_VIRTUAL_AB_SUPPORT=y diff --git a/configs/imx8qm_mek_androidauto2_trusty_md_defconfig b/configs/imx8qm_mek_androidauto2_trusty_md_defconfig index b84e9437d1..b601dba9d5 100644 --- a/configs/imx8qm_mek_androidauto2_trusty_md_defconfig +++ b/configs/imx8qm_mek_androidauto2_trusty_md_defconfig @@ -174,8 +174,8 @@ CONFIG_CMD_MMC_RPMB=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_IMX_TRUSTY_OS=y CONFIG_TRUSTY_UNLOCK_PERMISSION=y +CONFIG_DUAL_BOOTLOADER=y CONFIG_SPL_MMC_WRITE=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_IMX_LOAD_HDMI_FIMRWARE_TX=y CONFIG_PSCI_BOARD_REBOOT=y -CONFIG_VIRTUAL_AB_SUPPORT=y diff --git a/configs/imx8qm_mek_androidauto_xen_defconfig b/configs/imx8qm_mek_androidauto_xen_defconfig index 547d118878..4eabba1b2e 100644 --- a/configs/imx8qm_mek_androidauto_xen_defconfig +++ b/configs/imx8qm_mek_androidauto_xen_defconfig @@ -201,4 +201,3 @@ CONFIG_XEN=y CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y CONFIG_XEN_DEBUG_SERIAL=y CONFIG_LOAD_KEY_FROM_RPMB=y -CONFIG_VIRTUAL_AB_SUPPORT=y diff --git a/configs/imx8qxp_mek_android_defconfig b/configs/imx8qxp_mek_android_defconfig index e4ed614e41..61eda22642 100644 --- a/configs/imx8qxp_mek_android_defconfig +++ b/configs/imx8qxp_mek_android_defconfig @@ -187,4 +187,4 @@ CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 CONFIG_PSCI_BOARD_REBOOT=y -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y diff --git a/configs/imx8qxp_mek_android_trusty_defconfig b/configs/imx8qxp_mek_android_trusty_defconfig index 28da29247a..96d792cbca 100644 --- a/configs/imx8qxp_mek_android_trusty_defconfig +++ b/configs/imx8qxp_mek_android_trusty_defconfig @@ -192,5 +192,5 @@ CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 CONFIG_PSCI_BOARD_REBOOT=y -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig b/configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig index d4101bbed5..39f245d3b1 100644 --- a/configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig +++ b/configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig @@ -194,5 +194,5 @@ CONFIG_AVB_WARNING_LOGO=y CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 CONFIG_PSCI_BOARD_REBOOT=y -CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ANDROID_DYNAMIC_PARTITION=y CONFIG_LOAD_KEY_FROM_RPMB=y diff --git a/configs/imx8qxp_mek_androidauto2_trusty_defconfig b/configs/imx8qxp_mek_androidauto2_trusty_defconfig index 8049de2d5d..522c0f9c7b 100644 --- a/configs/imx8qxp_mek_androidauto2_trusty_defconfig +++ b/configs/imx8qxp_mek_androidauto2_trusty_defconfig @@ -182,7 +182,7 @@ CONFIG_CMD_MMC_RPMB=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_IMX_TRUSTY_OS=y CONFIG_TRUSTY_UNLOCK_PERMISSION=y +CONFIG_DUAL_BOOTLOADER=y CONFIG_SPL_MMC_WRITE=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_PSCI_BOARD_REBOOT=y -CONFIG_VIRTUAL_AB_SUPPORT=y |