MA-15595 imx8m: Remove unnecessary configs to decrease spl size

imx8mq/imx8mn has very limited ocram/tcm size, oversized spl image
will cause build break or boot hang, remove more unnecessary configs
fot imx8mq/imx8mn to reduce the spl size.

Test: boot.

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

diff --git a/configs/imx8mn_ddr4_evk_android_dual_defconfig b/configs/imx8mn_ddr4_evk_android_dual_defconfig
index eb4482b..cfabfd4 100644 (file)
--- a/configs/imx8mn_ddr4_evk_android_dual_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_dual_defconfig
@@ -91,3 +91,4 @@ CONFIG_REGEX=n
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SPL_MMC_WRITE=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SPL_DOS_PARTITION=n

diff --git a/configs/imx8mn_ddr4_evk_android_trusty_defconfig b/configs/imx8mn_ddr4_evk_android_trusty_defconfig
index 833153c..13b2639 100644 (file)
--- a/configs/imx8mn_ddr4_evk_android_trusty_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_trusty_defconfig
@@ -88,3 +88,5 @@ CONFIG_LIBAVB=y
 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SPL_DOS_PARTITION=n
+CONFIG_REGEX=n

diff --git a/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig b/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig
index dabea79..309e895 100644 (file)
--- a/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig
@@ -91,3 +91,4 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_REGEX=n
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SPL_MMC_WRITE=y
+CONFIG_SPL_DOS_PARTITION=n

diff --git a/configs/imx8mn_ddr4_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mn_ddr4_evk_android_trusty_secure_unlock_defconfig
index f8fa37c..8764404 100644 (file)
--- a/configs/imx8mn_ddr4_evk_android_trusty_secure_unlock_defconfig
+++ b/configs/imx8mn_ddr4_evk_android_trusty_secure_unlock_defconfig
@@ -89,3 +89,5 @@ CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SECURE_UNLOCK=y
+CONFIG_REGEX=n
+CONFIG_SPL_DOS_PARTITION=n

diff --git a/configs/imx8mq_aiy_android_defconfig b/configs/imx8mq_aiy_android_defconfig
index ca90f44..a07de51 100644 (file)
--- a/configs/imx8mq_aiy_android_defconfig
+++ b/configs/imx8mq_aiy_android_defconfig
@@ -85,4 +85,5 @@ CONFIG_LIBAVB=y
 CONFIG_APPEND_BOOTARGS=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_AVB_SUPPORT=y
-
+CONFIG_REGEX=n
+CONFIG_SPL_DOS_PARTITION=n

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

diff --git a/configs/imx8mq_aiy_android_trusty_dual_defconfig b/configs/imx8mq_aiy_android_trusty_dual_defconfig
index b58b204..465a97a 100644 (file)
--- a/configs/imx8mq_aiy_android_trusty_dual_defconfig
+++ b/configs/imx8mq_aiy_android_trusty_dual_defconfig
@@ -87,3 +87,4 @@ CONFIG_IMX_TRUSTY_OS=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_AVB_SUPPORT=y
 CONFIG_DUAL_BOOTLOADER=y
+CONFIG_SPL_DOS_PARTITION=n

diff --git a/configs/imx8mq_aiy_android_trusty_secure_unlock_defconfig b/configs/imx8mq_aiy_android_trusty_secure_unlock_defconfig
index b120e3f..b3cf393 100644 (file)
--- a/configs/imx8mq_aiy_android_trusty_secure_unlock_defconfig
+++ b/configs/imx8mq_aiy_android_trusty_secure_unlock_defconfig
@@ -87,3 +87,4 @@ CONFIG_IMX_TRUSTY_OS=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_AVB_SUPPORT=y
 CONFIG_SECURE_UNLOCK=y
+CONFIG_SPL_DOS_PARTITION=n

diff --git a/configs/imx8mq_evk_android_dual_defconfig b/configs/imx8mq_evk_android_dual_defconfig
index bb1a146..a328861 100644 (file)
--- a/configs/imx8mq_evk_android_dual_defconfig
+++ b/configs/imx8mq_evk_android_dual_defconfig
@@ -87,3 +87,4 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SPL_MMC_WRITE=y
 CONFIG_REGEX=n
+CONFIG_SPL_DOS_PARTITION=n

diff --git a/configs/imx8mq_evk_android_trusty_dual_defconfig b/configs/imx8mq_evk_android_trusty_dual_defconfig
index 2ac06b5..d71220f 100644 (file)
--- a/configs/imx8mq_evk_android_trusty_dual_defconfig
+++ b/configs/imx8mq_evk_android_trusty_dual_defconfig
@@ -88,3 +88,4 @@ CONFIG_DUAL_BOOTLOADER=y
 CONFIG_SPL_MMC_WRITE=y
 CONFIG_IMX_TRUSTY_OS=y
 CONFIG_REGEX=n
+CONFIG_SPL_DOS_PARTITION=n

diff --git a/include/configs/imx8mn_evk_android.h b/include/configs/imx8mn_evk_android.h
index c21647f..9f07019 100644 (file)
--- a/include/configs/imx8mn_evk_android.h
+++ b/include/configs/imx8mn_evk_android.h
@@ -72,6 +72,18 @@
 #define NS_ARCH_ARM64 1
 #endif
 
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_ENV_IS_NOWHERE
+#undef CONFIG_ANDROID_BOOT_IMAGE
+#undef CONFIG_ANDROID_RECOVERY
+#undef CONFIG_ENV_IS_IN_MMC
+#undef CONFIG_CMD_UUID
+#undef CONFIG_LIB_UUID
+#undef CONFIG_LIB_RAND
+#undef CONFIG_SHA1
+#undef CONFIG_SHA256
+#endif
+
 #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED
 
 #endif /* IMX8MN_EVK_ANDROID_H */

diff --git a/include/configs/imx8mq_aiy_android.h b/include/configs/imx8mq_aiy_android.h
index 7d1e694..7c9d9e6 100644 (file)
--- a/include/configs/imx8mq_aiy_android.h
+++ b/include/configs/imx8mq_aiy_android.h
@@ -76,10 +76,16 @@
 
 #define CONFIG_SPL_SHA256
 #define CONFIG_ENV_IS_NOWHERE
+#undef CONFIG_ANDROID_BOOT_IMAGE
+#undef CONFIG_ANDROID_RECOVERY
 #undef CONFIG_ENV_IS_IN_MMC
 #undef CONFIG_BLK
 #undef CONFIG_CMD_UUID
+#undef CONFIG_LIB_UUID
 #undef CONFIG_LIB_RAND
+#undef CONFIG_SHA1
+#undef CONFIG_SHA256
+
 
 #ifdef AVB_RPMB
 #define BOOTLOADER_RBIDX_OFFSET  0x1E000

diff --git a/include/configs/imx8mq_evk_android.h b/include/configs/imx8mq_evk_android.h
index 0594fcf..ed05ec7 100644 (file)
--- a/include/configs/imx8mq_evk_android.h
+++ b/include/configs/imx8mq_evk_android.h
@@ -73,9 +73,14 @@
 
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_ENV_IS_NOWHERE
+#undef CONFIG_ANDROID_BOOT_IMAGE
+#undef CONFIG_ANDROID_RECOVERY
 #undef CONFIG_ENV_IS_IN_MMC
+#undef CONFIG_LIB_UUID
 #undef CONFIG_CMD_UUID
 #undef CONFIG_LIB_RAND
+#undef CONFIG_SHA1
+#undef CONFIG_SHA256
 #endif
 
 #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED