From 66bff4241bf881481ddf077e10a79e59db0ee9a2 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 21 Sep 2023 11:21:42 +0100 Subject: virt: Reverse order of UART dtb nodes With this commit, the DTB nodes appear in the order pl011@9040000 first. This corresponds to the uart[01]-rev.txt logs. Without this commit, the DTB nodes appear with pl011@9000000 first, corresponding to uart[01].txt. Signed-off-by: Peter Maydell --- hw/arm/virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 63dbfb937a..ecf627ddb1 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2308,6 +2308,7 @@ static void machvirt_init(MachineState *machine) * we create it second (and so it appears first in the DTB), because * that's what QEMU has always done. */ + create_uart(vms, VIRT_UART0, sysmem, serial_hd(0)); if (!vms->secure) { Chardev *serial1 = serial_hd(1); @@ -2316,7 +2317,6 @@ static void machvirt_init(MachineState *machine) create_uart(vms, VIRT_UART1, sysmem, serial1); } } - create_uart(vms, VIRT_UART0, sysmem, serial_hd(0)); if (vms->secure) { vms->second_uart_present = true; create_uart(vms, VIRT_UART1, secure_sysmem, serial_hd(1)); -- cgit v1.2.3