diff mbox series

[U-Boot] ARM: omap3_logic: Fix SPL boot failure when EHCI enabled

Message ID 20190822203242.19524-1-aford173@gmail.com
State Accepted
Commit 97605d3ca331348bca6f46bb98863909b9349578
Delegated to: Tom Rini
Headers show
Series [U-Boot] ARM: omap3_logic: Fix SPL boot failure when EHCI enabled | expand

Commit Message

Adam Ford Aug. 22, 2019, 8:32 p.m. UTC
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>

Comments

Tom Rini Aug. 27, 2019, 12:18 a.m. UTC | #1
On Thu, Aug 22, 2019 at 03:32:42PM -0500, Adam Ford wrote:

> 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

Applied to u-boot/master, thanks!
diff mbox series

Patch

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