summaryrefslogtreecommitdiff
path: root/src/soc/intel/braswell
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-12-10 17:07:38 -0600
committerAaron Durbin <adurbin@chromium.org>2015-12-15 20:12:01 +0100
commit07a1b281a864e8c2a17e29767a7abf495587b325 (patch)
tree6856167e67eeb9c56503efc7ed07204d6846eda9 /src/soc/intel/braswell
parentecd4cfcb8695988d82069df4509b56e39794379e (diff)
x86 acpi: remove ALIGN_CURRENT macro
The ALIGN_CURRENT macro relied on a local variable name as well as being defined in numerous compilation units. Replace those instances with an acpi_align_current() inline function. Change-Id: Iab453f2eda1addefad8a1c37d265f917bd803202 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/12707 Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/soc/intel/braswell')
-rw-r--r--src/soc/intel/braswell/acpi.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index 505b52cac3..f7c37481d8 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -472,8 +472,6 @@ unsigned long acpi_madt_irq_overrides(unsigned long current)
return current;
}
-#define ALIGN_CURRENT current = (ALIGN(current, 16))
-
unsigned long southcluster_write_acpi_tables(device_t device,
unsigned long current,
struct acpi_rsdp *rsdp)
@@ -481,7 +479,7 @@ unsigned long southcluster_write_acpi_tables(device_t device,
acpi_header_t *ssdt2;
current = acpi_write_hpet(device, current, rsdp);
- ALIGN_CURRENT;
+ current = acpi_align_current(current);
#if CONFIG_GOP_SUPPORT
igd_opregion_t *opregion;
@@ -490,7 +488,7 @@ unsigned long southcluster_write_acpi_tables(device_t device,
opregion = (igd_opregion_t *)current;
init_igd_opregion(opregion);
current += sizeof(igd_opregion_t);
- ALIGN_CURRENT;
+ current = acpi_align_current(current);
#endif
ssdt2 = (acpi_header_t *)current;
@@ -501,7 +499,7 @@ unsigned long southcluster_write_acpi_tables(device_t device,
acpi_add_table(rsdp, ssdt2);
printk(BIOS_DEBUG, "ACPI: * SSDT2 @ %p Length %x\n",ssdt2,
ssdt2->length);
- ALIGN_CURRENT;
+ current = acpi_align_current(current);
} else {
ssdt2 = NULL;
printk(BIOS_DEBUG, "ACPI: * SSDT2 not generated.\n");