diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-25 18:46:48 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-25 18:46:48 +0100 |
| commit | b0ce3f021e0157e9a5ab836cb162c48caac132e1 (patch) | |
| tree | f54c35113ff714fdd3ef9a4c546c11276f298acf | |
| parent | 8226a4b88b35aab2d7c95f9dbe2fcd662276685a (diff) | |
| parent | 9b52b17ba5e96cec182537715e87308108b47117 (diff) | |
| download | qemu-b0ce3f021e0157e9a5ab836cb162c48caac132e1.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20200724-pull-request' into staging
bugfixes: virtio-input, usb-dwc2, pixman.
# gpg: Signature made Fri 24 Jul 2020 17:42:43 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/fixes-20200724-pull-request:
configure: Allow to build tools without pixman
hw/input/virtio-input-hid.c: Don't undef CONFIG_CURSES
hw: Only compile the usb-dwc2 controller if it is really needed
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | hw/arm/Kconfig | 1 | ||||
| -rw-r--r-- | hw/input/virtio-input-hid.c | 1 | ||||
| -rw-r--r-- | hw/usb/Kconfig | 1 |
4 files changed, 2 insertions, 3 deletions
@@ -4065,7 +4065,7 @@ fi ########################################## # pixman support probe -if test "$want_tools" = "no" && test "$softmmu" = "no"; then +if test "$softmmu" = "no"; then pixman_cflags= pixman_libs= elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 4a224a6351..bc3a423940 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -315,6 +315,7 @@ config RASPI select FRAMEBUFFER select PL011 # UART select SDHCI + select USB_DWC2 config STM32F205_SOC bool diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index 09cf260985..a7a244a95d 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -12,7 +12,6 @@ #include "hw/qdev-properties.h" #include "hw/virtio/virtio-input.h" -#undef CONFIG_CURSES #include "ui/console.h" #include "standard-headers/linux/input.h" diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index d4d8c37c28..5e63dc75f8 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -48,7 +48,6 @@ config USB_MUSB config USB_DWC2 bool - default y select USB config TUSB6010 |