Change in coreboot[master]: soc/intel/common/block/acpi: Skip UART debug table if not used

[Marc Jones (Code Review)]

Marc Jones has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48247 )

Change subject: soc/intel/common/block/acpi: Skip UART debug table if not used
......................................................................

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 
---
M src/soc/intel/common/block/acpi/acpi.c
1 file changed, 6 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/48247/1

diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c
index 6c389fa..84a85d2 100644
--- a/src/soc/intel/common/block/acpi/acpi.c
+++ b/src/soc/intel/common/block/acpi/acpi.c
@@ -154,9 +154,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);
 }

[Marc Jones (Code Review)]

Hello build bot (Jenkins), Jonathan Zhang, Jay Talbott, Stefan Reinauer, Angel Pons, Arthur Heymans, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48247

to look at the new patch set (#4).

Change subject: soc/intel/common/block/acpi: Skip UART debug table if not used
......................................................................

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 
---
M src/soc/intel/common/block/acpi/acpi.c
1 file changed, 6 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/48247/4

[Jay Talbott (Code Review)]

Jay Talbott has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48247 )

Change subject: soc/intel/common/block/acpi: Skip UART debug table if not used
......................................................................

Patch Set 4: Code-Review+1

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48247 )

Change subject: soc/intel/common/block/acpi: Skip UART debug table if not used
......................................................................

Patch Set 4: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48247 )

Change subject: soc/intel/common/block/acpi: Skip UART debug table if not used
......................................................................

Patch Set 4: Code-Review+2

[Marc Jones (Code Review)]

Marc Jones has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48247 )

Change subject: soc/intel/common/block/acpi: Skip UART debug table if not used
......................................................................

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) 
---
M src/soc/intel/common/block/acpi/acpi.c
1 file changed, 6 insertions(+), 3 deletions(-)

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

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);
 }