From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Mon, 9 Mar 2015 21:44:39 +0000 (-0300)
Subject: mx6sabre: Do not enable UMS with SPL
X-Git-Tag: v2015.04-rc5~64^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d5eb6dcf44f5c889dd80c81cf3b06385a27f8baf;p=oweals%2Fu-boot.git

mx6sabre: Do not enable UMS with SPL

Since commit ad8aae82b20ac6a ("mx6sabre: Enable User Mass Storage") SPL target
does not boot anymore due to the increased spl image size.

Only enable USB Mass Storage for the non-SPL target.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index cbd9a6cd15..b72522bf52 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -276,6 +276,7 @@
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
+#ifndef CONFIG_SPL
 #define CONFIG_CI_UDC
 #define CONFIG_USBD_HS
 #define CONFIG_USB_GADGET_DUALSPEED
@@ -289,5 +290,6 @@
 #define CONFIG_G_DNL_VENDOR_NUM		0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM	0xa4a5
 #define CONFIG_G_DNL_MANUFACTURER	"FSL"
+#endif
 
 #endif                         /* __MX6QSABRE_COMMON_CONFIG_H */