From 112c2277f51684157f5c46a06b3b038b5b730679 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 26 Jan 2024 15:33:59 +0100 Subject: soc/amd: move acpi_add_fsp_tables implementation to common FSP code Since the acpi_add_fsp_tables implementation is identical for all SoCs, factor it out and move it to the common AMD FSP code. Also guard the acpi_add_fsp_tables call in soc_acpi_write_tables with if (CONFIG(PLATFORM_USES_FSP2_0)) to properly handle the FSP dependency. Signed-off-by: Felix Held Change-Id: I8917a346f586e77b3b3278c73aed8cf61f3c9e6a Reviewed-on: https://review.coreboot.org/c/coreboot/+/80225 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- src/soc/amd/phoenix/Makefile.mk | 1 - src/soc/amd/phoenix/acpi.c | 3 ++- src/soc/amd/phoenix/agesa_acpi.c | 18 ------------------ 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 src/soc/amd/phoenix/agesa_acpi.c (limited to 'src/soc/amd/phoenix') diff --git a/src/soc/amd/phoenix/Makefile.mk b/src/soc/amd/phoenix/Makefile.mk index 82ce54d91e..26e91028f6 100644 --- a/src/soc/amd/phoenix/Makefile.mk +++ b/src/soc/amd/phoenix/Makefile.mk @@ -25,7 +25,6 @@ romstage-$(CONFIG_SOC_AMD_PHOENIX_FSP) += fsp_m_params.c romstage-y += soc_util.c ramstage-y += acpi.c -ramstage-y += agesa_acpi.c ramstage-y += chip.c ramstage-y += cpu.c ramstage-y += fch.c diff --git a/src/soc/amd/phoenix/acpi.c b/src/soc/amd/phoenix/acpi.c index 663a322ff0..a8be10e986 100644 --- a/src/soc/amd/phoenix/acpi.c +++ b/src/soc/amd/phoenix/acpi.c @@ -66,7 +66,8 @@ unsigned long soc_acpi_write_tables(const struct device *device, unsigned long c /* IVRS */ current = acpi_add_ivrs_table(current, rsdp); - current = acpi_add_fsp_tables(current, rsdp); + if (CONFIG(PLATFORM_USES_FSP2_0)) + current = acpi_add_fsp_tables(current, rsdp); return current; } diff --git a/src/soc/amd/phoenix/agesa_acpi.c b/src/soc/amd/phoenix/agesa_acpi.c deleted file mode 100644 index 67a112e350..0000000000 --- a/src/soc/amd/phoenix/agesa_acpi.c +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* TODO: Make common? */ - -#include -#include -#include -#include -#include - -unsigned long acpi_add_fsp_tables(unsigned long current, acpi_rsdp_t *rsdp) -{ - /* add ALIB SSDT from HOB */ - current = acpi_align_current(current); - current = add_agesa_fsp_acpi_table(AMD_FSP_ACPI_ALIB_HOB_GUID, "ALIB", rsdp, current); - - return current; -} -- cgit v1.2.3