MA-11259 [Android] Fastboot oem unlock fail on imx8

Commit 5dc5928 (MA-11108 [Android] decrypt lock store fail on imx7d) fix
some micros can't be enabled in drivers/usb/gadget/fastboot_lock_unlock.c
even if they have been defined in header files, which enables micro
CONFIG_ANDROID_AB_SUPPORT too. No "prdata" partition exist in Android or
Android Things which causes errors when try to read lock ability flag
from "prdata".

Moreover, imx8 don't use CAAM to decrypt/encrypt lock status, so we
should always return "FASTBOOT_UL_ENABLE" like what we have done on Android
Things.

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

diff --git a/include/configs/imx8mq_evk_android.h b/include/configs/imx8mq_evk_android.h
index 5a4233d..ea19029 100644 (file)
--- a/include/configs/imx8mq_evk_android.h
+++ b/include/configs/imx8mq_evk_android.h
@@ -11,6 +11,7 @@
 #define CONFIG_BCB_SUPPORT
 #define CONFIG_CMD_READ
 
+#define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
 #define CONFIG_ANDROID_AB_SUPPORT
 #define CONFIG_AVB_SUPPORT
 #define CONFIG_SUPPORT_EMMC_RPMB

diff --git a/include/configs/imx8qm_mek_android.h b/include/configs/imx8qm_mek_android.h
index ab44819..63c226e 100644 (file)
--- a/include/configs/imx8qm_mek_android.h
+++ b/include/configs/imx8qm_mek_android.h
@@ -15,6 +15,7 @@
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_VBUS_DRAW    2
 
+#define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
 #define CONFIG_ANDROID_AB_SUPPORT
 #define CONFIG_AVB_SUPPORT
 #define CONFIG_SUPPORT_EMMC_RPMB

diff --git a/include/configs/imx8qxp_mek_android.h b/include/configs/imx8qxp_mek_android.h
index ebbf651..02a2246 100644 (file)
--- a/include/configs/imx8qxp_mek_android.h
+++ b/include/configs/imx8qxp_mek_android.h
@@ -15,6 +15,7 @@
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_VBUS_DRAW    2
 
+#define CONFIG_ENABLE_LOCKSTATUS_SUPPORT
 #define CONFIG_ANDROID_AB_SUPPORT
 #define CONFIG_AVB_SUPPORT
 #define CONFIG_SUPPORT_EMMC_RPMB

diff --git a/include/fsl_fastboot.h b/include/fsl_fastboot.h
index 5df630e..6d49813 100644 (file)
--- a/include/fsl_fastboot.h
+++ b/include/fsl_fastboot.h
@@ -40,6 +40,7 @@
 #define FASTBOOT_MMC_BOOT1_PARTITION_ID  2
 
 #define FASTBOOT_PARTITION_TEE "tos"
+#define FASTBOOT_PARTITION_PRDATA "presistdata"
 
 #ifdef CONFIG_ANDROID_AB_SUPPORT
 #define FASTBOOT_PARTITION_BOOT_A "boot_a"
@@ -56,7 +57,6 @@
 #endif
 #define FASTBOOT_PARTITION_MISC "misc"
 #define FASTBOOT_PARTITION_GPT "gpt"
-#define FASTBOOT_PARTITION_PRDATA "prdata"
 #define FASTBOOT_PARTITION_FBMISC "fbmisc"
 #else
 #define FASTBOOT_PARTITION_BOOT "boot"
@@ -68,7 +68,6 @@
 #define FASTBOOT_PARTITION_DATA "userdata"
 #define FASTBOOT_PARTITION_GPT "gpt"
 #define FASTBOOT_PARTITION_MISC "misc"
-#define FASTBOOT_PARTITION_PRDATA "presistdata"
 #define FASTBOOT_PARTITION_FBMISC "fbmisc"
 #endif