From 1c4188cafb6db9c9d774a1c5818e390e8b9d8389 Mon Sep 17 00:00:00 2001 From: Ji Luo Date: Fri, 4 Dec 2020 11:49:10 +0800 Subject: [PATCH] MA-18352-6 Enable device IDs provision Enable configs to support ID attestation. Change-Id: I1478d4981e7a1a10e11e4e71dcbfd49c64331a9d Signed-off-by: Ji Luo (cherry picked from commit a9ee1ce64fe5b1a79cfcd3ae1da9ed8acaa645fb) --- configs/imx8mm_evk_android_trusty_defconfig | 1 + configs/imx8mm_evk_android_trusty_dual_defconfig | 1 + configs/imx8mm_evk_android_trusty_secure_unlock_defconfig | 1 + configs/imx8mn_evk_android_trusty_defconfig | 1 + configs/imx8mn_evk_android_trusty_dual_defconfig | 1 + configs/imx8mn_evk_android_trusty_secure_unlock_defconfig | 1 + configs/imx8mp_evk_android_trusty_defconfig | 1 + configs/imx8mp_evk_android_trusty_dual_defconfig | 1 + configs/imx8mp_evk_android_trusty_secure_unlock_defconfig | 1 + configs/imx8mq_evk_android_trusty_defconfig | 1 + configs/imx8mq_evk_android_trusty_dual_defconfig | 1 + configs/imx8mq_evk_android_trusty_secure_unlock_defconfig | 1 + configs/imx8qm_mek_android_trusty_defconfig | 1 + configs/imx8qm_mek_android_trusty_secure_unlock_defconfig | 1 + configs/imx8qm_mek_androidauto2_trusty_defconfig | 2 ++ configs/imx8qm_mek_androidauto2_trusty_md_defconfig | 2 ++ configs/imx8qm_mek_androidauto_trusty_defconfig | 2 ++ configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig | 2 ++ configs/imx8qxp_mek_android_trusty_defconfig | 1 + configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig | 1 + configs/imx8qxp_mek_androidauto2_trusty_defconfig | 2 ++ configs/imx8qxp_mek_androidauto_trusty_defconfig | 2 ++ configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig | 2 ++ 23 files changed, 30 insertions(+) diff --git a/configs/imx8mm_evk_android_trusty_defconfig b/configs/imx8mm_evk_android_trusty_defconfig index 7c54c5f..1051ede 100644 --- a/configs/imx8mm_evk_android_trusty_defconfig +++ b/configs/imx8mm_evk_android_trusty_defconfig @@ -158,3 +158,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8mm_evk_android_trusty_dual_defconfig b/configs/imx8mm_evk_android_trusty_dual_defconfig index e1f7b54..7313620 100644 --- a/configs/imx8mm_evk_android_trusty_dual_defconfig +++ b/configs/imx8mm_evk_android_trusty_dual_defconfig @@ -160,3 +160,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig index ac779c7..4564fce 100644 --- a/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig +++ b/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig @@ -160,3 +160,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8mn_evk_android_trusty_defconfig b/configs/imx8mn_evk_android_trusty_defconfig index cac510a..d775a45 100644 --- a/configs/imx8mn_evk_android_trusty_defconfig +++ b/configs/imx8mn_evk_android_trusty_defconfig @@ -158,3 +158,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8mn_evk_android_trusty_dual_defconfig b/configs/imx8mn_evk_android_trusty_dual_defconfig index 29dcfe7..e300825 100644 --- a/configs/imx8mn_evk_android_trusty_dual_defconfig +++ b/configs/imx8mn_evk_android_trusty_dual_defconfig @@ -160,3 +160,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig index 001c891..7c0b2e2 100644 --- a/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig +++ b/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig @@ -160,3 +160,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8mp_evk_android_trusty_defconfig b/configs/imx8mp_evk_android_trusty_defconfig index 1c3d97b..ffbd21d 100644 --- a/configs/imx8mp_evk_android_trusty_defconfig +++ b/configs/imx8mp_evk_android_trusty_defconfig @@ -170,3 +170,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8mp_evk_android_trusty_dual_defconfig b/configs/imx8mp_evk_android_trusty_dual_defconfig index 8cf453b..d6e0492 100644 --- a/configs/imx8mp_evk_android_trusty_dual_defconfig +++ b/configs/imx8mp_evk_android_trusty_dual_defconfig @@ -172,3 +172,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8mp_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mp_evk_android_trusty_secure_unlock_defconfig index 48d13c0..e1b2492 100644 --- a/configs/imx8mp_evk_android_trusty_secure_unlock_defconfig +++ b/configs/imx8mp_evk_android_trusty_secure_unlock_defconfig @@ -172,3 +172,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x320 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0 CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8mq_evk_android_trusty_defconfig b/configs/imx8mq_evk_android_trusty_defconfig index 22339db..9235f80 100644 --- a/configs/imx8mq_evk_android_trusty_defconfig +++ b/configs/imx8mq_evk_android_trusty_defconfig @@ -150,3 +150,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8mq_evk_android_trusty_dual_defconfig b/configs/imx8mq_evk_android_trusty_dual_defconfig index 921d9a3..fac2460 100644 --- a/configs/imx8mq_evk_android_trusty_dual_defconfig +++ b/configs/imx8mq_evk_android_trusty_dual_defconfig @@ -152,3 +152,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig index dc9a7fa..4bd166e 100644 --- a/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig +++ b/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig @@ -152,3 +152,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x1E0 CONFIG_AVB_WARNING_LOGO_ROWS=0x60 CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8qm_mek_android_trusty_defconfig b/configs/imx8qm_mek_android_trusty_defconfig index 61893c7..950fdf7 100644 --- a/configs/imx8qm_mek_android_trusty_defconfig +++ b/configs/imx8qm_mek_android_trusty_defconfig @@ -193,3 +193,4 @@ CONFIG_AVB_WARNING_LOGO_ROWS=0x60 CONFIG_PSCI_BOARD_REBOOT=y CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8qm_mek_android_trusty_secure_unlock_defconfig b/configs/imx8qm_mek_android_trusty_secure_unlock_defconfig index e53beeb..fdf72c0 100644 --- a/configs/imx8qm_mek_android_trusty_secure_unlock_defconfig +++ b/configs/imx8qm_mek_android_trusty_secure_unlock_defconfig @@ -195,3 +195,4 @@ CONFIG_AVB_WARNING_LOGO_ROWS=0x60 CONFIG_PSCI_BOARD_REBOOT=y CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8qm_mek_androidauto2_trusty_defconfig b/configs/imx8qm_mek_androidauto2_trusty_defconfig index c1d5892..a135e36 100644 --- a/configs/imx8qm_mek_androidauto2_trusty_defconfig +++ b/configs/imx8qm_mek_androidauto2_trusty_defconfig @@ -176,3 +176,5 @@ CONFIG_SPL_MMC_WRITE=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_PSCI_BOARD_REBOOT=y CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car2" +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8qm_mek_androidauto2_trusty_md_defconfig b/configs/imx8qm_mek_androidauto2_trusty_md_defconfig index b84e943..fa3fed0 100644 --- a/configs/imx8qm_mek_androidauto2_trusty_md_defconfig +++ b/configs/imx8qm_mek_androidauto2_trusty_md_defconfig @@ -179,3 +179,5 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_IMX_LOAD_HDMI_FIMRWARE_TX=y CONFIG_PSCI_BOARD_REBOOT=y CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car2" +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8qm_mek_androidauto_trusty_defconfig b/configs/imx8qm_mek_androidauto_trusty_defconfig index 68d48e7..ee35a5a 100644 --- a/configs/imx8qm_mek_androidauto_trusty_defconfig +++ b/configs/imx8qm_mek_androidauto_trusty_defconfig @@ -177,3 +177,5 @@ CONFIG_SPL_MMC_WRITE=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_PSCI_BOARD_REBOOT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car" +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig b/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig index 21b8e4e..9f95efd 100644 --- a/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig +++ b/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig @@ -179,3 +179,5 @@ CONFIG_SECURE_UNLOCK=y CONFIG_AHAB_BOOT=y CONFIG_PSCI_BOARD_REBOOT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car" +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8qxp_mek_android_trusty_defconfig b/configs/imx8qxp_mek_android_trusty_defconfig index 28da292..b1ff68e 100644 --- a/configs/imx8qxp_mek_android_trusty_defconfig +++ b/configs/imx8qxp_mek_android_trusty_defconfig @@ -194,3 +194,4 @@ CONFIG_AVB_WARNING_LOGO_ROWS=0x60 CONFIG_PSCI_BOARD_REBOOT=y CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig b/configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig index d4101bb..a558316 100644 --- a/configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig +++ b/configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig @@ -196,3 +196,4 @@ CONFIG_AVB_WARNING_LOGO_ROWS=0x60 CONFIG_PSCI_BOARD_REBOOT=y CONFIG_VIRTUAL_AB_SUPPORT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8qxp_mek_androidauto2_trusty_defconfig b/configs/imx8qxp_mek_androidauto2_trusty_defconfig index 8049de2..e5dbcdb 100644 --- a/configs/imx8qxp_mek_androidauto2_trusty_defconfig +++ b/configs/imx8qxp_mek_androidauto2_trusty_defconfig @@ -186,3 +186,5 @@ CONFIG_SPL_MMC_WRITE=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_PSCI_BOARD_REBOOT=y CONFIG_VIRTUAL_AB_SUPPORT=y +CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car2" +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8qxp_mek_androidauto_trusty_defconfig b/configs/imx8qxp_mek_androidauto_trusty_defconfig index 09e3ac9..637933a 100644 --- a/configs/imx8qxp_mek_androidauto_trusty_defconfig +++ b/configs/imx8qxp_mek_androidauto_trusty_defconfig @@ -188,3 +188,5 @@ CONFIG_SPL_MMC_WRITE=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_PSCI_BOARD_REBOOT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car" +CONFIG_ID_ATTESTATION=y diff --git a/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig b/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig index d0fce82..fd9f0c2 100644 --- a/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig +++ b/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig @@ -190,3 +190,5 @@ CONFIG_SECURE_UNLOCK=y CONFIG_AHAB_BOOT=y CONFIG_PSCI_BOARD_REBOOT=y CONFIG_LOAD_KEY_FROM_RPMB=y +CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car" +CONFIG_ID_ATTESTATION=y -- 1.9.1