diff options
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; -} |