diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2024-01-26 15:33:59 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2024-01-27 16:40:34 +0000 |
| commit | 112c2277f51684157f5c46a06b3b038b5b730679 (patch) | |
| tree | 4ff3ced247ed5e7342f34c00b2314ee22d55bc40 /src/soc/amd/picasso | |
| parent | 26577d2ecbb8c01635b959d296f70eb251743046 (diff) | |
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 <felix-coreboot@felixheld.de>
Change-Id: I8917a346f586e77b3b3278c73aed8cf61f3c9e6a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80225
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/amd/picasso')
| -rw-r--r-- | src/soc/amd/picasso/Makefile.mk | 1 | ||||
| -rw-r--r-- | src/soc/amd/picasso/acpi.c | 3 | ||||
| -rw-r--r-- | src/soc/amd/picasso/agesa_acpi.c | 15 |
3 files changed, 2 insertions, 17 deletions
diff --git a/src/soc/amd/picasso/Makefile.mk b/src/soc/amd/picasso/Makefile.mk index 52f1ab0911..94d7f7bb73 100644 --- a/src/soc/amd/picasso/Makefile.mk +++ b/src/soc/amd/picasso/Makefile.mk @@ -20,7 +20,6 @@ romstage-y += fsp_m_params.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi_crat.c -ramstage-$(CONFIG_HAVE_ACPI_TABLES) += agesa_acpi.c ramstage-y += chip.c ramstage-y += cpu.c ramstage-y += fch.c diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index 94721073cf..b95db5de94 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -70,7 +70,8 @@ unsigned long soc_acpi_write_tables(const struct device *device, unsigned long c /* Add SRAT, MSCT, SLIT if needed in the future */ - 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/picasso/agesa_acpi.c b/src/soc/amd/picasso/agesa_acpi.c deleted file mode 100644 index a5057bf59f..0000000000 --- a/src/soc/amd/picasso/agesa_acpi.c +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <acpi/acpi.h> -#include <amdblocks/acpi.h> -#include <FspGuids.h> -#include <types.h> - -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; -} |