summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Jones <marcjones@sysproconsulting.com>2020-12-02 11:29:09 -0700
committerMarc Jones <marc@marcjonesconsulting.com>2020-12-11 15:59:49 +0000
commit5258f4f93e2d23e839765349a844d798f054da6a (patch)
tree6104b0b72a13d3642cd133576f3e72a424f719fd
parentcf3dcd6d2975673622c3272e0d7f3e421051fe74 (diff)
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 <marcjones@sysproconsulting.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48247 Reviewed-by: Jay Talbott <JayTalbott@sysproconsulting.com> Reviewed-by: Patrick Rudolph <siro@das-labor.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/intel/common/block/acpi/acpi.c9
1 files changed, 6 insertions, 3 deletions
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);
}