Skip to content
Snippets Groups Projects
Unverified Commit ff74ae66 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Use qemu-xhci for usb on aarch64

parent a67dae82
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 5 deletions
mk/qemu.mk
+ 4
− 5
View file @ ff74ae66
...@@ -21,6 +21,9 @@ else ifeq ($(ARCH),x86_64) ...@@ -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) ...@@ -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) ...@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment