MLK-20559-9 Android: imx8qm/qxp: Update android configurations

Due to some USB configurations are moved to header file to bypass
SPL build. Changes android and androidatuo defconfigs and header
files to avoid build break.

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

11 files changed, 5 insertions, 26 deletions

diff --git a/configs/imx8qm_mek_android_defconfig b/configs/imx8qm_mek_android_defconfig
index 7a0deec6b4a..d4daca6a680 100644
--- a/configs/imx8qm_mek_android_defconfig
+++ b/configs/imx8qm_mek_android_defconfig
@@ -22,14 +22,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_android_uuu_defconfig b/configs/imx8qm_mek_android_uuu_defconfig
index d383177ff63..ac7b1a687da 100644
--- a/configs/imx8qm_mek_android_uuu_defconfig
+++ b/configs/imx8qm_mek_android_uuu_defconfig
@@ -22,14 +22,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_androidauto_defconfig b/configs/imx8qm_mek_androidauto_defconfig
index 1a9f993c091..879f92419d9 100644
--- a/configs/imx8qm_mek_androidauto_defconfig
+++ b/configs/imx8qm_mek_androidauto_defconfig
@@ -23,8 +23,7 @@ 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_GADGET=y
diff --git a/configs/imx8qm_mek_androidauto_trusty_defconfig b/configs/imx8qm_mek_androidauto_trusty_defconfig
index 412d6d3bb1f..e08bacc81f8 100644
--- a/configs/imx8qm_mek_androidauto_trusty_defconfig
+++ b/configs/imx8qm_mek_androidauto_trusty_defconfig
@@ -24,8 +24,7 @@ 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_GADGET=y
diff --git a/configs/imx8qm_mek_androidauto_xen_defconfig b/configs/imx8qm_mek_androidauto_xen_defconfig
index e02900bd8ff..a3d83b20234 100644
--- a/configs/imx8qm_mek_androidauto_xen_defconfig
+++ b/configs/imx8qm_mek_androidauto_xen_defconfig
@@ -22,8 +22,7 @@ CONFIG_USB_XHCI_HCD=n
 CONFIG_USB_XHCI_IMX8=n
 
 CONFIG_DM_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_CMD_USB=y
+
 CONFIG_USB=y
 CONFIG_USB_TCPC=n
 
diff --git a/configs/imx8qxp_mek_android_defconfig b/configs/imx8qxp_mek_android_defconfig
index 13b21653381..fe33e72f774 100644
--- a/configs/imx8qxp_mek_android_defconfig
+++ b/configs/imx8qxp_mek_android_defconfig
@@ -24,14 +24,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_android_uuu_defconfig b/configs/imx8qxp_mek_android_uuu_defconfig
index 05089b01f97..311bc3d18ef 100644
--- a/configs/imx8qxp_mek_android_uuu_defconfig
+++ b/configs/imx8qxp_mek_android_uuu_defconfig
@@ -24,14 +24,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_androidauto_defconfig b/configs/imx8qxp_mek_androidauto_defconfig
index 44681795fe4..08e4bd355ff 100644
--- a/configs/imx8qxp_mek_androidauto_defconfig
+++ b/configs/imx8qxp_mek_androidauto_defconfig
@@ -24,9 +24,7 @@ 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_GADGET=y
diff --git a/configs/imx8qxp_mek_androidauto_trusty_defconfig b/configs/imx8qxp_mek_androidauto_trusty_defconfig
index 23983a760b7..909a5835fe8 100644
--- a/configs/imx8qxp_mek_androidauto_trusty_defconfig
+++ b/configs/imx8qxp_mek_androidauto_trusty_defconfig
@@ -25,9 +25,7 @@ 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_GADGET=y
diff --git a/include/configs/imx8qm_mek_android_auto.h b/include/configs/imx8qm_mek_android_auto.h
index 274c2687ce7..09463934a46 100644
--- a/include/configs/imx8qm_mek_android_auto.h
+++ b/include/configs/imx8qm_mek_android_auto.h
@@ -96,6 +96,7 @@
 #undef CONFIG_PHYLIB
 #undef CONFIG_PHY_ATHEROS
 #undef CONFIG_CMD_FUSE
+#undef CONFIG_CMD_USB_MASS_STORAGE
 #undef CONFIG_USB_FUNCTION_MASS_STORAGE
 #undef CONFIG_FAT_WRITE
 
diff --git a/include/configs/imx8qxp_mek_android_auto.h b/include/configs/imx8qxp_mek_android_auto.h
index cdee782a5a8..a74b0bf43c5 100644
--- a/include/configs/imx8qxp_mek_android_auto.h
+++ b/include/configs/imx8qxp_mek_android_auto.h
@@ -92,6 +92,7 @@
 #undef CONFIG_HUSH_PARSER
 #undef CONFIG_AUTO_COMPLETE
 #undef CONFIG_USB_HOST_ETHER
+#undef CONFIG_CMD_USB_MASS_STORAGE
 #undef CONFIG_USB_FUNCTION_MASS_STORAGE
 #undef CONFIG_FAT_WRITE