diff --git a/src/soc/amd/common/block/apob/Makefile.inc b/src/soc/amd/common/block/apob/Makefile.inc
index 6e217df648..56cd5e12de 100644
--- a/src/soc/amd/common/block/apob/Makefile.inc
+++ b/src/soc/amd/common/block/apob/Makefile.inc
@@ -1,4 +1,8 @@
 ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_APOB),y)
 romstage-y += apob_cache.c
 ramstage-y += apob_cache.c
+
+$(call src-to-obj,romstage,$(dir)/apob_cache.c) : $(obj)/fmap_config.h
+$(call src-to-obj,ramstage,$(dir)/apob_cache.c) : $(obj)/fmap_config.h
+
 endif # CONFIG_SOC_AMD_COMMON_BLOCK_APOB
diff --git a/src/soc/amd/common/block/apob/apob_cache.c b/src/soc/amd/common/block/apob/apob_cache.c
index bdacd81ba4..b932458ec2 100644
--- a/src/soc/amd/common/block/apob/apob_cache.c
+++ b/src/soc/amd/common/block/apob/apob_cache.c
@@ -9,15 +9,15 @@
 #include <commonlib/region.h>
 #include <console/console.h>
 #include <fmap.h>
+#include <fmap_config.h>
 #include <spi_flash.h>
 #include <stdint.h>
 #include <string.h>
 #include <thread.h>
 #include <timestamp.h>
 
-#define DEFAULT_MRC_CACHE "RW_MRC_CACHE"
-/* PSP requires this value to be 64KiB */
-#define DEFAULT_MRC_CACHE_SIZE 0x10000
+#define DEFAULT_MRC_CACHE	"RW_MRC_CACHE"
+#define DEFAULT_MRC_CACHE_SIZE	FMAP_SECTION_RW_MRC_CACHE_SIZE
 
 #if !CONFIG_PSP_APOB_DRAM_ADDRESS
 #error Incorrect APOB configuration setting(s)