diff --git a/src/soc/amd/common/block/psp/Kconfig b/src/soc/amd/common/block/psp/Kconfig
index 07ee0fa47d..17853faccf 100644
--- a/src/soc/amd/common/block/psp/Kconfig
+++ b/src/soc/amd/common/block/psp/Kconfig
@@ -202,3 +202,7 @@ config USE_AMDFWTOOL
 	default y if SOC_AMD_COMMON_BLOCK_PSP
 	help
 	  Select this if AMDFWTOOL needs to be built
+
+config PSPV2_MBOX_CMD_OFFSET
+	hex
+	default 0x10570
diff --git a/src/soc/amd/common/block/psp/psp_gen2.c b/src/soc/amd/common/block/psp/psp_gen2.c
index 21c1f2a735..026d32f086 100644
--- a/src/soc/amd/common/block/psp/psp_gen2.c
+++ b/src/soc/amd/common/block/psp/psp_gen2.c
@@ -8,8 +8,8 @@
 #include <device/mmio.h>
 #include "psp_def.h"
 
-#define PSP_MAILBOX_COMMAND_OFFSET	0x10570 /* 4 bytes */
-#define PSP_MAILBOX_BUFFER_OFFSET	0x10574 /* 8 bytes */
+#define PSP_MAILBOX_COMMAND_OFFSET	CONFIG_PSPV2_MBOX_CMD_OFFSET		/* 4 bytes */
+#define PSP_MAILBOX_BUFFER_OFFSET	(CONFIG_PSPV2_MBOX_CMD_OFFSET + 4)	/* 8 bytes */
 
 #define IOHC_MISC_PSP_MMIO_REG		0x2e0