usb: xhci: fix USB_XHCI_PCI depends
Subsystems (2)
PATCH 1/1 usb: xhci: fix USB_XHCI_PCI depends
The xhci-pci-renesas module exports symbols for xhci-pci to load the RAM/ROM on renesas xhci controllers. We had dependency which works when both the modules are builtin or modules.
But if xhci-pci is inbuilt and xhci-pci-renesas in module, we get below linker error:drivers/usb/host/xhci-pci.o: In function `xhci_pci_remove':drivers/usb/host/xhci-pci.c:411: undefined reference to renesas_xhci_pci_exit' drivers/usb/host/xhci-pci.o: In function xhci_pci_probe':drivers/usb/host/xhci-pci.c:345: undefined reference to `renesas_xhci_check_request_fw'
Fix this by adding USB_XHCI_PCI having depends on USB_XHCI_PCI_RENESAS || !USB_XHCI_PCI_RENESAS so that both can be either inbuilt or modules.
--- drivers/usb/host/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/Kconfig +1 -1
@@ -40,11 +40,11 @@ config USB_XHCI_DBGCAP config USB_XHCI_PCI tristate depends on USB_PCI + depends on USB_XHCI_PCI_RENESAS || !USB_XHCI_PCI_RENESAS default y config USB_XHCI_PCI_RENESAS tristate "Support for additional Renesas xHCI controller with firwmare" - depends on USB_XHCI_PCI ---help--- Say 'Y' to enable the support for the Renesas xHCI controller with firwmare. Make sure you have the firwmare for the device and
Signature · 1 line
2.25.4
Quoted 11 lines · Vinod Koul
The xhci-pci-renesas module exports symbols for xhci-pci to load the RAM/ROM on renesas xhci controllers. We had dependency which works when both the modules are builtin or modules.
But if xhci-pci is inbuilt and xhci-pci-renesas in module, we get below linker error:
drivers/usb/host/xhci-pci.o: In function `xhci_pci_remove':drivers/usb/host/xhci-pci.c:411: undefined reference torenesas_xhci_pci_exit' drivers/usb/host/xhci-pci.o: In functionxhci_pci_probe':drivers/usb/host/xhci-pci.c:345: undefined reference to `renesas_xhci_check_request_fw'
Quoted 3 lines
Fix this by adding
USB_XHCI_PCIhaving depends onUSB_XHCI_PCI_RENESAS|| !USB_XHCI_PCI_RENESAS so that both can be either inbuilt or modules.
Regards,
Bjorn
Quoted 28 lines
Reported-by Anders Roxell <[email protected]>Fixes a66d21d7dba8 ("usb: xhci: Add support for Renesas controller with memory")Tested-by Anders Roxell <[email protected]>Signed-off-by Vinod Koul <[email protected]>--- drivers/usb/host/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/usb/host/Kconfig +1
-1@@ -40,11 +40,11 @@ config USB_XHCI_DBGCAP config USB_XHCI_PCI tristate depends on USB_PCI + depends on USB_XHCI_PCI_RENESAS || !USB_XHCI_PCI_RENESAS default y config USB_XHCI_PCI_RENESAS tristate "Support for additional Renesas xHCI controller with firwmare" - depends on USB_XHCI_PCI ---help--- Say 'Y' to enable the support for the Renesas xHCI controller with firwmare. Make sure you have the firwmare for the device andSignature · 1 line
2.25.4