diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 041caa5c20..548714353f 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -347,9 +347,6 @@ amd_bios_entry amd_bios_table[] = {
 	{ .type = AMD_BIOS_INVALID },
 };
 
-
-#define MAX_BIOS_ENTRIES 0x2f
-
 typedef struct _context {
 	char *rom;		/* target buffer, size of flash device */
 	uint32_t rom_size;	/* size of flash device */
diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h
index d40e60d237..12d1b1430b 100644
--- a/util/amdfwtool/amdfwtool.h
+++ b/util/amdfwtool/amdfwtool.h
@@ -163,7 +163,7 @@ typedef struct _psp_directory_table {
 	psp_directory_entry entries[];
 } __attribute__((packed, aligned(16))) psp_directory_table;
 
-#define MAX_PSP_ENTRIES 0x1f
+#define MAX_PSP_ENTRIES 0x2f
 
 typedef struct _psp_combo_header {
 	uint32_t cookie;
@@ -222,6 +222,8 @@ typedef struct _bios_directory_table {
 	bios_directory_entry entries[];
 } bios_directory_table;
 
+#define MAX_BIOS_ENTRIES 0x2f
+
 #define BDT_LVL1 (1 << 0)
 #define BDT_LVL2 (1 << 1)
 #define BDT_LVL1_AB (1 << 2)