Marc Jones submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Patrick Rudolph: Looks good to me, approved Angel Pons: Looks good to me, approved Jay Talbott: Looks good to me, but someone else must approve
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>
---
M src/soc/intel/common/block/acpi/acpi.c
1 file 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 2948faf..d2177294 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 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);
}


To view, visit change 48247. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I8d627998ca450c32496c90e51aad48f332b40e23
Gerrit-Change-Number: 48247
Gerrit-PatchSet: 7
Gerrit-Owner: Marc Jones <marc@marcjonesconsulting.com>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Arthur Heymans <arthur@aheymans.xyz>
Gerrit-Reviewer: Furquan Shaikh <furquan@google.com>
Gerrit-Reviewer: Jay Talbott <JayTalbott@sysproconsulting.com>
Gerrit-Reviewer: Jonathan Zhang <jonzhang@fb.com>
Gerrit-Reviewer: Marc Jones <marc@marcjonesconsulting.com>
Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org>
Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer@coreboot.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged