diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-20 22:30:51 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-20 22:30:51 +0000 |
| commit | e3a232cccd2445e5d9e607a65a78cdbc33ff8a0f (patch) | |
| tree | d2c04be34ccb139c439f5dbe6e56a84565126bd6 | |
| parent | 7761e07c3ffd8daad6fd933ad0bb03493080e193 (diff) | |
| parent | 5983021eb6cd0fb8dfbac5211892f5231758d60b (diff) | |
| download | qemu-e3a232cccd2445e5d9e607a65a78cdbc33ff8a0f.zip qemu-e3a232cccd2445e5d9e607a65a78cdbc33ff8a0f.tar.gz qemu-e3a232cccd2445e5d9e607a65a78cdbc33ff8a0f.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
Bug fixes
# gpg: Signature made Fri 20 Nov 2020 15:49:13 GMT
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini-gitlab/tags/for-upstream:
qboot: update to latest upstream
usb: fix kconfig for usb-xhci-sysbus
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/usb/Kconfig | 1 | ||||
| -rw-r--r-- | pc-bios/qboot.rom | bin | 65536 -> 65536 bytes | |||
| -rw-r--r-- | roms/Makefile | 8 | ||||
| m--------- | roms/qboot | 0 |
4 files changed, 6 insertions, 3 deletions
diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 3b07d9c..7fbae18 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 diff --git a/pc-bios/qboot.rom b/pc-bios/qboot.rom Binary files differindex 45eabc5..7634106 100644 --- a/pc-bios/qboot.rom +++ b/pc-bios/qboot.rom diff --git a/roms/Makefile b/roms/Makefile index 7045e37..5ffe331 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 -Subproject cb1c49e0cfac99b9961d136ac0194da62c28cf6 +Subproject a5300c4949b8d4de2d34bedfaed66793f48ec94 |