From 8f4025381da380be6b75e075b9d4066de69623ae Mon Sep 17 00:00:00 2001 From: Jessie Hao Date: Wed, 18 Sep 2019 16:21:48 +0800 Subject: [PATCH] MA-15467 Fix imx8mq build break Disable some unnecessary configs to decrease the spl size. Test: build and boot on imx8mq_evk. Change-Id: I6ad56af21ecf538c9e920581d870cce0d2fec286 Signed-off-by: Ji Luo --- configs/imx8mq_evk_android_defconfig | 5 +---- configs/imx8mq_evk_android_dual_defconfig | 4 +--- configs/imx8mq_evk_android_trusty_defconfig | 4 +--- configs/imx8mq_evk_android_trusty_dual_defconfig | 4 +--- configs/imx8mq_evk_android_trusty_secure_unlock_defconfig | 4 +--- include/configs/imx8mq_evk_android.h | 7 +++++++ 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/configs/imx8mq_evk_android_defconfig b/configs/imx8mq_evk_android_defconfig index 300b4c7a6a..86f57622e1 100644 --- a/configs/imx8mq_evk_android_defconfig +++ b/configs/imx8mq_evk_android_defconfig @@ -72,13 +72,10 @@ CONFIG_FASTBOOT_BUF_ADDR=0x42800000 CONFIG_FASTBOOT_BUF_SIZE=0x19000000 CONFIG_FASTBOOT_FLASH=y CONFIG_EFI_PARTITION=y -CONFIG_SDP_LOADADDR=0x40400000 CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_IMX8M=y CONFIG_USB_XHCI_DWC3=y @@ -86,4 +83,4 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_LIBAVB=y CONFIG_APPEND_BOOTARGS=y - +CONFIG_REGEX=n diff --git a/configs/imx8mq_evk_android_dual_defconfig b/configs/imx8mq_evk_android_dual_defconfig index 0b3ce68fe8..bb1a14624d 100644 --- a/configs/imx8mq_evk_android_dual_defconfig +++ b/configs/imx8mq_evk_android_dual_defconfig @@ -72,13 +72,10 @@ CONFIG_FASTBOOT_BUF_ADDR=0x42800000 CONFIG_FASTBOOT_BUF_SIZE=0x19000000 CONFIG_FASTBOOT_FLASH=y CONFIG_EFI_PARTITION=y -CONFIG_SDP_LOADADDR=0x40400000 CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_IMX8M=y CONFIG_USB_XHCI_DWC3=y @@ -89,3 +86,4 @@ CONFIG_APPEND_BOOTARGS=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DUAL_BOOTLOADER=y CONFIG_SPL_MMC_WRITE=y +CONFIG_REGEX=n diff --git a/configs/imx8mq_evk_android_trusty_defconfig b/configs/imx8mq_evk_android_trusty_defconfig index 8264f13d3c..fffb62bd7c 100644 --- a/configs/imx8mq_evk_android_trusty_defconfig +++ b/configs/imx8mq_evk_android_trusty_defconfig @@ -72,13 +72,10 @@ CONFIG_FASTBOOT_BUF_ADDR=0x42800000 CONFIG_FASTBOOT_BUF_SIZE=0x19000000 CONFIG_FASTBOOT_FLASH=y CONFIG_EFI_PARTITION=y -CONFIG_SDP_LOADADDR=0x40400000 CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_IMX8M=y CONFIG_USB_XHCI_DWC3=y @@ -87,3 +84,4 @@ CONFIG_USB_DWC3_GADGET=y CONFIG_LIBAVB=y CONFIG_APPEND_BOOTARGS=y CONFIG_IMX_TRUSTY_OS=y +CONFIG_REGEX=n diff --git a/configs/imx8mq_evk_android_trusty_dual_defconfig b/configs/imx8mq_evk_android_trusty_dual_defconfig index c33f04baf9..2ac06b504b 100644 --- a/configs/imx8mq_evk_android_trusty_dual_defconfig +++ b/configs/imx8mq_evk_android_trusty_dual_defconfig @@ -72,13 +72,10 @@ CONFIG_FASTBOOT_BUF_ADDR=0x42800000 CONFIG_FASTBOOT_BUF_SIZE=0x19000000 CONFIG_FASTBOOT_FLASH=y CONFIG_EFI_PARTITION=y -CONFIG_SDP_LOADADDR=0x40400000 CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_IMX8M=y CONFIG_USB_XHCI_DWC3=y @@ -90,3 +87,4 @@ CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DUAL_BOOTLOADER=y CONFIG_SPL_MMC_WRITE=y CONFIG_IMX_TRUSTY_OS=y +CONFIG_REGEX=n diff --git a/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig b/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig index da382d392f..a48732215c 100644 --- a/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig +++ b/configs/imx8mq_evk_android_trusty_secure_unlock_defconfig @@ -72,13 +72,10 @@ CONFIG_FASTBOOT_BUF_ADDR=0x42800000 CONFIG_FASTBOOT_BUF_SIZE=0x19000000 CONFIG_FASTBOOT_FLASH=y CONFIG_EFI_PARTITION=y -CONFIG_SDP_LOADADDR=0x40400000 CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_SPL_USB_GADGET=y -CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_IMX8M=y CONFIG_USB_XHCI_DWC3=y @@ -88,3 +85,4 @@ CONFIG_LIBAVB=y CONFIG_APPEND_BOOTARGS=y CONFIG_IMX_TRUSTY_OS=y CONFIG_SECURE_UNLOCK=y +CONFIG_REGEX=n diff --git a/include/configs/imx8mq_evk_android.h b/include/configs/imx8mq_evk_android.h index 01aa28cfe3..0594fcfac2 100644 --- a/include/configs/imx8mq_evk_android.h +++ b/include/configs/imx8mq_evk_android.h @@ -71,6 +71,13 @@ #define NS_ARCH_ARM64 1 #endif +#ifdef CONFIG_SPL_BUILD +#define CONFIG_ENV_IS_NOWHERE +#undef CONFIG_ENV_IS_IN_MMC +#undef CONFIG_CMD_UUID +#undef CONFIG_LIB_RAND +#endif + #define AVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED #endif /* IMX8MQ_EVK_ANDROID_H */ -- 2.17.1