Alistair Delva has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/51427 )
Change subject: WIP: ARM: Set up virtio console ports
......................................................................
WIP: ARM: Set up virtio console ports
Change-Id: Ia421a6e26250957af8ed77b466d53ccd4186aef3
---
M configs/example/arm/starter_fs.py
1 file changed, 47 insertions(+), 2 deletions(-)
diff --git a/configs/example/arm/starter_fs.py
b/configs/example/arm/starter_fs.py
index 55f4f2a..3432e3b 100644
--- a/configs/example/arm/starter_fs.py
+++ b/configs/example/arm/starter_fs.py
@@ -116,6 +116,42 @@
for disk in args.disk_image:
device = PciVirtIO(vio=VirtIOBlock(image=create_cow_image(disk)))
pci_devices.append(device)
+
+ # Kernel messages (kmsg) - hvc0
+ device = PciVirtIO(vio=VirtIOConsole(device=Terminal(number=0,
+
name="kernel.log")))
+ pci_devices.append(device)
+
+ # Boot console - hvc1 (not used currently; goes via ttyAMA0 instead)
+ device = PciVirtIO(vio=VirtIOConsole(device=Terminal(number=1,
+ outfile="none")))
+ pci_devices.append(device)
+
+ # Android logcat - hvc2
+ device = PciVirtIO(vio=VirtIOConsole(device=Terminal(number=2,
+ name="logcat")))
+ pci_devices.append(device)
+
+ # Keymint - hvc3 (not used currently)
+ device = PciVirtIO(vio=VirtIOConsole(device=Terminal(number=3,
+ outfile="none")))
+ pci_devices.append(device)
+
+ # Gatekeeper - hvc4 (not used currently)
+ device = PciVirtIO(vio=VirtIOConsole(device=Terminal(number=4,
+ outfile="none")))
+ pci_devices.append(device)
+
+ # Bluetooth - hvc5 (not used currently)
+ device = PciVirtIO(vio=VirtIOConsole(device=Terminal(number=5,
+ outfile="none")))
+ pci_devices.append(device)
+
+ # GNSS - hvc6 (not used currently)
+ device = PciVirtIO(vio=VirtIOConsole(device=Terminal(number=6,
+ outfile="none")))
+ pci_devices.append(device)
+
system.pci_devices = pci_devices
# Attach the PCI devices to the system. The helper method in the
@@ -156,8 +192,6 @@
# Linux boot command flags
kernel_cmd = [
- # Tell Linux to use the simulated serial port as a console
- "console=ttyAMA0",
# Hard-code timi
"lpj=19988480",
# Disable address space randomisation to get a consistent
@@ -165,6 +199,8 @@
"norandmaps",
# Tell Linux about the amount of physical memory present.
"mem=%s" % args.mem_size,
+ # Tell Linux to use the virtio console port as a console
+ "console=hvc0",
# Reboot immediately on panic
"panic=-1",
# Earlycon debug support
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/51427
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ia421a6e26250957af8ed77b466d53ccd4186aef3
Gerrit-Change-Number: 51427
Gerrit-PatchSet: 1
Gerrit-Owner: Alistair Delva <ade...@google.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
