From 6ca2aa5cfb65f5fa791e2400a6db4e34b6f9fa27 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 20 Nov 2020 09:55:24 +0100 Subject: [PATCH 1/2] usb: fix kconfig for usb-xhci-sysbus Remove the "default y" for USB_XHCI_SYSBUS because sysbus devices are not user creatable; boards that use them will specify them manually with "imply" or "select" clauses. It would be nice to keep the ability to remove PCIe and USB from microvm, since thos can be disabled on the command line and therefore should not be included if QEMU is configured --without-default-devices. However it's too late for 5.2 to figure out a place for the DSDT creation code. Reported-by: Bruce Rogers Cc: Gerd Hoffmann Signed-off-by: Paolo Bonzini --- hw/usb/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 3b07d9cf68..7fbae18bc8 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -47,7 +47,6 @@ config USB_XHCI_NEC config USB_XHCI_SYSBUS bool - default y select USB_XHCI config USB_MUSB From 5983021eb6cd0fb8dfbac5211892f5231758d60b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 20 Nov 2020 16:24:08 +0100 Subject: [PATCH 2/2] qboot: update to latest upstream This also brings in two patches that Debian had to include, qboot_stop_using_inttypes.patch and qboot_no_jump_tables.diff. Reported-by: Michael Tokarev Signed-off-by: Paolo Bonzini Message-Id: <20201120152408.164346-1-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- pc-bios/qboot.rom | Bin 65536 -> 65536 bytes roms/Makefile | 8 ++++++-- roms/qboot | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pc-bios/qboot.rom b/pc-bios/qboot.rom index 45eabc516692e2d134bbb630d133c7c2dcc9a9b6..7634106a0766913077e88dfcb1021c1168dcad3c 100644 GIT binary patch literal 65536 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 X`|Pw&J6CI`ke0qCGuV>*U(5dkX~JAw literal 65536 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 diff --git a/roms/Makefile b/roms/Makefile index 7045e374d3..5ffe3317ac 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -186,9 +186,13 @@ opensbi64-generic: cp opensbi/build/platform/generic/firmware/fw_dynamic.bin ../pc-bios/opensbi-riscv64-generic-fw_dynamic.bin cp opensbi/build/platform/generic/firmware/fw_dynamic.elf ../pc-bios/opensbi-riscv64-generic-fw_dynamic.elf +MESON = meson +NINJA = ninja qboot: - $(MAKE) -C qboot - cp qboot/bios.bin ../pc-bios/qboot.rom + mkdir -p qboot/build + $(MESON) setup $(if $(wildcard qboot/build/meson-private),--wipe,) qboot qboot/build + $(NINJA) -C qboot/build + cp qboot/build/bios.bin ../pc-bios/qboot.rom npcm7xx_bootrom: $(MAKE) -C vbootrom CROSS_COMPILE=$(arm_cross_prefix) diff --git a/roms/qboot b/roms/qboot index cb1c49e0cf..a5300c4949 160000 --- a/roms/qboot +++ b/roms/qboot @@ -1 +1 @@ -Subproject commit cb1c49e0cfac99b9961d136ac0194da62c28cf64 +Subproject commit a5300c4949b8d4de2d34bedfaed66793f48ec948