diff --git a/apps/firmware-update b/apps/firmware-update
index be9ade7..7a8f814 160000
--- a/apps/firmware-update
+++ b/apps/firmware-update
@@ -1 +1 @@
-Subproject commit be9ade7cc571febceb6719ba0f86f6b12614e8f7
+Subproject commit 7a8f8144781d4fc240cbf87b06897db5f453eec7
diff --git a/coreboot b/coreboot
index 3dd5bc6..2ee83f8 160000
--- a/coreboot
+++ b/coreboot
@@ -1 +1 @@
-Subproject commit 3dd5bc65508aaf8c2778ba5058e1179775b86d25
+Subproject commit 2ee83f8df4eebb1238acca19751659aaba3449c4
diff --git a/models/addw2/coreboot.config b/models/addw2/coreboot.config
index 3591a15..a393b4c 100644
--- a/models/addw2/coreboot.config
+++ b/models/addw2/coreboot.config
@@ -160,11 +160,10 @@ CONFIG_BOARD_SYSTEM76_ADDW2=y
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_SUBSYSTEM_DEVICE_ID=0x65e1
-CONFIG_FSP_M_XIP=y
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/FSP.fd"
+CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_SUBSYSTEM_DEVICE_ID=0x65e1
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -632,6 +631,7 @@ CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_2 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
+CONFIG_FSP_M_XIP=y
 # CONFIG_FSP_T_XIP is not set
 CONFIG_FSP_USES_CB_STACK=y
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y
diff --git a/models/bonw14/coreboot.config b/models/bonw14/coreboot.config
index b13716f..5aaa7d5 100644
--- a/models/bonw14/coreboot.config
+++ b/models/bonw14/coreboot.config
@@ -157,11 +157,10 @@ CONFIG_BOARD_SYSTEM76_BONW14=y
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_SUBSYSTEM_DEVICE_ID=0x7714
-CONFIG_FSP_M_XIP=y
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLakeS/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLakeS/FSP.fd"
+CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_SUBSYSTEM_DEVICE_ID=0x7714
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -620,6 +619,7 @@ CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_2 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
+CONFIG_FSP_M_XIP=y
 # CONFIG_FSP_T_XIP is not set
 CONFIG_FSP_USES_CB_STACK=y
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y
diff --git a/models/darp5/coreboot.config b/models/darp5/coreboot.config
index 769d290..3c80d5f 100644
--- a/models/darp5/coreboot.config
+++ b/models/darp5/coreboot.config
@@ -164,11 +164,10 @@ CONFIG_HEAP_SIZE=0x8000
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 CONFIG_BOARD_SYSTEM76_DARP5=y
-CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_SUBSYSTEM_DEVICE_ID=0x1325
-CONFIG_FSP_M_XIP=y
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CoffeeLakeFspBinPkg/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/CoffeeLakeFspBinPkg/Fsp.fd"
+CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_SUBSYSTEM_DEVICE_ID=0x1325
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -549,8 +548,8 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_HOTPLUG=y
-CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y
-# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set
+# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G is not set
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_INTEL_GMA_HAVE_VBT=y
@@ -637,6 +636,7 @@ CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_2 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
+CONFIG_FSP_M_XIP=y
 # CONFIG_FSP_T_XIP is not set
 CONFIG_FSP_USES_CB_STACK=y
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y
diff --git a/models/darp6/chip.txt b/models/darp6/chip.txt
index f762617..9b1d0de 100644
--- a/models/darp6/chip.txt
+++ b/models/darp6/chip.txt
@@ -1 +1 @@
-GD25Q128C
+GD25Q127C/GD25Q128C
diff --git a/models/darp6/coreboot.config b/models/darp6/coreboot.config
index 8a010e5..db22b28 100644
--- a/models/darp6/coreboot.config
+++ b/models/darp6/coreboot.config
@@ -164,11 +164,10 @@ CONFIG_BOARD_SYSTEM76_DARP6=y
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_SUBSYSTEM_DEVICE_ID=0x1404
-CONFIG_FSP_M_XIP=y
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/FSP.fd"
+CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_SUBSYSTEM_DEVICE_ID=0x1404
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -549,8 +548,8 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_HOTPLUG=y
-CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y
-# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set
+# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G is not set
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_INTEL_GMA_HAVE_VBT=y
@@ -637,6 +636,7 @@ CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_2 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
+CONFIG_FSP_M_XIP=y
 # CONFIG_FSP_T_XIP is not set
 CONFIG_FSP_USES_CB_STACK=y
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y
diff --git a/models/galp2/coreboot.config b/models/galp2/coreboot.config
index 9fc5351..25c336c 100644
--- a/models/galp2/coreboot.config
+++ b/models/galp2/coreboot.config
@@ -168,11 +168,10 @@ CONFIG_BOARD_SYSTEM76_GALP2=y
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_SUBSYSTEM_DEVICE_ID=0x1303
-CONFIG_FSP_M_XIP=y
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
+CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_SUBSYSTEM_DEVICE_ID=0x1303
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -644,6 +643,7 @@ CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_2 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
+CONFIG_FSP_M_XIP=y
 # CONFIG_FSP_T_XIP is not set
 # CONFIG_FSP_USES_CB_STACK is not set
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y
diff --git a/models/galp3-b/coreboot.config b/models/galp3-b/coreboot.config
index 2c1a6a8..5c9c3f9 100644
--- a/models/galp3-b/coreboot.config
+++ b/models/galp3-b/coreboot.config
@@ -168,11 +168,10 @@ CONFIG_BOARD_SYSTEM76_GALP3_B=y
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_SUBSYSTEM_DEVICE_ID=0x1413
-CONFIG_FSP_M_XIP=y
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
+CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_SUBSYSTEM_DEVICE_ID=0x1413
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -644,6 +643,7 @@ CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_2 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
+CONFIG_FSP_M_XIP=y
 # CONFIG_FSP_T_XIP is not set
 # CONFIG_FSP_USES_CB_STACK is not set
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y
diff --git a/models/galp3-c/coreboot.config b/models/galp3-c/coreboot.config
index e5ae5ed..93b8745 100644
--- a/models/galp3-c/coreboot.config
+++ b/models/galp3-c/coreboot.config
@@ -164,11 +164,10 @@ CONFIG_HEAP_SIZE=0x8000
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 CONFIG_BOARD_SYSTEM76_GALP3_C=y
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_SUBSYSTEM_DEVICE_ID=0x1323
-CONFIG_FSP_M_XIP=y
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CoffeeLakeFspBinPkg/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/CoffeeLakeFspBinPkg/Fsp.fd"
+CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_SUBSYSTEM_DEVICE_ID=0x1323
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -549,8 +548,8 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_HOTPLUG=y
-CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y
-# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set
+# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G is not set
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_INTEL_GMA_HAVE_VBT=y
@@ -637,6 +636,7 @@ CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_2 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
+CONFIG_FSP_M_XIP=y
 # CONFIG_FSP_T_XIP is not set
 CONFIG_FSP_USES_CB_STACK=y
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y
diff --git a/models/galp3/coreboot.config b/models/galp3/coreboot.config
index f296d35..527c4b1 100644
--- a/models/galp3/coreboot.config
+++ b/models/galp3/coreboot.config
@@ -168,11 +168,10 @@ CONFIG_BOARD_SYSTEM76_GALP3=y
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_SUBSYSTEM_DEVICE_ID=0x1313
-CONFIG_FSP_M_XIP=y
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
+CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_SUBSYSTEM_DEVICE_ID=0x1313
 CONFIG_BOARD_ROMSIZE_KB_8192=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -644,6 +643,7 @@ CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_2 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
+CONFIG_FSP_M_XIP=y
 # CONFIG_FSP_T_XIP is not set
 # CONFIG_FSP_USES_CB_STACK is not set
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y
diff --git a/models/galp4/coreboot.config b/models/galp4/coreboot.config
index ec497df..5529f4e 100644
--- a/models/galp4/coreboot.config
+++ b/models/galp4/coreboot.config
@@ -164,11 +164,10 @@ CONFIG_BOARD_SYSTEM76_GALP4=y
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_SUBSYSTEM_DEVICE_ID=0x1403
-CONFIG_FSP_M_XIP=y
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/FSP.fd"
+CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_SUBSYSTEM_DEVICE_ID=0x1403
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -549,8 +548,8 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 CONFIG_PCIEXP_HOTPLUG=y
-CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G=y
-# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G is not set
+# CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_ABOVE_4G is not set
+CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 # CONFIG_EARLY_PCI_BRIDGE is not set
 CONFIG_INTEL_GMA_HAVE_VBT=y
@@ -637,6 +636,7 @@ CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_2 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
+CONFIG_FSP_M_XIP=y
 # CONFIG_FSP_T_XIP is not set
 CONFIG_FSP_USES_CB_STACK=y
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y
diff --git a/models/gaze15/coreboot.config b/models/gaze15/coreboot.config
index 1a9f2e2..210f493 100644
--- a/models/gaze15/coreboot.config
+++ b/models/gaze15/coreboot.config
@@ -157,11 +157,10 @@ CONFIG_BOARD_SYSTEM76_GAZE15=y
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_SUBSYSTEM_DEVICE_ID=0x8520
-CONFIG_FSP_M_XIP=y
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/FSP.fd"
+CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_SUBSYSTEM_DEVICE_ID=0x8520
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -626,6 +625,7 @@ CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_2 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
+CONFIG_FSP_M_XIP=y
 # CONFIG_FSP_T_XIP is not set
 CONFIG_FSP_USES_CB_STACK=y
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y
diff --git a/models/lemp9/coreboot.config b/models/lemp9/coreboot.config
index 46f9c0f..526a98b 100644
--- a/models/lemp9/coreboot.config
+++ b/models/lemp9/coreboot.config
@@ -157,11 +157,10 @@ CONFIG_BOARD_SYSTEM76_LEMP9=y
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_SUBSYSTEM_DEVICE_ID=0x1401
-CONFIG_FSP_M_XIP=y
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/FSP.fd"
+CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_SUBSYSTEM_DEVICE_ID=0x1401
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -625,6 +624,7 @@ CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_2 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
+CONFIG_FSP_M_XIP=y
 # CONFIG_FSP_T_XIP is not set
 CONFIG_FSP_USES_CB_STACK=y
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y
diff --git a/models/oryp6/coreboot.config b/models/oryp6/coreboot.config
index c9fb168..dce63e3 100644
--- a/models/oryp6/coreboot.config
+++ b/models/oryp6/coreboot.config
@@ -160,11 +160,10 @@ CONFIG_BOARD_SYSTEM76_ORYP6=y
 # CONFIG_BOARD_SYSTEM76_THELIO_B1 is not set
 # CONFIG_BOARD_SYSTEM76_GALP3_C is not set
 # CONFIG_BOARD_SYSTEM76_DARP5 is not set
-CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_SUBSYSTEM_DEVICE_ID=0x50d3
-CONFIG_FSP_M_XIP=y
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/Include/"
 CONFIG_FSP_FD_PATH="3rdparty/fsp/CometLakeFspBinPkg/CometLake1/FSP.fd"
+CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_SUBSYSTEM_DEVICE_ID=0x50d3
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -632,6 +631,7 @@ CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_PLATFORM_USES_FSP2_2 is not set
 CONFIG_HAVE_INTEL_FSP_REPO=y
 # CONFIG_FSP_CAR is not set
+CONFIG_FSP_M_XIP=y
 # CONFIG_FSP_T_XIP is not set
 CONFIG_FSP_USES_CB_STACK=y
 CONFIG_HAVE_FSP_LOGO_SUPPORT=y