Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 896d7aac49174cd7130ade03379774ca50393fc9

Authored by Ji Luo
1 parent 190d08d498
Exists in smarc_8mm-imx_v2019.04_4.19.35_1.1.0 and in 1 other branch smarc_8m-imx_v2019.04_4.19.35_1.1.0

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>

Showing 13 changed files with 36 additions and 2 deletions Side-by-side Diff

configs/imx8mn_ddr4_evk_android_dual_defconfig
Diff comments   View file @ 896d7aa
... ... @@ -91,4 +91,5 @@
91 91 CONFIG_DUAL_BOOTLOADER=y
92 92 CONFIG_SPL_MMC_WRITE=y
93 93 CONFIG_SPL_LIBDISK_SUPPORT=y
  94 +CONFIG_SPL_DOS_PARTITION=n
configs/imx8mn_ddr4_evk_android_trusty_defconfig
Diff comments   View file @ 896d7aa
... ... @@ -88,4 +88,6 @@
88 88 CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y
89 89 CONFIG_IMX_TRUSTY_OS=y
90 90 CONFIG_SPL_LIBDISK_SUPPORT=y
  91 +CONFIG_SPL_DOS_PARTITION=n
  92 +CONFIG_REGEX=n
configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig
Diff comments   View file @ 896d7aa
... ... @@ -91,4 +91,5 @@
91 91 CONFIG_REGEX=n
92 92 CONFIG_DUAL_BOOTLOADER=y
93 93 CONFIG_SPL_MMC_WRITE=y
  94 +CONFIG_SPL_DOS_PARTITION=n
configs/imx8mn_ddr4_evk_android_trusty_secure_unlock_defconfig
Diff comments   View file @ 896d7aa
... ... @@ -89,4 +89,6 @@
89 89 CONFIG_IMX_TRUSTY_OS=y
90 90 CONFIG_SPL_LIBDISK_SUPPORT=y
91 91 CONFIG_SECURE_UNLOCK=y
  92 +CONFIG_REGEX=n
  93 +CONFIG_SPL_DOS_PARTITION=n
configs/imx8mq_aiy_android_defconfig
Diff comments   View file @ 896d7aa
... ... @@ -85,4 +85,6 @@
85 85 CONFIG_APPEND_BOOTARGS=y
86 86 CONFIG_NR_DRAM_BANKS=1
87 87 CONFIG_AVB_SUPPORT=y
  88 +CONFIG_REGEX=n
  89 +CONFIG_SPL_DOS_PARTITION=n
configs/imx8mq_aiy_android_trusty_defconfig
Diff comments   View file @ 896d7aa
... ... @@ -86,4 +86,5 @@
86 86 CONFIG_IMX_TRUSTY_OS=y
87 87 CONFIG_NR_DRAM_BANKS=1
88 88 CONFIG_AVB_SUPPORT=y
  89 +CONFIG_SPL_DOS_PARTITION=n
configs/imx8mq_aiy_android_trusty_dual_defconfig
Diff comments   View file @ 896d7aa
... ... @@ -87,4 +87,5 @@
87 87 CONFIG_NR_DRAM_BANKS=1
88 88 CONFIG_AVB_SUPPORT=y
89 89 CONFIG_DUAL_BOOTLOADER=y
  90 +CONFIG_SPL_DOS_PARTITION=n
configs/imx8mq_aiy_android_trusty_secure_unlock_defconfig
Diff comments   View file @ 896d7aa
... ... @@ -87,4 +87,5 @@
87 87 CONFIG_NR_DRAM_BANKS=1
88 88 CONFIG_AVB_SUPPORT=y
89 89 CONFIG_SECURE_UNLOCK=y
  90 +CONFIG_SPL_DOS_PARTITION=n
configs/imx8mq_evk_android_dual_defconfig
Diff comments   View file @ 896d7aa
... ... @@ -87,4 +87,5 @@
87 87 CONFIG_DUAL_BOOTLOADER=y
88 88 CONFIG_SPL_MMC_WRITE=y
89 89 CONFIG_REGEX=n
  90 +CONFIG_SPL_DOS_PARTITION=n
configs/imx8mq_evk_android_trusty_dual_defconfig
Diff comments   View file @ 896d7aa
... ... @@ -88,4 +88,5 @@
88 88 CONFIG_SPL_MMC_WRITE=y
89 89 CONFIG_IMX_TRUSTY_OS=y
90 90 CONFIG_REGEX=n
  91 +CONFIG_SPL_DOS_PARTITION=n
include/configs/imx8mn_evk_android.h
Diff comments   View file @ 896d7aa
... ... @@ -72,6 +72,18 @@
72 72 #define NS_ARCH_ARM64 1
73 73 #endif
74 74  
  75 +#ifdef CONFIG_SPL_BUILD
  76 +#define CONFIG_ENV_IS_NOWHERE
  77 +#undef CONFIG_ANDROID_BOOT_IMAGE
  78 +#undef CONFIG_ANDROID_RECOVERY
  79 +#undef CONFIG_ENV_IS_IN_MMC
  80 +#undef CONFIG_CMD_UUID
  81 +#undef CONFIG_LIB_UUID
  82 +#undef CONFIG_LIB_RAND
  83 +#undef CONFIG_SHA1
  84 +#undef CONFIG_SHA256
  85 +#endif
  86 +
75 87 #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED
76 88  
77 89 #endif /* IMX8MN_EVK_ANDROID_H */
include/configs/imx8mq_aiy_android.h
Diff comments   View file @ 896d7aa
... ... @@ -76,10 +76,16 @@
76 76  
77 77 #define CONFIG_SPL_SHA256
78 78 #define CONFIG_ENV_IS_NOWHERE
  79 +#undef CONFIG_ANDROID_BOOT_IMAGE
  80 +#undef CONFIG_ANDROID_RECOVERY
79 81 #undef CONFIG_ENV_IS_IN_MMC
80 82 #undef CONFIG_BLK
81 83 #undef CONFIG_CMD_UUID
  84 +#undef CONFIG_LIB_UUID
82 85 #undef CONFIG_LIB_RAND
  86 +#undef CONFIG_SHA1
  87 +#undef CONFIG_SHA256
  88 +
83 89  
84 90 #ifdef AVB_RPMB
85 91 #define BOOTLOADER_RBIDX_OFFSET 0x1E000
include/configs/imx8mq_evk_android.h
Diff comments   View file @ 896d7aa
... ... @@ -73,9 +73,14 @@
73 73  
74 74 #ifdef CONFIG_SPL_BUILD
75 75 #define CONFIG_ENV_IS_NOWHERE
  76 +#undef CONFIG_ANDROID_BOOT_IMAGE
  77 +#undef CONFIG_ANDROID_RECOVERY
76 78 #undef CONFIG_ENV_IS_IN_MMC
  79 +#undef CONFIG_LIB_UUID
77 80 #undef CONFIG_CMD_UUID
78 81 #undef CONFIG_LIB_RAND
  82 +#undef CONFIG_SHA1
  83 +#undef CONFIG_SHA256
79 84 #endif
80 85  
81 86 #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED