MA-17046-4 Enable avb warning feature for standard android

Open configs to enable the avb warning logo feature for all
standard android platforms.

Test: Warning logo show on imx7ulp/imx8m/imx8q.

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

30 files changed, 90 insertions, 0 deletions

diff --git a/configs/imx7ulp_evk_android_defconfig b/configs/imx7ulp_evk_android_defconfig
index 0bc7d22ab5..f633e1f01c 100644
--- a/configs/imx7ulp_evk_android_defconfig
+++ b/configs/imx7ulp_evk_android_defconfig
@@ -102,3 +102,6 @@ CONFIG_CMD_BOOTA=y
 CONFIG_LIBAVB=y
 CONFIG_AVB_SUPPORT=y
 CONFIG_APPEND_BOOTARGS=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x0
+CONFIG_AVB_WARNING_LOGO_ROWS=0x0
diff --git a/configs/imx8mm_ddr4_evk_android_defconfig b/configs/imx8mm_ddr4_evk_android_defconfig
index 65e4e3dd8b..745c9fa983 100644
--- a/configs/imx8mm_ddr4_evk_android_defconfig
+++ b/configs/imx8mm_ddr4_evk_android_defconfig
@@ -144,3 +144,6 @@ CONFIG_CMD_BOOTA=y
 CONFIG_LIBAVB=y
 CONFIG_AVB_SUPPORT=y
 CONFIG_APPEND_BOOTARGS=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mm_evk_android_defconfig b/configs/imx8mm_evk_android_defconfig
index 6cbfdfea1d..85bf5f08de 100644
--- a/configs/imx8mm_evk_android_defconfig
+++ b/configs/imx8mm_evk_android_defconfig
@@ -149,3 +149,6 @@ CONFIG_CMD_BOOTA=y
 CONFIG_LIBAVB=y
 CONFIG_AVB_SUPPORT=y
 CONFIG_APPEND_BOOTARGS=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mm_evk_android_dual_defconfig b/configs/imx8mm_evk_android_dual_defconfig
index c0e1619b29..d9ab3550f5 100644
--- a/configs/imx8mm_evk_android_dual_defconfig
+++ b/configs/imx8mm_evk_android_dual_defconfig
@@ -151,3 +151,6 @@ CONFIG_AVB_SUPPORT=y
 CONFIG_APPEND_BOOTARGS=y
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SPL_MMC_WRITE=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mm_evk_android_trusty_defconfig b/configs/imx8mm_evk_android_trusty_defconfig
index 05371beceb..f889a7c195 100644
--- a/configs/imx8mm_evk_android_trusty_defconfig
+++ b/configs/imx8mm_evk_android_trusty_defconfig
@@ -153,3 +153,6 @@ CONFIG_CMD_MMC_RPMB=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mm_evk_android_trusty_dual_defconfig b/configs/imx8mm_evk_android_trusty_dual_defconfig
index f7a5cef5c5..d80ad90fe4 100644
--- a/configs/imx8mm_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mm_evk_android_trusty_dual_defconfig
@@ -155,3 +155,6 @@ CONFIG_CMD_MMC_RPMB=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig
index e8bba7fb15..fde413b157 100644
--- a/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig
+++ b/configs/imx8mm_evk_android_trusty_secure_unlock_defconfig
@@ -155,3 +155,6 @@ CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
 CONFIG_SECURE_UNLOCK=y
 CONFIG_IMX_HAB=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mn_ddr4_evk_android_defconfig b/configs/imx8mn_ddr4_evk_android_defconfig
index e19a9d4b43..2d939663d5 100644
--- a/configs/imx8mn_ddr4_evk_android_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_defconfig
@@ -149,3 +149,6 @@ CONFIG_LIBAVB=y
 CONFIG_AVB_SUPPORT=y
 CONFIG_APPEND_BOOTARGS=y
 CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mn_evk_android_defconfig b/configs/imx8mn_evk_android_defconfig
index 186c485425..327fc70998 100644
--- a/configs/imx8mn_evk_android_defconfig
+++ b/configs/imx8mn_evk_android_defconfig
@@ -149,3 +149,6 @@ CONFIG_LIBAVB=y
 CONFIG_AVB_SUPPORT=y
 CONFIG_APPEND_BOOTARGS=y
 CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mn_evk_android_dual_defconfig b/configs/imx8mn_evk_android_dual_defconfig
index 1e0c982177..689ffd450d 100644
--- a/configs/imx8mn_evk_android_dual_defconfig
+++ b/configs/imx8mn_evk_android_dual_defconfig
@@ -151,3 +151,6 @@ CONFIG_APPEND_BOOTARGS=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SPL_MMC_WRITE=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mn_evk_android_trusty_defconfig b/configs/imx8mn_evk_android_trusty_defconfig
index 2fc3642466..1ef54f268e 100644
--- a/configs/imx8mn_evk_android_trusty_defconfig
+++ b/configs/imx8mn_evk_android_trusty_defconfig
@@ -153,3 +153,6 @@ CONFIG_CMD_MMC_RPMB=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mn_evk_android_trusty_dual_defconfig b/configs/imx8mn_evk_android_trusty_dual_defconfig
index a23bd188b6..9f3443a8f6 100644
--- a/configs/imx8mn_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mn_evk_android_trusty_dual_defconfig
@@ -155,3 +155,6 @@ CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SPL_MMC_WRITE=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig
index 56596f6fbf..fed58b0e86 100644
--- a/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig
+++ b/configs/imx8mn_evk_android_trusty_secure_unlock_defconfig
@@ -155,3 +155,6 @@ CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
 CONFIG_SECURE_UNLOCK=y
 CONFIG_IMX_HAB=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mp_evk_android_defconfig b/configs/imx8mp_evk_android_defconfig
index 189211fa43..a4bd89e62d 100644
--- a/configs/imx8mp_evk_android_defconfig
+++ b/configs/imx8mp_evk_android_defconfig
@@ -161,3 +161,6 @@ CONFIG_LIBAVB=y
 CONFIG_AVB_SUPPORT=y
 CONFIG_APPEND_BOOTARGS=y
 CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mp_evk_android_dual_defconfig b/configs/imx8mp_evk_android_dual_defconfig
index 8b8ba1c888..7feb37625e 100644
--- a/configs/imx8mp_evk_android_dual_defconfig
+++ b/configs/imx8mp_evk_android_dual_defconfig
@@ -163,3 +163,6 @@ CONFIG_APPEND_BOOTARGS=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SPL_MMC_WRITE=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mp_evk_android_trusty_defconfig b/configs/imx8mp_evk_android_trusty_defconfig
index 25bcefed17..dbf39ec047 100644
--- a/configs/imx8mp_evk_android_trusty_defconfig
+++ b/configs/imx8mp_evk_android_trusty_defconfig
@@ -165,3 +165,6 @@ CONFIG_CMD_MMC_RPMB=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mp_evk_android_trusty_dual_defconfig b/configs/imx8mp_evk_android_trusty_dual_defconfig
index 6ca05b2354..04c5c2a93f 100644
--- a/configs/imx8mp_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mp_evk_android_trusty_dual_defconfig
@@ -167,3 +167,6 @@ CONFIG_CMD_MMC_RPMB=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mp_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mp_evk_android_trusty_secure_unlock_defconfig
index 653781b353..c096561564 100644
--- a/configs/imx8mp_evk_android_trusty_secure_unlock_defconfig
+++ b/configs/imx8mp_evk_android_trusty_secure_unlock_defconfig
@@ -167,3 +167,6 @@ CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
 CONFIG_SECURE_UNLOCK=y
 CONFIG_IMX_HAB=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x320
+CONFIG_AVB_WARNING_LOGO_ROWS=0xc0
diff --git a/configs/imx8mq_evk_android_defconfig b/configs/imx8mq_evk_android_defconfig
index 9859be11ae..888271236f 100644
--- a/configs/imx8mq_evk_android_defconfig
+++ b/configs/imx8mq_evk_android_defconfig
@@ -141,3 +141,6 @@ CONFIG_CMD_BOOTA=y
 CONFIG_LIBAVB=y
 CONFIG_AVB_SUPPORT=y
 CONFIG_APPEND_BOOTARGS=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
+CONFIG_AVB_WARNING_LOGO_ROWS=0x60
diff --git a/configs/imx8mq_evk_android_dual_defconfig b/configs/imx8mq_evk_android_dual_defconfig
index 9abb48e972..af12754185 100644
--- a/configs/imx8mq_evk_android_dual_defconfig
+++ b/configs/imx8mq_evk_android_dual_defconfig
@@ -143,3 +143,6 @@ CONFIG_AVB_SUPPORT=y
 CONFIG_APPEND_BOOTARGS=y
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SPL_MMC_WRITE=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
+CONFIG_AVB_WARNING_LOGO_ROWS=0x60
diff --git a/configs/imx8mq_evk_android_trusty_defconfig b/configs/imx8mq_evk_android_trusty_defconfig
index 6c7425aa02..272a4806fd 100644
--- a/configs/imx8mq_evk_android_trusty_defconfig
+++ b/configs/imx8mq_evk_android_trusty_defconfig
@@ -145,3 +145,6 @@ CONFIG_CMD_MMC_RPMB=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
+CONFIG_AVB_WARNING_LOGO_ROWS=0x60
diff --git a/configs/imx8mq_evk_android_trusty_dual_defconfig b/configs/imx8mq_evk_android_trusty_dual_defconfig
index 3f0268d729..9947b8cadc 100644
--- a/configs/imx8mq_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mq_evk_android_trusty_dual_defconfig
@@ -147,3 +147,6 @@ CONFIG_CMD_MMC_RPMB=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
+CONFIG_AVB_WARNING_LOGO_ROWS=0x60
diff --git a/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig
index 399360b913..c0ebe34ad3 100644
--- a/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig
+++ b/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig
@@ -147,3 +147,6 @@ CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
 CONFIG_SECURE_UNLOCK=y
 CONFIG_IMX_HAB=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
+CONFIG_AVB_WARNING_LOGO_ROWS=0x60
diff --git a/configs/imx8qm_mek_android_defconfig b/configs/imx8qm_mek_android_defconfig
index 31d5ff8341..fec2840430 100644
--- a/configs/imx8qm_mek_android_defconfig
+++ b/configs/imx8qm_mek_android_defconfig
@@ -182,3 +182,6 @@ CONFIG_CMD_BOOTA=y
 CONFIG_LIBAVB=y
 CONFIG_AVB_SUPPORT=y
 CONFIG_APPEND_BOOTARGS=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
+CONFIG_AVB_WARNING_LOGO_ROWS=0x60
diff --git a/configs/imx8qm_mek_android_hdmi_defconfig b/configs/imx8qm_mek_android_hdmi_defconfig
index 46e01faef9..fc1a376380 100644
--- a/configs/imx8qm_mek_android_hdmi_defconfig
+++ b/configs/imx8qm_mek_android_hdmi_defconfig
@@ -183,3 +183,6 @@ CONFIG_LIBAVB=y
 CONFIG_AVB_SUPPORT=y
 CONFIG_APPEND_BOOTARGS=y
 CONFIG_IMX_LOAD_HDMI_FIMRWARE_TX=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
+CONFIG_AVB_WARNING_LOGO_ROWS=0x60
diff --git a/configs/imx8qm_mek_android_trusty_defconfig b/configs/imx8qm_mek_android_trusty_defconfig
index f179f97a56..1edc5f0a22 100644
--- a/configs/imx8qm_mek_android_trusty_defconfig
+++ b/configs/imx8qm_mek_android_trusty_defconfig
@@ -187,3 +187,6 @@ CONFIG_CMD_MMC_RPMB=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
+CONFIG_AVB_WARNING_LOGO_ROWS=0x60
diff --git a/configs/imx8qm_mek_android_trusty_secure_unlock_defconfig b/configs/imx8qm_mek_android_trusty_secure_unlock_defconfig
index c4900868e2..56921d5974 100644
--- a/configs/imx8qm_mek_android_trusty_secure_unlock_defconfig
+++ b/configs/imx8qm_mek_android_trusty_secure_unlock_defconfig
@@ -189,3 +189,6 @@ CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
 CONFIG_SECURE_UNLOCK=y
 CONFIG_AHAB_BOOT=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
+CONFIG_AVB_WARNING_LOGO_ROWS=0x60
diff --git a/configs/imx8qxp_mek_android_defconfig b/configs/imx8qxp_mek_android_defconfig
index fa6ebbc8f5..2dbd3f3f91 100644
--- a/configs/imx8qxp_mek_android_defconfig
+++ b/configs/imx8qxp_mek_android_defconfig
@@ -183,3 +183,6 @@ CONFIG_CMD_BOOTA=y
 CONFIG_LIBAVB=y
 CONFIG_AVB_SUPPORT=y
 CONFIG_APPEND_BOOTARGS=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
+CONFIG_AVB_WARNING_LOGO_ROWS=0x60
diff --git a/configs/imx8qxp_mek_android_trusty_defconfig b/configs/imx8qxp_mek_android_trusty_defconfig
index 511dbc6381..f966e814bc 100644
--- a/configs/imx8qxp_mek_android_trusty_defconfig
+++ b/configs/imx8qxp_mek_android_trusty_defconfig
@@ -188,3 +188,6 @@ CONFIG_CMD_MMC_RPMB=y
 CONFIG_SUPPORT_EMMC_RPMB=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
+CONFIG_AVB_WARNING_LOGO_ROWS=0x60
diff --git a/configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig b/configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig
index 6a51cee562..816be46343 100644
--- a/configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig
+++ b/configs/imx8qxp_mek_android_trusty_secure_unlock_defconfig
@@ -190,3 +190,6 @@ CONFIG_IMX_TRUSTY_OS=y
 CONFIG_TRUSTY_UNLOCK_PERMISSION=y
 CONFIG_SECURE_UNLOCK=y
 CONFIG_AHAB_BOOT=y
+CONFIG_AVB_WARNING_LOGO=y
+CONFIG_AVB_WARNING_LOGO_COLS=0x1E0
+CONFIG_AVB_WARNING_LOGO_ROWS=0x60