Skip to contentSkip to conversation

bmips: allow disabling usb support

PATCH New Álvaro Fernández Rojas 2 participants 2 messages Apr 4, 2020 – Apr 23, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bmips: allow disabling usb support

Currently, if usb is disabled the following error is produced:
CC drivers/usb/host/ohci-hcd.o
drivers/usb/host/ohci-hcd.c: In function ?usb_lowlevel_init?:
drivers/usb/host/ohci-hcd.c:2057:35: error: ?CONFIG_SYS_USB_OHCI_REGS_BASE? undeclared (first use in this function); did you mean ?CONFIG_SYS_MONITOR_BASE??

  gohci.regs = (struct ohci_regs *)CONFIG_SYS_USB_OHCI_REGS_BASE;
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                   CONFIG_SYS_MONITOR_BASE
drivers/usb/host/ohci-hcd.c:2057:35: note: each undeclared identifier is reported only once for each function it appears in
drivers/usb/host/ohci-hcd.c:2061:20: error: ?CONFIG_SYS_USB_OHCI_SLOT_NAME? undeclared (first use in this function); did you mean ?CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS??
  gohci.slot_name = CONFIG_SYS_USB_OHCI_SLOT_NAME;
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                    CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS
---
 include/configs/bmips_bcm6318.h  | 2 ++
 include/configs/bmips_bcm63268.h | 2 ++
 include/configs/bmips_bcm6328.h  | 2 ++
 include/configs/bmips_bcm6348.h  | 2 ++
 include/configs/bmips_bcm6358.h  | 2 ++
 include/configs/bmips_bcm6362.h  | 2 ++
 include/configs/bmips_bcm6368.h  | 2 ++
 7 files changed, 14 insertions(+)
include/configs/bmips_bcm6318.h +2 -0
index c7e7119aaf..45eb931c25 100644
@@ -19,7 +19,9 @@
 #define CONFIG_EHCI_MMIO_BIG_ENDIAN
 #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
+#if defined(CONFIG_USB_OHCI_HCD)
 #define CONFIG_USB_OHCI_NEW
+#endif /* CONFIG_USB_OHCI_HCD */
 
 /* U-Boot */
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M
include/configs/bmips_bcm63268.h +2 -0
index 45f26bb309..eed321eb6f 100644
@@ -19,7 +19,9 @@
 #define CONFIG_EHCI_MMIO_BIG_ENDIAN
 #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
+#if defined(CONFIG_USB_OHCI_HCD)
 #define CONFIG_USB_OHCI_NEW
+#endif /* CONFIG_USB_OHCI_HCD */
 
 /* U-Boot */
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M
include/configs/bmips_bcm6328.h +2 -0
index 8d59438785..c78099a49d 100644
@@ -19,7 +19,9 @@
 #define CONFIG_EHCI_MMIO_BIG_ENDIAN
 #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
+#if defined(CONFIG_USB_OHCI_HCD)
 #define CONFIG_USB_OHCI_NEW
+#endif /* CONFIG_USB_OHCI_HCD */
 
 /* U-Boot */
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M
include/configs/bmips_bcm6348.h +2 -0
index 061d6b25b7..547cf857ce 100644
@@ -17,7 +17,9 @@
 /* USB */
 #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
+#if defined(CONFIG_USB_OHCI_HCD)
 #define CONFIG_USB_OHCI_NEW
+#endif /* CONFIG_USB_OHCI_HCD */
 
 /* U-Boot */
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M
include/configs/bmips_bcm6358.h +2 -0
index 583217d262..116e9705b6 100644
@@ -19,7 +19,9 @@
 #define CONFIG_EHCI_MMIO_BIG_ENDIAN
 #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
+#if defined(CONFIG_USB_OHCI_HCD)
 #define CONFIG_USB_OHCI_NEW
+#endif /* CONFIG_USB_OHCI_HCD */
 
 /* U-Boot */
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M
include/configs/bmips_bcm6362.h +2 -0
index 570bc3b33d..e5e8b15e18 100644
@@ -19,7 +19,9 @@
 #define CONFIG_EHCI_MMIO_BIG_ENDIAN
 #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
+#if defined(CONFIG_USB_OHCI_HCD)
 #define CONFIG_USB_OHCI_NEW
+#endif /* CONFIG_USB_OHCI_HCD */
 
 /* U-Boot */
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M
include/configs/bmips_bcm6368.h +2 -0
index ab5bdac726..4d4403f8d2 100644
@@ -19,7 +19,9 @@
 #define CONFIG_EHCI_MMIO_BIG_ENDIAN
 #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
+#if defined(CONFIG_USB_OHCI_HCD)
 #define CONFIG_USB_OHCI_NEW
+#endif /* CONFIG_USB_OHCI_HCD */
 
 /* U-Boot */
 #define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + SZ_1M
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 bmips: allow disabling usb support

Am 04.04.20 um 16:01 schrieb ?lvaro Fern?ndez Rojas:

Quoted 14 lines

Currently, if usb is disabled the following error is produced:
CC drivers/usb/host/ohci-hcd.o
drivers/usb/host/ohci-hcd.c: In function ?usb_lowlevel_init?:
drivers/usb/host/ohci-hcd.c:2057:35: error: ?CONFIG_SYS_USB_OHCI_REGS_BASE? undeclared (first use in this function); did you mean ?CONFIG_SYS_MONITOR_BASE??

  gohci.regs = (struct ohci_regs *)CONFIG_SYS_USB_OHCI_REGS_BASE;
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                   CONFIG_SYS_MONITOR_BASE
drivers/usb/host/ohci-hcd.c:2057:35: note: each undeclared identifier is reported only once for each function it appears in
drivers/usb/host/ohci-hcd.c:2061:20: error: ?CONFIG_SYS_USB_OHCI_SLOT_NAME? undeclared (first use in this function); did you mean ?CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS??
  gohci.slot_name = CONFIG_SYS_USB_OHCI_SLOT_NAME;
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                    CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS
Quoted 10 lines
---
 include/configs/bmips_bcm6318.h  | 2 ++
 include/configs/bmips_bcm63268.h | 2 ++
 include/configs/bmips_bcm6328.h  | 2 ++
 include/configs/bmips_bcm6348.h  | 2 ++
 include/configs/bmips_bcm6358.h  | 2 ++
 include/configs/bmips_bcm6362.h  | 2 ++
 include/configs/bmips_bcm6368.h  | 2 ++
 7 files changed, 14 insertions(+)

applied to u-boot-mips, thanks.

Signature · 1 line
- Daniel