diff options
| -rw-r--r-- | src/mainboard/emulation/qemu-i440fx/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-i440fx/acpi_tables.c | 23 | ||||
| -rw-r--r-- | src/southbridge/intel/i82371eb/Kconfig | 3 |
3 files changed, 3 insertions, 24 deletions
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig index 5bf95b22f2..f02c92dad4 100644 --- a/src/mainboard/emulation/qemu-i440fx/Kconfig +++ b/src/mainboard/emulation/qemu-i440fx/Kconfig @@ -2,7 +2,6 @@ if BOARD_EMULATION_QEMU_X86_I440FX config BOARD_SPECIFIC_OPTIONS def_bool y - select ACPI_COMMON_MADT_LAPIC select CPU_QEMU_X86 select NO_ECAM_MMCONF_SUPPORT select SOUTHBRIDGE_INTEL_I82371EB diff --git a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c deleted file mode 100644 index 593cbc7427..0000000000 --- a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c +++ /dev/null @@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <acpi/acpi.h> -#include <arch/ioapic.h> -#include <arch/smp/mpspec.h> -#include <device/device.h> - -#include "fw_cfg.h" -#include "acpi.h" - -unsigned long acpi_fill_madt(unsigned long current) -{ - /* IOAPIC */ - current += acpi_create_madt_ioapic_from_hw((acpi_madt_ioapic_t *)current, IO_APIC_ADDR); - - /* INT_SRC_OVR */ - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *) - current, 0, 0, 2, 0); - current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *) - current, 0, 9, 9, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_HIGH); - - return current; -} diff --git a/src/southbridge/intel/i82371eb/Kconfig b/src/southbridge/intel/i82371eb/Kconfig index 03e70a6394..3f846685f6 100644 --- a/src/southbridge/intel/i82371eb/Kconfig +++ b/src/southbridge/intel/i82371eb/Kconfig @@ -1,4 +1,7 @@ config SOUTHBRIDGE_INTEL_I82371EB + select ACPI_COMMON_MADT_IOAPIC if SMP + select ACPI_COMMON_MADT_LAPIC if SMP + select ACPI_NO_CUSTOM_MADT select ACPI_INTEL_HARDWARE_SLEEP_VALUES select SOUTHBRIDGE_INTEL_COMMON_SMBUS select SOUTHBRIDGE_INTEL_COMMON_RTC |