| Message ID | af89f372-3fa7-a727-b49c-6418c3fab985@siemens.com |
|---|---|
| State | New |
| Headers | show |
| Series | usb: Fix usb-host build | expand |
Gerd, ping? If you provide a reviewed-by or acked-by I can apply this to master as a buildfix... thanks -- PMM On 22 September 2017 at 08:42, Jan Kiszka <jan.kiszka@siemens.com> wrote: > From: Jan Kiszka <jan.kiszka@siemens.com> > > This reverts the incorrect commit 2041649f0b04 (these are > machine-independent objects) and fixes the name of the config var. > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > --- > hw/usb/Makefile.objs | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs > index 757e365562..c7f0a52f44 100644 > --- a/hw/usb/Makefile.objs > +++ b/hw/usb/Makefile.objs > @@ -38,7 +38,7 @@ endif > common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o > > # usb pass-through > -ifeq ($(CONFIG_LIBUSB)$(CONFIG_USB),yy) > +ifeq ($(CONFIG_USB_LIBUSB),y) > common-obj-y += host-libusb.o host-legacy.o > else > common-obj-y += host-stub.o > -- > 2.12.3
On Mon, 2017-09-25 at 20:29 +0100, Peter Maydell wrote: > Gerd, ping? If you provide a reviewed-by or acked-by > I can apply this to master as a buildfix... > > thanks > -- PMM > > On 22 September 2017 at 08:42, Jan Kiszka <jan.kiszka@siemens.com> > wrote: > > From: Jan Kiszka <jan.kiszka@siemens.com> > > > > This reverts the incorrect commit 2041649f0b04 (these are > > machine-independent objects) Commit is correct. The objects are machine-independent indeed, but not all machines need it. s390x (host) doesn't support usb in the first place, so usb-passthrough is rather pointless. So this drops the compiled object files from the list for the linker ... > > and fixes the name of the config var. That one is needed. cheers, Gerd
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 757e365562..c7f0a52f44 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -38,7 +38,7 @@ endif common-obj-$(CONFIG_USB_REDIR) += redirect.o quirks.o # usb pass-through -ifeq ($(CONFIG_LIBUSB)$(CONFIG_USB),yy) +ifeq ($(CONFIG_USB_LIBUSB),y) common-obj-y += host-libusb.o host-legacy.o else common-obj-y += host-stub.o