diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2021-01-28 12:06:39 +0100 |
|---|---|---|
| committer | Angel Pons <th3fanbus@gmail.com> | 2021-01-31 11:12:32 +0000 |
| commit | 2399adaeb0000966c620cf17df82797290d47ef4 (patch) | |
| tree | 9d7161a593cf67dbe1d61536e4b786bea3b0fc5e | |
| parent | cba669cd959299f2f4fe44f9adee6a8ddaebd448 (diff) | |
mb/emulation/qemu-q35: Use common MADT
Select SOUTHBRIDGE_INTEL_COMMON_ACPI_MADT and drop the `acpi_fill_madt`
function definition, which is redundant. Tested, still boots to payload.
Change-Id: I6ba448f264a478e7ef060ea1dfbf5016a310d528
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50026
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Nico Huber <nico.h@gmx.de>
| -rw-r--r-- | src/mainboard/emulation/qemu-q35/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-q35/acpi_tables.c | 24 |
2 files changed, 1 insertions, 24 deletions
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig index 4bbfd57709..f0fcff016e 100644 --- a/src/mainboard/emulation/qemu-q35/Kconfig +++ b/src/mainboard/emulation/qemu-q35/Kconfig @@ -15,6 +15,7 @@ config BOARD_SPECIFIC_OPTIONS select MAINBOARD_FORCE_NATIVE_VGA_INIT if !CHROMEOS select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_CHROMEOS + select SOUTHBRIDGE_INTEL_COMMON_ACPI_MADT config VBOOT select VBOOT_MUST_REQUEST_DISPLAY diff --git a/src/mainboard/emulation/qemu-q35/acpi_tables.c b/src/mainboard/emulation/qemu-q35/acpi_tables.c index 90bab2f77e..ccf49c245b 100644 --- a/src/mainboard/emulation/qemu-q35/acpi_tables.c +++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c @@ -1,12 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <types.h> #include <acpi/acpi.h> -#include <arch/ioapic.h> -#include <arch/smp/mpspec.h> -#include <device/device.h> -#include <device/pci_ops.h> -#include <version.h> #include "../qemu-i440fx/fw_cfg.h" #include "../qemu-i440fx/acpi.h" @@ -19,24 +13,6 @@ void mainboard_fill_fadt(acpi_fadt_t *fadt) fadt->acpi_disable = 0; } -unsigned long acpi_fill_madt(unsigned long current) -{ - /* Local APICs */ - current = acpi_create_madt_lapics(current); - - /* IOAPIC */ - current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current, - 2, IO_APIC_ADDR, 0); - - /* 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; -} - unsigned long acpi_fill_mcfg(unsigned long current) { current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current, |