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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

>z_3 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 literal 65536 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%0AbY1UFfat%{r_JWq=tck!GnQ;VFgqy6(r^c3O`3s z_&I{Y&k+=UOnzL4`2-w~@$onw=i_iZ%E#i!?TRMC0CB??1_p+lyZ`@#mnONw{SXcF z1889tH*mn|uHNZ-&~}3i4Y!Ga@XV`5c%^`8-_sd|dbf{4kAi z;&W(bZDnd>X=etRcL&sqy!ZeAY<%Wr<1x<#VO|LX1A`7D1H+qp|NobOvM6>x2QYoX z;%P^2rlWijE_^XAdw1o6c<@+o&|NlYh zoWYq-z@1OVkxwB6lyn(Db0NbVDNbK|354YL9+q@P%&$eec*iO%qNk+1<7>I+<_1VBp=r>GB89u z`u`skULZF$Gl9a%4<1e+^A<2NFmycn{~yE#sc8qP351&G#0^q>92CJI`7@yW`sn|E zePp|Xp=wi~s+>gIZC6Sn{?b zp9Iqu%;Jo z{Ei7rVt3{Sl^rn*3=C5~{{Qa{4FgcR6ku|Nr%RCep!HU`+yHVvNX?s%|Nny)aD&_r z&7Y2Z0!&F70`kHr9u0xf5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7 zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C z(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R z7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7 zfzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c z4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C z(GVC7fzc4a9s-63`fl_c=zGxjqVK{Uh8li_18J)N|No!Q!^p36KrfA-QS9aav{!5X z|NqaykhVjB0ipU80|Q79X6*m}3=9mj&ohAO$q<@% F695IQ1&jay 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