MA-20814 add fastboot command to erase u-boot env

Add fastboot command "fastboot oem erase_uboot_env" to support erase u-boot env.

Signed-off-by: Maximus Sun <maximus.sun@nxp.com>

51 files changed, 68 insertions, 1 deletions

diff --git a/configs/imx8mm_ddr4_evk_android_defconfig b/configs/imx8mm_ddr4_evk_android_defconfig
index 80e0d93775..7fd463fa19 100644
--- a/configs/imx8mm_ddr4_evk_android_defconfig
+++ b/configs/imx8mm_ddr4_evk_android_defconfig
@@ -170,3 +170,4 @@ CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
 CONFIG_VIRTUAL_AB_SUPPORT=y
 CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mm_ddr4_evk_android_uuu_defconfig b/configs/imx8mm_ddr4_evk_android_uuu_defconfig
index d6c5cb11d1..b39916c30c 100644
--- a/configs/imx8mm_ddr4_evk_android_uuu_defconfig
+++ b/configs/imx8mm_ddr4_evk_android_uuu_defconfig
@@ -165,3 +165,4 @@ CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
 CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
 CONFIG_CMD_BOOTA=n
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mm_evk_1g_ddr_android_defconfig b/configs/imx8mm_evk_1g_ddr_android_defconfig
index 5133f38cd3..94dd53eeca 100644
--- a/configs/imx8mm_evk_1g_ddr_android_defconfig
+++ b/configs/imx8mm_evk_1g_ddr_android_defconfig
@@ -204,3 +204,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x320
 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
 CONFIG_VIRTUAL_AB_SUPPORT=y
 CONFIG_IMX8M_1G_MEMORY=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mm_evk_4g_android_defconfig b/configs/imx8mm_evk_4g_android_defconfig
index 7f2882c5a6..e6d3407e23 100644
--- a/configs/imx8mm_evk_4g_android_defconfig
+++ b/configs/imx8mm_evk_4g_android_defconfig
@@ -204,3 +204,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x320
 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
 CONFIG_VIRTUAL_AB_SUPPORT=y
 CONFIG_IMX8M_4G_LPDDR4=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mm_evk_4g_android_trusty_defconfig b/configs/imx8mm_evk_4g_android_trusty_defconfig
index bf48059cc7..52c0e4b8df 100644
--- a/configs/imx8mm_evk_4g_android_trusty_defconfig
+++ b/configs/imx8mm_evk_4g_android_trusty_defconfig
@@ -210,3 +210,4 @@ CONFIG_ATTESTATION_ID_DEVICE="evk_8mm"
 CONFIG_ATTESTATION_ID_PRODUCT="evk_8mm"
 CONFIG_ATTESTATION_ID_MANUFACTURER="nxp"
 CONFIG_ATTESTATION_ID_MODEL="EVK_8MM"
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mm_evk_4g_android_uuu_defconfig b/configs/imx8mm_evk_4g_android_uuu_defconfig
index bbe331da0a..ec8b3bb827 100644
--- a/configs/imx8mm_evk_4g_android_uuu_defconfig
+++ b/configs/imx8mm_evk_4g_android_uuu_defconfig
@@ -199,3 +199,4 @@ CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
 CONFIG_CMD_BOOTA=n
 CONFIG_IMX8M_4G_LPDDR4=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mm_evk_android_defconfig b/configs/imx8mm_evk_android_defconfig
index d7ffc14bec..32e7a71742 100644
--- a/configs/imx8mm_evk_android_defconfig
+++ b/configs/imx8mm_evk_android_defconfig
@@ -203,3 +203,4 @@ CONFIG_AVB_WARNING_LOGO=y
 CONFIG_AVB_WARNING_LOGO_COLS=0x320
 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
 CONFIG_VIRTUAL_AB_SUPPORT=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mm_evk_android_dual_defconfig b/configs/imx8mm_evk_android_dual_defconfig
index adad43db54..b5e3853d6c 100644
--- a/configs/imx8mm_evk_android_dual_defconfig
+++ b/configs/imx8mm_evk_android_dual_defconfig
@@ -204,3 +204,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0x320
 CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
 CONFIG_VIRTUAL_AB_SUPPORT=y
 CONFIG_DUAL_BOOTLOADER=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mm_evk_android_trusty_defconfig b/configs/imx8mm_evk_android_trusty_defconfig
index e5023f7521..ca516701a3 100644
--- a/configs/imx8mm_evk_android_trusty_defconfig
+++ b/configs/imx8mm_evk_android_trusty_defconfig
@@ -209,3 +209,4 @@ CONFIG_ATTESTATION_ID_DEVICE="evk_8mm"
 CONFIG_ATTESTATION_ID_PRODUCT="evk_8mm"
 CONFIG_ATTESTATION_ID_MANUFACTURER="nxp"
 CONFIG_ATTESTATION_ID_MODEL="EVK_8MM"
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mm_evk_android_trusty_dual_defconfig b/configs/imx8mm_evk_android_trusty_dual_defconfig
index a609d53ff3..852cff0bd4 100644
--- a/configs/imx8mm_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mm_evk_android_trusty_dual_defconfig
@@ -210,3 +210,4 @@ CONFIG_ATTESTATION_ID_PRODUCT="evk_8mm"
 CONFIG_ATTESTATION_ID_MANUFACTURER="nxp"
 CONFIG_ATTESTATION_ID_MODEL="EVK_8MM"
 CONFIG_DUAL_BOOTLOADER=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mm_evk_android_trusty_secure_unlock_dual_defconfig b/configs/imx8mm_evk_android_trusty_secure_unlock_dual_defconfig
index 1c871fd964..1f9bbc2da1 100644
--- a/configs/imx8mm_evk_android_trusty_secure_unlock_dual_defconfig
+++ b/configs/imx8mm_evk_android_trusty_secure_unlock_dual_defconfig
@@ -212,3 +212,4 @@ CONFIG_ATTESTATION_ID_MODEL="EVK_8MM"
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SECURE_UNLOCK=y
 CONFIG_IMX_HAB=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mm_evk_android_uuu_defconfig b/configs/imx8mm_evk_android_uuu_defconfig
index 7a6c245d17..479346249d 100644
--- a/configs/imx8mm_evk_android_uuu_defconfig
+++ b/configs/imx8mm_evk_android_uuu_defconfig
@@ -198,3 +198,4 @@ CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
 CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
 CONFIG_CMD_BOOTA=n
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mq_evk_android_defconfig b/configs/imx8mq_evk_android_defconfig
index b74492e9f9..9d5dc1de40 100644
--- a/configs/imx8mq_evk_android_defconfig
+++ b/configs/imx8mq_evk_android_defconfig
@@ -167,3 +167,4 @@ CONFIG_AVB_WARNING_LOGO_ROWS=0x60
 CONFIG_VIRTUAL_AB_SUPPORT=y
 CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mq_evk_android_dual_defconfig b/configs/imx8mq_evk_android_dual_defconfig
index 4c428fc569..917e83e850 100644
--- a/configs/imx8mq_evk_android_dual_defconfig
+++ b/configs/imx8mq_evk_android_dual_defconfig
@@ -168,3 +168,4 @@ CONFIG_VIRTUAL_AB_SUPPORT=y
 CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
 CONFIG_DUAL_BOOTLOADER=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mq_evk_android_trusty_defconfig b/configs/imx8mq_evk_android_trusty_defconfig
index 075e9e887d..a9740ecda9 100644
--- a/configs/imx8mq_evk_android_trusty_defconfig
+++ b/configs/imx8mq_evk_android_trusty_defconfig
@@ -173,3 +173,4 @@ CONFIG_ATTESTATION_ID_DEVICE="evk_8mq"
 CONFIG_ATTESTATION_ID_PRODUCT="evk_8mq"
 CONFIG_ATTESTATION_ID_MANUFACTURER="nxp"
 CONFIG_ATTESTATION_ID_MODEL="EVK_8MQ"
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mq_evk_android_trusty_dual_defconfig b/configs/imx8mq_evk_android_trusty_dual_defconfig
index 4763648ba7..648b77bfc5 100644
--- a/configs/imx8mq_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mq_evk_android_trusty_dual_defconfig
@@ -172,3 +172,4 @@ CONFIG_ATTESTATION_ID_PRODUCT="evk_8mq"
 CONFIG_ATTESTATION_ID_MANUFACTURER="nxp"
 CONFIG_ATTESTATION_ID_MODEL="EVK_8MQ"
 CONFIG_DUAL_BOOTLOADER=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mq_evk_android_trusty_secure_unlock_dual_defconfig b/configs/imx8mq_evk_android_trusty_secure_unlock_dual_defconfig
index e53b1eb416..f406981aa3 100644
--- a/configs/imx8mq_evk_android_trusty_secure_unlock_dual_defconfig
+++ b/configs/imx8mq_evk_android_trusty_secure_unlock_dual_defconfig
@@ -176,3 +176,4 @@ CONFIG_ATTESTATION_ID_MODEL="EVK_8MQ"
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SECURE_UNLOCK=y
 CONFIG_IMX_HAB=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8mq_evk_android_uuu_defconfig b/configs/imx8mq_evk_android_uuu_defconfig
index ed696565b7..460db0b7dc 100644
--- a/configs/imx8mq_evk_android_uuu_defconfig
+++ b/configs/imx8mq_evk_android_uuu_defconfig
@@ -161,3 +161,4 @@ CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
 CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
 CONFIG_CMD_BOOTA=n
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qm_mek_android_defconfig b/configs/imx8qm_mek_android_defconfig
index 4ae8b05fcf..9cb61da220 100644
--- a/configs/imx8qm_mek_android_defconfig
+++ b/configs/imx8qm_mek_android_defconfig
@@ -206,3 +206,4 @@ CONFIG_PSCI_BOARD_REBOOT=y
 CONFIG_VIRTUAL_AB_SUPPORT=y
 CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qm_mek_android_dual_defconfig b/configs/imx8qm_mek_android_dual_defconfig
index 7e465d0e03..6637225097 100644
--- a/configs/imx8qm_mek_android_dual_defconfig
+++ b/configs/imx8qm_mek_android_dual_defconfig
@@ -207,3 +207,4 @@ CONFIG_VIRTUAL_AB_SUPPORT=y
 CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
 CONFIG_DUAL_BOOTLOADER=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qm_mek_android_hdmi_defconfig b/configs/imx8qm_mek_android_hdmi_defconfig
index 0551b0826c..b7fb8cd751 100644
--- a/configs/imx8qm_mek_android_hdmi_defconfig
+++ b/configs/imx8qm_mek_android_hdmi_defconfig
@@ -208,3 +208,4 @@ CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
 CONFIG_IMX_LOAD_HDMI_FIMRWARE_TX=y
 CONFIG_IMX_LOAD_HDMI_FIMRWARE_RX=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qm_mek_android_trusty_defconfig b/configs/imx8qm_mek_android_trusty_defconfig
index ea93c9ce76..c40d236c07 100644
--- a/configs/imx8qm_mek_android_trusty_defconfig
+++ b/configs/imx8qm_mek_android_trusty_defconfig
@@ -213,3 +213,4 @@ CONFIG_ATTESTATION_ID_PRODUCT="mek_8q"
 CONFIG_ATTESTATION_ID_MANUFACTURER="nxp"
 CONFIG_ATTESTATION_ID_MODEL="MEK-MX8Q"
 CONFIG_SHA256=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qm_mek_android_trusty_dual_defconfig b/configs/imx8qm_mek_android_trusty_dual_defconfig
index 7a8a7a3c1c..97d1f554b5 100644
--- a/configs/imx8qm_mek_android_trusty_dual_defconfig
+++ b/configs/imx8qm_mek_android_trusty_dual_defconfig
@@ -214,3 +214,4 @@ CONFIG_ATTESTATION_ID_MANUFACTURER="nxp"
 CONFIG_ATTESTATION_ID_MODEL="MEK-MX8Q"
 CONFIG_SHA256=y
 CONFIG_DUAL_BOOTLOADER=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qm_mek_android_trusty_secure_unlock_dual_defconfig b/configs/imx8qm_mek_android_trusty_secure_unlock_dual_defconfig
index 5b2b3903c8..0b2ce5f1f2 100644
--- a/configs/imx8qm_mek_android_trusty_secure_unlock_dual_defconfig
+++ b/configs/imx8qm_mek_android_trusty_secure_unlock_dual_defconfig
@@ -216,3 +216,4 @@ CONFIG_SHA256=y
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SECURE_UNLOCK=y
 CONFIG_AHAB_BOOT=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qm_mek_android_uuu_defconfig b/configs/imx8qm_mek_android_uuu_defconfig
index 6a558b16aa..9239ef02f9 100644
--- a/configs/imx8qm_mek_android_uuu_defconfig
+++ b/configs/imx8qm_mek_android_uuu_defconfig
@@ -200,3 +200,4 @@ CONFIG_CMD_BMP=y
 CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
 CONFIG_CMD_BOOTA=n
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qm_mek_androidauto2_trusty_defconfig b/configs/imx8qm_mek_androidauto2_trusty_defconfig
index 0cd969bb52..d11d032f81 100644
--- a/configs/imx8qm_mek_androidauto2_trusty_defconfig
+++ b/configs/imx8qm_mek_androidauto2_trusty_defconfig
@@ -211,3 +211,4 @@ CONFIG_ATTESTATION_ID_MANUFACTURER="nxp"
 CONFIG_ATTESTATION_ID_MODEL="MEK-MX8Q"
 CONFIG_ANDROID_AUTO_SUPPORT=y
 CONFIG_LOAD_KEY_FROM_RPMB=n
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qm_mek_androidauto2_trusty_md_defconfig b/configs/imx8qm_mek_androidauto2_trusty_md_defconfig
index de51e6e666..36251bdc10 100644
--- a/configs/imx8qm_mek_androidauto2_trusty_md_defconfig
+++ b/configs/imx8qm_mek_androidauto2_trusty_md_defconfig
@@ -212,3 +212,4 @@ CONFIG_ATTESTATION_ID_MODEL="MEK-MX8Q"
 CONFIG_ANDROID_AUTO_SUPPORT=y
 CONFIG_LOAD_KEY_FROM_RPMB=n
 CONFIG_IMX_LOAD_HDMI_FIMRWARE_TX=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qm_mek_androidauto_trusty_defconfig b/configs/imx8qm_mek_androidauto_trusty_defconfig
index 9fcbc53e44..c557926ec4 100644
--- a/configs/imx8qm_mek_androidauto_trusty_defconfig
+++ b/configs/imx8qm_mek_androidauto_trusty_defconfig
@@ -210,3 +210,4 @@ CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car"
 CONFIG_ATTESTATION_ID_MANUFACTURER="nxp"
 CONFIG_ATTESTATION_ID_MODEL="MEK-MX8Q"
 CONFIG_ANDROID_AUTO_SUPPORT=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig b/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig
index 2010ba1aa2..e91ddffbaf 100644
--- a/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig
+++ b/configs/imx8qm_mek_androidauto_trusty_secure_unlock_defconfig
@@ -212,3 +212,4 @@ CONFIG_ATTESTATION_ID_MODEL="MEK-MX8Q"
 CONFIG_ANDROID_AUTO_SUPPORT=y
 CONFIG_SECURE_UNLOCK=y
 CONFIG_AHAB_BOOT=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qxp_mek_android_defconfig b/configs/imx8qxp_mek_android_defconfig
index ef8f3fffb9..033daa7ad7 100644
--- a/configs/imx8qxp_mek_android_defconfig
+++ b/configs/imx8qxp_mek_android_defconfig
@@ -204,3 +204,4 @@ CONFIG_PSCI_BOARD_REBOOT=y
 CONFIG_VIRTUAL_AB_SUPPORT=y
 CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qxp_mek_android_dual_defconfig b/configs/imx8qxp_mek_android_dual_defconfig
index 119c94f049..f904654d3d 100644
--- a/configs/imx8qxp_mek_android_dual_defconfig
+++ b/configs/imx8qxp_mek_android_dual_defconfig
@@ -205,3 +205,4 @@ CONFIG_VIRTUAL_AB_SUPPORT=y
 CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
 CONFIG_DUAL_BOOTLOADER=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qxp_mek_android_trusty_dual_defconfig b/configs/imx8qxp_mek_android_trusty_dual_defconfig
index 6363bc47a5..91718b0707 100644
--- a/configs/imx8qxp_mek_android_trusty_dual_defconfig
+++ b/configs/imx8qxp_mek_android_trusty_dual_defconfig
@@ -212,3 +212,4 @@ CONFIG_ATTESTATION_ID_PRODUCT="mek_8q"
 CONFIG_ATTESTATION_ID_MANUFACTURER="nxp"
 CONFIG_ATTESTATION_ID_MODEL="MEK-MX8Q"
 CONFIG_DUAL_BOOTLOADER=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qxp_mek_android_trusty_secure_unlock_dual_defconfig b/configs/imx8qxp_mek_android_trusty_secure_unlock_dual_defconfig
index 6af0b69475..9de24b5d85 100644
--- a/configs/imx8qxp_mek_android_trusty_secure_unlock_dual_defconfig
+++ b/configs/imx8qxp_mek_android_trusty_secure_unlock_dual_defconfig
@@ -214,3 +214,4 @@ CONFIG_ATTESTATION_ID_MODEL="MEK-MX8Q"
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SECURE_UNLOCK=y
 CONFIG_AHAB_BOOT=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qxp_mek_android_uuu_defconfig b/configs/imx8qxp_mek_android_uuu_defconfig
index 80ff2f8cec..45ee29db70 100644
--- a/configs/imx8qxp_mek_android_uuu_defconfig
+++ b/configs/imx8qxp_mek_android_uuu_defconfig
@@ -198,3 +198,4 @@ CONFIG_CMD_BMP=y
 CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
 CONFIG_CMD_BOOTA=n
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qxp_mek_androidauto2_trusty_defconfig b/configs/imx8qxp_mek_androidauto2_trusty_defconfig
index 1a9ecc8849..d932149a87 100644
--- a/configs/imx8qxp_mek_androidauto2_trusty_defconfig
+++ b/configs/imx8qxp_mek_androidauto2_trusty_defconfig
@@ -210,3 +210,4 @@ CONFIG_ATTESTATION_ID_MANUFACTURER="nxp"
 CONFIG_ATTESTATION_ID_MODEL="MEK-MX8Q"
 CONFIG_ANDROID_AUTO_SUPPORT=y
 CONFIG_LOAD_KEY_FROM_RPMB=n
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qxp_mek_androidauto_trusty_defconfig b/configs/imx8qxp_mek_androidauto_trusty_defconfig
index bae4378391..e5912f8585 100644
--- a/configs/imx8qxp_mek_androidauto_trusty_defconfig
+++ b/configs/imx8qxp_mek_androidauto_trusty_defconfig
@@ -209,3 +209,4 @@ CONFIG_ATTESTATION_ID_PRODUCT="mek_8q_car"
 CONFIG_ATTESTATION_ID_MANUFACTURER="nxp"
 CONFIG_ATTESTATION_ID_MODEL="MEK-MX8Q"
 CONFIG_ANDROID_AUTO_SUPPORT=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig b/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig
index 10989c26c5..a4b7c9a747 100644
--- a/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig
+++ b/configs/imx8qxp_mek_androidauto_trusty_secure_unlock_defconfig
@@ -211,3 +211,4 @@ CONFIG_ATTESTATION_ID_MODEL="MEK-MX8Q"
 CONFIG_ANDROID_AUTO_SUPPORT=y
 CONFIG_SECURE_UNLOCK=y
 CONFIG_AHAB_BOOT=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8ulp_9x9_evk_android_defconfig b/configs/imx8ulp_9x9_evk_android_defconfig
index 0fcdcad4bb..23ff269937 100644
--- a/configs/imx8ulp_9x9_evk_android_defconfig
+++ b/configs/imx8ulp_9x9_evk_android_defconfig
@@ -150,3 +150,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0xC8
 CONFIG_AVB_WARNING_LOGO_ROWS=0xC0
 CONFIG_AHAB_BOOT=y
 CONFIG_LMB_MAX_REGIONS=9
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8ulp_9x9_evk_android_trusty_dual_defconfig b/configs/imx8ulp_9x9_evk_android_trusty_dual_defconfig
index 99c61f4228..d929c04e91 100644
--- a/configs/imx8ulp_9x9_evk_android_trusty_dual_defconfig
+++ b/configs/imx8ulp_9x9_evk_android_trusty_dual_defconfig
@@ -157,3 +157,4 @@ CONFIG_ATTESTATION_ID_MODEL="EVK_8ULP"
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_AHAB_BOOT=y
 CONFIG_LMB_MAX_REGIONS=9
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8ulp_9x9_evk_android_uuu_defconfig b/configs/imx8ulp_9x9_evk_android_uuu_defconfig
index 860e5f1d36..3308c0b76a 100644
--- a/configs/imx8ulp_9x9_evk_android_uuu_defconfig
+++ b/configs/imx8ulp_9x9_evk_android_uuu_defconfig
@@ -144,3 +144,4 @@ CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
 CONFIG_CMD_BOOTA=n
 CONFIG_AHAB_BOOT=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8ulp_evk_android_defconfig b/configs/imx8ulp_evk_android_defconfig
index 57fa5ff1a8..d5b8b93006 100644
--- a/configs/imx8ulp_evk_android_defconfig
+++ b/configs/imx8ulp_evk_android_defconfig
@@ -150,3 +150,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0xC8
 CONFIG_AVB_WARNING_LOGO_ROWS=0xC0
 CONFIG_AHAB_BOOT=y
 CONFIG_LMB_MAX_REGIONS=9
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8ulp_evk_android_dual_defconfig b/configs/imx8ulp_evk_android_dual_defconfig
index e7050ab71c..a2ab29cab8 100644
--- a/configs/imx8ulp_evk_android_dual_defconfig
+++ b/configs/imx8ulp_evk_android_dual_defconfig
@@ -151,3 +151,4 @@ CONFIG_AVB_WARNING_LOGO_ROWS=0xC0
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_AHAB_BOOT=y
 CONFIG_LMB_MAX_REGIONS=9
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8ulp_evk_android_trusty_defconfig b/configs/imx8ulp_evk_android_trusty_defconfig
index f624bedc72..9e56ac6b48 100644
--- a/configs/imx8ulp_evk_android_trusty_defconfig
+++ b/configs/imx8ulp_evk_android_trusty_defconfig
@@ -156,3 +156,4 @@ CONFIG_ATTESTATION_ID_MANUFACTURER="nxp"
 CONFIG_ATTESTATION_ID_MODEL="EVK_8ULP"
 CONFIG_AHAB_BOOT=y
 CONFIG_LMB_MAX_REGIONS=9
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8ulp_evk_android_trusty_dual_defconfig b/configs/imx8ulp_evk_android_trusty_dual_defconfig
index 8e7d7797bd..8be797977a 100644
--- a/configs/imx8ulp_evk_android_trusty_dual_defconfig
+++ b/configs/imx8ulp_evk_android_trusty_dual_defconfig
@@ -157,3 +157,4 @@ CONFIG_ATTESTATION_ID_MODEL="EVK_8ULP"
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_AHAB_BOOT=y
 CONFIG_LMB_MAX_REGIONS=9
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8ulp_evk_android_trusty_secure_unlock_dual_defconfig b/configs/imx8ulp_evk_android_trusty_secure_unlock_dual_defconfig
index b6b358546d..a92d3e6b11 100644
--- a/configs/imx8ulp_evk_android_trusty_secure_unlock_dual_defconfig
+++ b/configs/imx8ulp_evk_android_trusty_secure_unlock_dual_defconfig
@@ -158,3 +158,4 @@ CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SECURE_UNLOCK=y
 CONFIG_AHAB_BOOT=y
 CONFIG_LMB_MAX_REGIONS=9
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8ulp_evk_android_uuu_defconfig b/configs/imx8ulp_evk_android_uuu_defconfig
index e8e5f12685..7078836de1 100644
--- a/configs/imx8ulp_evk_android_uuu_defconfig
+++ b/configs/imx8ulp_evk_android_uuu_defconfig
@@ -144,3 +144,4 @@ CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
 CONFIG_CMD_BOOTA=n
 CONFIG_AHAB_BOOT=y
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8ulp_watch_android_defconfig b/configs/imx8ulp_watch_android_defconfig
index 1197272579..8ae1851dc1 100644
--- a/configs/imx8ulp_watch_android_defconfig
+++ b/configs/imx8ulp_watch_android_defconfig
@@ -137,3 +137,4 @@ CONFIG_AVB_WARNING_LOGO=y
 CONFIG_AVB_WARNING_LOGO_COLS=0xC8
 CONFIG_AVB_WARNING_LOGO_ROWS=0xC0
 CONFIG_LMB_MAX_REGIONS=9
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8ulp_watch_android_dual_defconfig b/configs/imx8ulp_watch_android_dual_defconfig
index 60dffc0c15..833c1b657c 100644
--- a/configs/imx8ulp_watch_android_dual_defconfig
+++ b/configs/imx8ulp_watch_android_dual_defconfig
@@ -138,3 +138,4 @@ CONFIG_AVB_WARNING_LOGO_COLS=0xC8
 CONFIG_AVB_WARNING_LOGO_ROWS=0xC0
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_LMB_MAX_REGIONS=9
+CONFIG_CMD_ERASEENV=y
diff --git a/configs/imx8ulp_watch_android_uuu_defconfig b/configs/imx8ulp_watch_android_uuu_defconfig
index d1307293ae..5d5799855f 100644
--- a/configs/imx8ulp_watch_android_uuu_defconfig
+++ b/configs/imx8ulp_watch_android_uuu_defconfig
@@ -131,3 +131,4 @@ CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
 CONFIG_ANDROID_SUPPORT=y
 CONFIG_ANDROID_AB_SUPPORT=y
 CONFIG_CMD_BOOTA=n
+CONFIG_CMD_ERASEENV=y
diff --git a/drivers/fastboot/fb_fsl/fb_fsl_command.c b/drivers/fastboot/fb_fsl/fb_fsl_command.c
index 11224728a8..61b1a9d580 100644
--- a/drivers/fastboot/fb_fsl/fb_fsl_command.c
+++ b/drivers/fastboot/fb_fsl/fb_fsl_command.c
@@ -472,6 +472,16 @@ static bool endswith(char* s, char* subs) {
 	return true;
 }
 
+static bool erase_uboot_env(void) {
+	FbLockState status;
+	status = fastboot_get_lock_stat();
+	if (status == FASTBOOT_LOCK) {
+		printf("can not erase env when device is in locked state\n");
+		return false;
+	} else
+		return env_erase() ? false : true;
+}
+
 static void flashing(char *cmd, char *response)
 {
 	FbLockState status;
@@ -726,7 +736,14 @@ static void flashing(char *cmd, char *response)
 	}
 #endif /* !CONFIG_AVB_ATX */
 #endif /* CONFIG_IMX_TRUSTY_OS */
-	else if (endswith(cmd, "unlock_critical")) {
+	else if (endswith(cmd, ERASE_UBOOT_ENV)) {
+		if(erase_uboot_env())
+			strcpy(response, "OKAY");
+		else {
+			printf("ERROR erase uboot environment variable failed!");
+		        strcpy(response, "FAILerase uboot environment variable failed!");
+		}
+	} else if (endswith(cmd, "unlock_critical")) {
 		strcpy(response, "OKAY");
 	} else if (endswith(cmd, "unlock")) {
 		printf("flashing unlock.\n");
diff --git a/include/fb_fsl.h b/include/fb_fsl.h
index 7c2d6fbc89..080ea0e44b 100644
--- a/include/fb_fsl.h
+++ b/include/fb_fsl.h
@@ -51,6 +51,7 @@
 #endif
 
 #define FASTBOOT_PARTITION_METADATA "metadata"
+#define ERASE_UBOOT_ENV "erase_uboot_env"
 
 #ifdef CONFIG_ANDROID_AB_SUPPORT
 #define FASTBOOT_PARTITION_BOOT_A "boot_a"