From 5258f4f93e2d23e839765349a844d798f054da6a Mon Sep 17 00:00:00 2001 From: Marc Jones Date: Wed, 2 Dec 2020 11:29:09 -0700 Subject: soc/intel/common/block/acpi: Skip UART debug table if not used Skip the ACPI UART debug table if common block UART isn't selected. Change-Id: I8d627998ca450c32496c90e51aad48f332b40e23 Signed-off-by: Marc Jones Reviewed-on: https://review.coreboot.org/c/coreboot/+/48247 Reviewed-by: Jay Talbott Reviewed-by: Patrick Rudolph Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- src/soc/intel/common/block/acpi/acpi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/soc/intel/common') diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c index 2948faf9b9..d217729446 100644 --- a/src/soc/intel/common/block/acpi/acpi.c +++ b/src/soc/intel/common/block/acpi/acpi.c @@ -158,9 +158,12 @@ unsigned long southbridge_write_acpi_tables(const struct device *device, unsigned long current, struct acpi_rsdp *rsdp) { - current = acpi_write_dbg2_pci_uart(rsdp, current, - uart_get_device(), - ACPI_ACCESS_SIZE_DWORD_ACCESS); + if (CONFIG(SOC_INTEL_COMMON_BLOCK_UART)) { + current = acpi_write_dbg2_pci_uart(rsdp, current, + uart_get_device(), + ACPI_ACCESS_SIZE_DWORD_ACCESS); + } + return acpi_write_hpet(device, current, rsdp); } -- cgit v1.2.3