Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20200724-pull…
Browse files Browse the repository at this point in the history
…-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>
  • Loading branch information
pm215 committed Jul 25, 2020
2 parents 8226a4b + 9b52b17 commit b0ce3f0
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion configure
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions hw/arm/Kconfig
Expand Up @@ -315,6 +315,7 @@ config RASPI
select FRAMEBUFFER
select PL011 # UART
select SDHCI
select USB_DWC2

config STM32F205_SOC
bool
Expand Down
1 change: 0 additions & 1 deletion hw/input/virtio-input-hid.c
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion hw/usb/Kconfig
Expand Up @@ -48,7 +48,6 @@ config USB_MUSB

config USB_DWC2
bool
default y
select USB

config TUSB6010
Expand Down

0 comments on commit b0ce3f0

Please sign in to comment.