OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Bug fixes

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAl+35XkUHHBib256aW5p
 QHJlZGhhdC5jb20ACgkQv/vSX3jHroN5jgf+I9Mc9OI2x28nsn/iZ55vvxamox1m
 ipouPyRQnWdiMi2gXgxCicva1c5k9Xk8GZc47AluEEk70a0VzV4Jv1GWGbiJDRTe
 Q+Iiht2OOm7hszVvrveZgK/v2VLTrwiJLy5LsehQ7anVQCro7PVFRDgXl64CU3Dn
 0wLwyqhLa8SfxlNgi8MArcNCP/xYpDqJtOqTQ9nK1gHyG0Cze18oz7iVc2WRg/C1
 UrUWeXVqVFKE9XwTwRrtqd9pWQbbkbyzKFGTKpJVplRDQvtyOFmrHoITW9BUyBu3
 fcQoaCPlwD5l6K8wTRz3k3nAUyT6qXWaLfKC68E+OislnURLtuTR/D0XWg==
 =j3rw
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2020-11-20 22:30:51 +00:00
commit e3a232cccd
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/usb/Kconfig
View File

@ -47,7 +47,6 @@ config USB_XHCI_NEC
config USB_XHCI_SYSBUS config USB_XHCI_SYSBUS
bool bool
default y
select USB_XHCI select USB_XHCI
config USB_MUSB config USB_MUSB

BIN
pc-bios/qboot.rom
View File

Binary file not shown.

8
roms/Makefile
View File

@ -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.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 cp opensbi/build/platform/generic/firmware/fw_dynamic.elf ../pc-bios/opensbi-riscv64-generic-fw_dynamic.elf
MESON = meson
NINJA = ninja
qboot: qboot:
$(MAKE) -C qboot mkdir -p qboot/build
cp qboot/bios.bin ../pc-bios/qboot.rom $(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: npcm7xx_bootrom:
$(MAKE) -C vbootrom CROSS_COMPILE=$(arm_cross_prefix) $(MAKE) -C vbootrom CROSS_COMPILE=$(arm_cross_prefix)

2
roms/qboot

@ -1 +1 @@
Subproject commit cb1c49e0cfac99b9961d136ac0194da62c28cf64 Subproject commit a5300c4949b8d4de2d34bedfaed66793f48ec948