vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use qemu-xhci for usb on aarch64

Browse source
This commit is contained in:
Jeremy Soller 2024-03-25 14:29:10 -06:00
parent a67dae82d1
commit ff74ae6681
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mk/qemu.mk
View file

@ -21,6 +21,9 @@ else ifeq ($(ARCH),x86_64)
ifeq ($(efi),yes) ifeq ($(efi),yes)
FIRMWARE=/usr/share/OVMF/OVMF_CODE.fd FIRMWARE=/usr/share/OVMF/OVMF_CODE.fd
endif endif
ifneq ($(usb),no)
QEMUFLAGS+=-device nec-usb-xhci,id=xhci
endif
else ifeq ($(ARCH),aarch64) else ifeq ($(ARCH),aarch64)
# Default to UEFI as U-Boot doesn't set up a framebuffer for us and we don't yet support # Default to UEFI as U-Boot doesn't set up a framebuffer for us and we don't yet support
# setting up a framebuffer ourself. # setting up a framebuffer ourself.
@ -41,7 +44,7 @@ else ifeq ($(ARCH),aarch64)
QEMUFLAGS+=-device ramfb QEMUFLAGS+=-device ramfb
endif endif
ifneq ($(usb),no) ifneq ($(usb),no)
QEMUFLAGS+=-device usb-ehci -device usb-kbd -device usb-mouse QEMUFLAGS+=-device qemu-xhci -device usb-kbd -device usb-mouse
endif endif
else else
$(error Unsupported ARCH for QEMU "$(ARCH)")) $(error Unsupported ARCH for QEMU "$(ARCH)"))
@ -119,10 +122,6 @@ else ifeq ($(vga),virtio)
QEMUFLAGS+=-vga virtio QEMUFLAGS+=-vga virtio
endif endif
ifneq ($(usb),no)
QEMUFLAGS+=-device nec-usb-xhci,id=xhci
endif
ifeq ($(gdb),yes) ifeq ($(gdb),yes)
QEMUFLAGS+=-d cpu_reset -s -S QEMUFLAGS+=-d cpu_reset -s -S
endif endif