src/soc/amd/cezanne/Kconfig

@@ -31,6 +31,7 @@ config SOC_SPECIFIC_OPTIONS
 	select SOC_AMD_COMMON_BLOCK_ACPI
 	select SOC_AMD_COMMON_BLOCK_ACPIMMIO
 	select SOC_AMD_COMMON_BLOCK_AOAC
+	select SOC_AMD_COMMON_BLOCK_APOB
 	select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS
 	select SOC_AMD_COMMON_BLOCK_DATA_FABRIC
 	select SOC_AMD_COMMON_BLOCK_HAS_ESPI

src/soc/amd/cezanne/romstage.c

@@ -2,6 +2,7 @@
 
 #include <acpi/acpi.h>
 #include <amdblocks/acpimmio.h>
+#include <amdblocks/apob_cache.h>
 #include <amdblocks/memmap.h>
 #include <arch/cpu.h>
 #include <console/console.h>
@@ -13,6 +14,8 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version)
 {
 	FSP_M_CONFIG *mcfg = &mupd->FspmConfig;
 
+	mupd->FspmArchUpd.NvsBufferPtr = (uintptr_t)soc_fill_apob_cache();
+
 	mcfg->pci_express_base_addr = CONFIG_MMCONF_BASE_ADDRESS;
 	mcfg->tseg_size = CONFIG_SMM_TSEG_SIZE;
 	mcfg->bert_size = CONFIG_ACPI_BERT_SIZE;
@@ -31,6 +34,7 @@ asmlinkage void car_stage_entry(void)
 	post_code(0x41);
 
 	fsp_memory_init(acpi_is_wakeup_s3());
+	soc_update_apob_cache();
 
 	/* Fixup settings FSP-M should not be changing */
 	fch_disable_legacy_dma_io();

tests/Makefile.inc

@@ -148,7 +148,7 @@ $(TEST_KCONFIG_AUTOCONFIG): $(TEST_KCONFIG_AUTOHEADER)
 
 ifeq ($(JUNIT_OUTPUT),y)
 $(alltests): export CMOCKA_MESSAGE_OUTPUT=xml
-$(alltests): export CMOCKA_XML_FILE=$(testobj)/junit-$(subst /,_,$^).xml
+$(alltests): export CMOCKA_XML_FILE=$(testobj)/junit-$(subst /,_,$^)-%g.xml
 endif
 
 $(alltests): $$($$(@)-bin)