From: Adam Ford <aford173@gmail.com>
Date: Thu, 22 Aug 2019 20:32:42 +0000 (-0500)
Subject: ARM: omap3_logic: Fix SPL boot failure when EHCI enabled
X-Git-Tag: v2019.10-rc3~1^2~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=97605d3ca331348bca6f46bb98863909b9349578;p=oweals%2Fu-boot.git

ARM: omap3_logic: Fix SPL boot failure when EHCI enabled

Some of the USB code is still being built into SPL even when the
SPL menu options have it explicitly disabled for SPL. Unit there is
a better solution, This patch undefines CONFIG_USB_EHCI_OMAP when
building SPL which reduces the code and lets the board boot again.

Fixes: 25e4ff45b17d ("ARM: omap3_logic: Enable OMAP EHCI support
for SOM-LV Boards")

Signed-off-by: Adam Ford <aford173@gmail.com>
---

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index b7c3ddf564..90292ae312 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -30,6 +30,9 @@
 /* I2C */
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* EEPROM AT24C64      */
 
+#ifdef CONFIG_SPL_BUILD
+#undef CONFIG_USB_EHCI_OMAP
+#endif
 #ifdef CONFIG_USB_EHCI_OMAP
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	4
 #endif