diff options
| -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 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 diff --git a/pc-bios/qboot.rom b/pc-bios/qboot.rom Binary files differindex 45eabc5166..7634106a07 100644 --- a/pc-bios/qboot.rom +++ b/pc-bios/qboot.rom 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 -Subproject cb1c49e0cfac99b9961d136ac0194da62c28cf6 +Subproject a5300c4949b8d4de2d34bedfaed66793f48ec94 |