enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mksklipad50: uboot2025: fix usb dwc2-otg/dwc3-host compile

Browse Source 
RK3328 board with dwc2-otg and dwc3-host run into
"multiple definition of 'dm_usb_gadget_handle_interrupts'"

See https://lore.kernel.org/u-boot/7805b8d0-fb7c-41d5-8d74-f85dfd40233a@kwiboo.se/
This commit is contained in:
Thorsten Maerz 2025-03-06 18:41:42 +01:00 committed by Igor
parent d34d7bf412
commit e6b034384c
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
patch/u-boot/v2025.01/board_mksklipad50/03-rk3328-mksklipad50-uboot-dwc3.patch Normal file
View File

@ -0,0 +1,37 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Thorsten Maerz <info@netztorte.de>
Date: Thu, 06 Mar 2025 11:09:00 +0100
Subject: Fix multiple dwc2/dwc3 definitions
Fixes "multiple definition of 'dm_usb_gadget_handle_interrupts'"
See https://lore.kernel.org/u-boot/7805b8d0-fb7c-41d5-8d74-f85dfd40233a@kwiboo.se/
---
diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c
index 2ab41cbae4..ccc1803fb3 100644
--- a/drivers/usb/dwc3/dwc3-generic.c
+++ b/drivers/usb/dwc3/dwc3-generic.c
@@ -192,7 +192,7 @@ static int dwc3_generic_of_to_plat(struct udevice *dev)
return 0;
}
-#if CONFIG_IS_ENABLED(DM_USB_GADGET)
+#if IS_ENABLED(CONFIG_USB_DWC3_GADGET) && CONFIG_IS_ENABLED(DM_USB_GADGET)
static int dwc3_generic_peripheral_probe(struct udevice *dev)
{
struct dwc3_generic_priv *priv = dev_get_priv(dev);
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index a35b8c2f64..9bd06afe0a 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -988,7 +988,7 @@ MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("DesignWare USB3 DRD Controller Driver");
-#if !CONFIG_IS_ENABLED(DM_USB_GADGET)
+#if IS_ENABLED(CONFIG_USB_DWC3_GADGET) && !CONFIG_IS_ENABLED(DM_USB_GADGET)
__weak int dwc3_uboot_interrupt_status(struct udevice *dev)
{
return 1;