MLK-20559-8 imx8qm/qxp: Update MEK board codes to support UUU

Enable the SPL SDP driver and USB driver in MEK board codes and defconfigs.
Because the USB driver needs larger malloc pool, increase the malloc size
and disable simple malloc

Signed-off-by: Ye Li <ye.li@nxp.com>

8 files changed, 39 insertions, 36 deletions

diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig
index 98bc128a86..46ece67755 100644
--- a/configs/imx8qm_mek_defconfig
+++ b/configs/imx8qm_mek_defconfig
@@ -31,14 +31,10 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_IMX8=y
 
 CONFIG_DM_USB=y
-CONFIG_USB_EHCI_HCD=y
 
-CONFIG_CMD_USB=y
 CONFIG_USB=y
-CONFIG_USB_STORAGE=y
 CONFIG_USB_TCPC=y
 
-CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
 # CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/imx8qm_mek_fspi_defconfig b/configs/imx8qm_mek_fspi_defconfig
index 55596b27c1..f5ceb6933b 100644
--- a/configs/imx8qm_mek_fspi_defconfig
+++ b/configs/imx8qm_mek_fspi_defconfig
@@ -31,14 +31,10 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_IMX8=y
 
 CONFIG_DM_USB=y
-CONFIG_USB_EHCI_HCD=y
 
-CONFIG_CMD_USB=y
 CONFIG_USB=y
-CONFIG_USB_STORAGE=y
 CONFIG_USB_TCPC=y
 
-CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
 # CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/imx8qm_mek_spl_defconfig b/configs/imx8qm_mek_spl_defconfig
index 24a80e2d0e..e56856a7bc 100644
--- a/configs/imx8qm_mek_spl_defconfig
+++ b/configs/imx8qm_mek_spl_defconfig
@@ -22,21 +22,28 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_BOARD_INIT=y
-CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_SPL_OF_CONTROL=y
 
+CONFIG_FASTBOOT=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_CMD_FASTBOOT=y
+CONFIG_ANDROID_BOOT_IMAGE=y
+CONFIG_FSL_FASTBOOT=y
+CONFIG_FASTBOOT_BUF_ADDR=0x82800000
+CONFIG_FASTBOOT_BUF_SIZE=0x40000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_FASTBOOT_USB_DEV=1
+
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_IMX8=y
 
 CONFIG_DM_USB=y
-CONFIG_USB_EHCI_HCD=y
 
-CONFIG_CMD_USB=y
 CONFIG_USB=y
-CONFIG_USB_STORAGE=y
+CONFIG_USB_TCPC=y
 
-CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
 # CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
@@ -60,6 +67,7 @@ CONFIG_DM_MMC=y
 CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS400_SUPPORT=y
+CONFIG_EFI_PARTITION=y
 CONFIG_FSL_FSPI=y
 CONFIG_DM_SPI=y
 CONFIG_DM_SPI_FLASH=y
@@ -94,3 +102,9 @@ CONFIG_ENV_IS_IN_MMC=y
 
 CONFIG_SMC_FUSE=y
 CONFIG_CMD_MEMTEST=y
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_GADGET_SUPPORT=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_SDP_USB_DEV=1
+CONFIG_SDP_LOADADDR=0x80400000
diff --git a/configs/imx8qm_mek_spl_fspi_defconfig b/configs/imx8qm_mek_spl_fspi_defconfig
index 8ab9b8f14d..1a490b0dbc 100644
--- a/configs/imx8qm_mek_spl_fspi_defconfig
+++ b/configs/imx8qm_mek_spl_fspi_defconfig
@@ -22,7 +22,6 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_BOARD_INIT=y
-CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_OF_CONTROL=y
@@ -44,13 +43,10 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_IMX8=y
 
 CONFIG_DM_USB=y
-CONFIG_USB_EHCI_HCD=y
 
-CONFIG_CMD_USB=y
 CONFIG_USB=y
-CONFIG_USB_STORAGE=y
+CONFIG_USB_TCPC=y
 
-CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
 # CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
@@ -109,3 +105,9 @@ CONFIG_ENV_IS_IN_SPL_FLASH=y
 
 CONFIG_SMC_FUSE=y
 CONFIG_CMD_MEMTEST=y
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_GADGET_SUPPORT=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_SDP_USB_DEV=1
+CONFIG_SDP_LOADADDR=0x80400000
diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig
index 2821782e97..b81d1b3242 100644
--- a/configs/imx8qxp_mek_defconfig
+++ b/configs/imx8qxp_mek_defconfig
@@ -33,14 +33,10 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_IMX8=y
 
 CONFIG_DM_USB=y
-CONFIG_USB_EHCI_HCD=y
 
-CONFIG_CMD_USB=y
 CONFIG_USB=y
-CONFIG_USB_STORAGE=y
 CONFIG_USB_TCPC=y
 
-CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
 # CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/imx8qxp_mek_fspi_defconfig b/configs/imx8qxp_mek_fspi_defconfig
index 15f0680490..a63f38d112 100644
--- a/configs/imx8qxp_mek_fspi_defconfig
+++ b/configs/imx8qxp_mek_fspi_defconfig
@@ -33,14 +33,10 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_IMX8=y
 
 CONFIG_DM_USB=y
-CONFIG_USB_EHCI_HCD=y
 
-CONFIG_CMD_USB=y
 CONFIG_USB=y
-CONFIG_USB_STORAGE=y
 CONFIG_USB_TCPC=y
 
-CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
 # CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
diff --git a/configs/imx8qxp_mek_spl_defconfig b/configs/imx8qxp_mek_spl_defconfig
index f6df62102c..1df05eb27c 100644
--- a/configs/imx8qxp_mek_spl_defconfig
+++ b/configs/imx8qxp_mek_spl_defconfig
@@ -24,9 +24,9 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_BOARD_INIT=y
-CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_SPL_OF_CONTROL=y
+
 CONFIG_FASTBOOT=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_CMD_FASTBOOT=y
@@ -42,14 +42,10 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_IMX8=y
 
 CONFIG_DM_USB=y
-CONFIG_USB_EHCI_HCD=y
 
-CONFIG_CMD_USB=y
 CONFIG_USB=y
-CONFIG_USB_STORAGE=y
 CONFIG_USB_TCPC=y
 
-CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
 # CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
@@ -107,3 +103,9 @@ CONFIG_ENV_IS_IN_MMC=y
 
 CONFIG_SMC_FUSE=y
 CONFIG_CMD_MEMTEST=y
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_GADGET_SUPPORT=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_SDP_USB_DEV=1
+CONFIG_SDP_LOADADDR=0x80400000
diff --git a/configs/imx8qxp_mek_spl_fspi_defconfig b/configs/imx8qxp_mek_spl_fspi_defconfig
index 4e37f3f134..e0c2ea43e8 100644
--- a/configs/imx8qxp_mek_spl_fspi_defconfig
+++ b/configs/imx8qxp_mek_spl_fspi_defconfig
@@ -24,7 +24,6 @@ CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_BOARD_INIT=y
-CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_OF_CONTROL=y
@@ -46,14 +45,10 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_IMX8=y
 
 CONFIG_DM_USB=y
-CONFIG_USB_EHCI_HCD=y
 
-CONFIG_CMD_USB=y
 CONFIG_USB=y
-CONFIG_USB_STORAGE=y
 CONFIG_USB_TCPC=y
 
-CONFIG_CMD_USB_MASS_STORAGE=y
 CONFIG_USB_GADGET=y
 # CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
@@ -111,3 +106,9 @@ CONFIG_ENV_IS_IN_SPL_FLASH=y
 
 CONFIG_SMC_FUSE=y
 CONFIG_CMD_MEMTEST=y
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_GADGET_SUPPORT=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_SPL_SDP_USB_DEV=1
+CONFIG_SDP_LOADADDR=0x80400000