MA-15321-5 Enable secure unlock

Enable secure unlock for imx8m and imx8q.

Test: build and unlock on closed imx8mm_evk and
      imx8qm_mek.

Change-Id: I4c8038ddffdd07084ea41735b90e6a76fd1076dd
Signed-off-by: Ji Luo <ji.luo@nxp.com>

diff --git a/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig
index a2a53cc..dc9161f 100755 (executable)
--- a/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig
+++ b/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig
@@ -83,3 +83,4 @@ CONFIG_FASTBOOT_BUF_SIZE=0x19000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_LIBAVB=y
 CONFIG_APPEND_BOOTARGS=y
+CONFIG_SECURE_UNLOCK=y

diff --git a/configs/imx8mn_ddr4_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mn_ddr4_evk_android_trusty_secure_unlock_defconfig
index 833153c..f8fa37c 100644 (file)
--- a/configs/imx8mn_ddr4_evk_android_trusty_secure_unlock_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_trusty_secure_unlock_defconfig
@@ -88,3 +88,4 @@ CONFIG_LIBAVB=y
 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SECURE_UNLOCK=y

diff --git a/configs/imx8mq_aiy_android_trusty_secure_unlock_defconfig b/configs/imx8mq_aiy_android_trusty_secure_unlock_defconfig
index 6c01a95..b120e3f 100644 (file)
--- a/configs/imx8mq_aiy_android_trusty_secure_unlock_defconfig
+++ b/configs/imx8mq_aiy_android_trusty_secure_unlock_defconfig
@@ -86,4 +86,4 @@ CONFIG_REGEX=n
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_AVB_SUPPORT=y
-
+CONFIG_SECURE_UNLOCK=y

diff --git a/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig
index 8264f13..da382d3 100644 (file)
--- a/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig
+++ b/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig
@@ -87,3 +87,4 @@ CONFIG_USB_DWC3_GADGET=y
 CONFIG_LIBAVB=y
 CONFIG_APPEND_BOOTARGS=y
 CONFIG_IMX_TRUSTY_OS=y
+CONFIG_SECURE_UNLOCK=y

diff --git a/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig b/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig
index b18e3d5..66c9ee5 100644 (file)
--- a/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig
+++ b/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig
@@ -171,4 +171,4 @@ CONFIG_LIBAVB=y
 CONFIG_SHA256=y
 CONFIG_SPL_MMC_WRITE=y
 CONFIG_DUAL_BOOTLOADER=y
-
+CONFIG_SECURE_UNLOCK=y

diff --git a/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig b/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig
index 264dc2d..ffaf254 100644 (file)
--- a/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig
+++ b/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig
@@ -180,4 +180,4 @@ CONFIG_LIBAVB=y
 CONFIG_SHA256=y
 CONFIG_SPL_MMC_WRITE=y
 CONFIG_DUAL_BOOTLOADER=y
-
+CONFIG_SECURE_UNLOCK=y