Attention is currently required from: Jason Glenesk, Raul Rangel, Marshall Dawson, Felix Held. Nikolai Vyssotski has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/52746 )
Change subject: soc/amd/picasso: Move Type 17 DMI generation to common ......................................................................
soc/amd/picasso: Move Type 17 DMI generation to common
Move dmi.c code to common/fsp to be shared among different SOCs.
BUG=b:184124605
Change-Id: I46071556bbbbf6435d9e3724bba19e102bd02535 Signed-off-by: Nikolai Vyssotski nikolai.vyssotski@amd.corp-partner.google.com --- M src/soc/amd/common/Kconfig.common M src/soc/amd/common/fsp/Makefile.inc R src/soc/amd/common/fsp/dmi.c M src/soc/amd/picasso/Kconfig M src/soc/amd/picasso/Makefile.inc 5 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/52746/1
diff --git a/src/soc/amd/common/Kconfig.common b/src/soc/amd/common/Kconfig.common index fa1d14a..909187c 100644 --- a/src/soc/amd/common/Kconfig.common +++ b/src/soc/amd/common/Kconfig.common @@ -8,6 +8,9 @@ config SOC_AMD_PI bool
+config SOC_AMD_FSP_DMI_TABLES + bool + source "src/soc/amd/common/block/*/Kconfig"
endif # SOC_AMD_COMMON diff --git a/src/soc/amd/common/fsp/Makefile.inc b/src/soc/amd/common/fsp/Makefile.inc index 5523876..1a5a328 100644 --- a/src/soc/amd/common/fsp/Makefile.inc +++ b/src/soc/amd/common/fsp/Makefile.inc @@ -2,3 +2,7 @@ romstage-y += fsp_reset.c ramstage-y += fsp_reset.c endif # CONFIG_PLATFORM_USES_FSP2_0 + +ifeq ($(CONFIG_SOC_AMD_FSP_DMI_TABLES),y) +ramstage-y += dmi.c +endif # CONFIG_SOC_AMD_FSP_DMI_TABLES diff --git a/src/soc/amd/picasso/dmi.c b/src/soc/amd/common/fsp/dmi.c similarity index 98% rename from src/soc/amd/picasso/dmi.c rename to src/soc/amd/common/fsp/dmi.c index 1133670..3df193b 100644 --- a/src/soc/amd/picasso/dmi.c +++ b/src/soc/amd/common/fsp/dmi.c @@ -13,7 +13,7 @@ #include <bootstate.h> #include <lib.h> #include <dimm_info_util.h> -#include <vendorcode/amd/fsp/picasso/dmi_info.h> +#include <dmi_info.h> #include <device/dram/ddr4.h>
/** diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index 0c494d9..f64c81c 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -52,6 +52,7 @@ select SOC_AMD_COMMON_BLOCK_TSC_FAM17H_19H select SOC_AMD_COMMON_BLOCK_UART select SOC_AMD_COMMON_BLOCK_UCODE + select SOC_AMD_FSP_DMI_TABLES select PROVIDES_ROM_SHARING select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH select PARALLEL_MP diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index 081a65f..36eb49d 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -51,7 +51,6 @@ ramstage-y += graphics.c ramstage-y += pcie_gpp.c ramstage-y += xhci.c -ramstage-y += dmi.c
smm-y += smihandler.c ifeq ($(CONFIG_DEBUG_SMI),y)