diff options
| author | Ji Luo <ji.luo@nxp.com> | 2019-10-08 18:38:52 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2019-10-09 10:34:01 +0800 |
| commit | de2c42bdd72adb2cb7d6184e05dd3b9369c89727 (patch) | |
| tree | e2a006163f9140f666467b910a012c80667cce8d | |
| parent | f05dd45251ca82cc54e13a616f00744c26faab53 (diff) | |
MA-15582 Fix imx8mn u-boot hang
The u-boot-spl.bin is getting larger and it will break the ddr
firmware which will cause ddr training fail. Disable unnecessary
configs for imx8mn to reduce the spl image size.
Test: boot on imx8mn_evk.
Change-Id: Id105b0adf8669e471752495f78012314efad24c0
Signed-off-by: Ji Luo <ji.luo@nxp.com>
| -rw-r--r-- | configs/imx8mn_ddr4_evk_android_defconfig | 4 | ||||
| -rw-r--r-- | configs/imx8mn_ddr4_evk_android_dual_defconfig | 5 | ||||
| -rw-r--r-- | configs/imx8mn_ddr4_evk_android_trusty_defconfig | 2 | ||||
| -rw-r--r-- | configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig | 1 | ||||
| -rw-r--r-- | include/configs/imx8mn_evk_android.h | 9 |
5 files changed, 13 insertions, 8 deletions
diff --git a/configs/imx8mn_ddr4_evk_android_defconfig b/configs/imx8mn_ddr4_evk_android_defconfig index 185d3cbf3fb..c5c2bf6f26a 100644 --- a/configs/imx8mn_ddr4_evk_android_defconfig +++ b/configs/imx8mn_ddr4_evk_android_defconfig @@ -53,10 +53,6 @@ CONFIG_USB_GADGET=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y -CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y -CONFIG_SPL_USB_SDP_SUPPORT=y -CONFIG_SDP_LOADADDR=0x40400000 CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 diff --git a/configs/imx8mn_ddr4_evk_android_dual_defconfig b/configs/imx8mn_ddr4_evk_android_dual_defconfig index 2d1824b6120..75619a42634 100644 --- a/configs/imx8mn_ddr4_evk_android_dual_defconfig +++ b/configs/imx8mn_ddr4_evk_android_dual_defconfig @@ -53,10 +53,6 @@ CONFIG_USB_GADGET=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y -CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_GADGET_SUPPORT=y -CONFIG_SPL_USB_SDP_SUPPORT=y -CONFIG_SDP_LOADADDR=0x40400000 CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 @@ -74,3 +70,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 6e38560d358..c28d40d58dc 100644 --- a/configs/imx8mn_ddr4_evk_android_trusty_defconfig +++ b/configs/imx8mn_ddr4_evk_android_trusty_defconfig @@ -69,3 +69,5 @@ CONFIG_LZ4=y CONFIG_IMX_TRUSTY_OS=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y +CONFIG_REGEX=n +CONFIG_SPL_DOS_PARTITION=n diff --git a/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig b/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig index 1aefe9c25b6..93ea4e07883 100644 --- a/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig +++ b/configs/imx8mn_ddr4_evk_android_trusty_dual_defconfig @@ -68,6 +68,7 @@ CONFIG_LZ4=y CONFIG_IMX_TRUSTY_OS=y CONFIG_SPL_LIBDISK_SUPPORT=y +CONFIG_SPL_DOS_PARTITION=n CONFIG_SPL_ENV_SUPPORT=y CONFIG_DUAL_BOOTLOADER=y CONFIG_SPL_MMC_WRITE=y diff --git a/include/configs/imx8mn_evk_android.h b/include/configs/imx8mn_evk_android.h index 841b289ba82..99d28186dc2 100644 --- a/include/configs/imx8mn_evk_android.h +++ b/include/configs/imx8mn_evk_android.h @@ -85,7 +85,16 @@ #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_BLK +#undef CONFIG_SHA1 +#undef CONFIG_SHA256 #endif #endif /* IMX8MN_EVK_ANDROID_H */ |