Add the second UART to the ACPI tables.
Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
---
Pure guesswork, as I don't have a UEFI setup to hand and
am not familiar with ACPI table formats either...
---
hw/arm/virt-acpi-build.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 3d78ff6..a38287b 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -689,6 +689,7 @@ static void build_fadt(GArray *table_data, BIOSLinker
*linker,
static void
build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
{
+ VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
Aml *scope, *dsdt;
const MemMapEntry *memmap = vms->memmap;
const int *irqmap = vms->irqmap;
@@ -706,6 +707,10 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
VirtMachineState *vms)
acpi_dsdt_add_cpus(scope, vms->smp_cpus);
acpi_dsdt_add_uart(scope, &memmap[VIRT_UART],
(irqmap[VIRT_UART] + ARM_SPI_BASE));
+ if (!vmc->no_second_uart) {
+ acpi_dsdt_add_uart(scope, &memmap[VIRT_UART_2],
+ (irqmap[VIRT_UART_2] + ARM_SPI_BASE));
+ }
acpi_dsdt_add_flash(scope, &memmap[VIRT_FLASH]);
acpi_dsdt_add_fw_cfg(scope, &memmap[VIRT_FW_CFG]);
acpi_dsdt_add_virtio(scope, &memmap[VIRT_MMIO],
--
2.7.4
