From 6f9de346ae35cd4619443d88029b0b1d713bb9c7 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Wed, 14 May 2025 15:12:08 +0200 Subject: [PATCH] Revert "soc/amd/glinda/Makefile.mk: Use relative address for APOB_NV" This reverts commit d263e0bd927d94beb9449c4de6bf111c8df12cbb. Commit a7eb390796ef ("mb/*/*/*.fmd: Start flash at 0") changed the FMAP to always begin at 0 and not at the x86 MMIO address where it gets mapped, so the commit reverted by this patch isn't needed any more after the FMAP change has landed. Change-Id: I6d866ce3a3395f9fe70c47892a224e89ff89b20e Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/87673 Tested-by: build bot (Jenkins) Reviewed-by: Maximilian Brune --- src/soc/amd/glinda/Makefile.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/soc/amd/glinda/Makefile.mk b/src/soc/amd/glinda/Makefile.mk index 0232f2f55e..eb488d6a0f 100644 --- a/src/soc/amd/glinda/Makefile.mk +++ b/src/soc/amd/glinda/Makefile.mk @@ -126,13 +126,11 @@ PSP_ELF_FILE=$(objcbfs)/bootblock.elf PSP_BIOSBIN_SIZE=$(shell $(READELF_bootblock) -Wl $(PSP_ELF_FILE) | grep LOAD | awk '{print $$5}') PSP_BIOSBIN_DEST=$(shell $(READELF_bootblock) -Wl $(PSP_ELF_FILE) | grep LOAD | awk '{print $$3}') -FMAP_FLASH_START=$(call get_fmap_value,FMAP_SECTION_FLASH_START) ifneq ($(CONFIG_SOC_AMD_COMMON_BLOCK_APOB_NV_DISABLE),y) # type = 0x63 - construct APOB NV base/size from flash map # The flashmap section used for this is expected to be named RW_MRC_CACHE APOB_NV_SIZE=$(call get_fmap_value,FMAP_SECTION_RW_MRC_CACHE_SIZE) -APOB_NV_BASE=$(call _tohex,$(call int-subtract, \ - $(call get_fmap_value,FMAP_SECTION_RW_MRC_CACHE_START) $(FMAP_FLASH_START))) +APOB_NV_BASE=$(call get_fmap_value,FMAP_SECTION_RW_MRC_CACHE_START) endif # !CONFIG_SOC_AMD_COMMON_BLOCK_APOB_NV_DISABLE ifeq ($(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK),y)