Attention is currently required from: Cliff Huang, Jérémy Compostella, Lance Zhao, Tim Wawrzynczak.
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/82642?usp=email )
Change subject: acpi: drop sort-of duplicate ACPI_HAVE_PCAT_8259 option ......................................................................
acpi: drop sort-of duplicate ACPI_HAVE_PCAT_8259 option
Apollo Lake SoC is the only SoC that selects ACPI_NO_PCAT_8259 and ACPI_HAVE_PCAT_8259 was automatically selected when ACPI_NO_PCAT_8259 wasn't selected, so drop the ACPI_HAVE_PCAT_8259 Kconfig option and use ACPI_NO_PCAT_8259 in the code instead.
Signed-off-by: Felix Held felix-coreboot@felixheld.de Change-Id: I246ecfda5bb156d151512e5dbf432a113fad51a2 --- M src/acpi/Kconfig M src/acpi/acpi_apic.c M src/arch/x86/acpi.c 3 files changed, 3 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/82642/1
diff --git a/src/acpi/Kconfig b/src/acpi/Kconfig index 2bb56ba..7dd75f9 100644 --- a/src/acpi/Kconfig +++ b/src/acpi/Kconfig @@ -22,9 +22,6 @@ pressed. A value of 0 is ignored, which is the default since most keyboards do not emit a scancode for the Fn key.
-config ACPI_HAVE_PCAT_8259 - def_bool y if !ACPI_NO_PCAT_8259 - config ACPI_INTEL_HARDWARE_SLEEP_VALUES def_bool n help diff --git a/src/acpi/acpi_apic.c b/src/acpi/acpi_apic.c index ebff44f..f367581 100644 --- a/src/acpi/acpi_apic.c +++ b/src/acpi/acpi_apic.c @@ -127,7 +127,7 @@
ioapic_get_sci_pin(&gsi, &irq, &flags);
- if (!CONFIG(ACPI_HAVE_PCAT_8259)) + if (CONFIG(ACPI_NO_PCAT_8259)) irq = gsi;
irqoverride->type = IRQ_SOURCE_OVERRIDE; /* Interrupt source override */ @@ -233,7 +233,7 @@ { madt->lapic_addr = cpu_get_lapic_addr();
- if (CONFIG(ACPI_HAVE_PCAT_8259)) + if (!CONFIG(ACPI_NO_PCAT_8259)) madt->flags |= ACPI_MADT_PCAT_COMPAT;
if (CONFIG(ACPI_COMMON_MADT_LAPIC)) diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c index 2497143..bb61cd7 100644 --- a/src/arch/x86/acpi.c +++ b/src/arch/x86/acpi.c @@ -13,7 +13,7 @@ ioapic_get_sci_pin(&gsi, &irq, &flags);
/* ACPI Release 6.5, 5.2.9 and 5.2.15.5. */ - if (!CONFIG(ACPI_HAVE_PCAT_8259)) + if (CONFIG(ACPI_NO_PCAT_8259)) return gsi;
assert(irq < 16);