diff --git a/apps/firmware-setup b/apps/firmware-setup
index 39cbc4a..2a747f9 160000
--- a/apps/firmware-setup
+++ b/apps/firmware-setup
@@ -1 +1 @@
-Subproject commit 39cbc4ab112e2bbbb947a34a218db4374d7c0fad
+Subproject commit 2a747f948c93b977287a40bc14cfc55f2df9ce5d
diff --git a/apps/firmware-update b/apps/firmware-update
index f594469..16f6e49 160000
--- a/apps/firmware-update
+++ b/apps/firmware-update
@@ -1 +1 @@
-Subproject commit f59446968c4924d0021af9e0f6b81d443b8ffde2
+Subproject commit 16f6e4963fa8ce72162655ab266a92b7deeb8294
diff --git a/coreboot b/coreboot
index 39a8826..b0f5985 160000
--- a/coreboot
+++ b/coreboot
@@ -1 +1 @@
-Subproject commit 39a882699e963f89dc80cbd14b56fad055c72261
+Subproject commit b0f598558e6b421f32c67c86c3615e891438d908
diff --git a/models/galp3-c/coreboot.config b/models/galp3-c/coreboot.config
index 5ab9016..64d3801 100644
--- a/models/galp3-c/coreboot.config
+++ b/models/galp3-c/coreboot.config
@@ -98,8 +98,6 @@ CONFIG_DIMM_SPD_SIZE=512
 CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_VGA_BIOS_FILE="pci8086,3ea0.rom"
 CONFIG_C_ENV_BOOTBLOCK_SIZE=0xC000
-CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1323
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="System76"
 CONFIG_VARIANT_DIR="galp3-c"
 CONFIG_DEVICETREE="devicetree.cb"
@@ -129,6 +127,8 @@ CONFIG_FSP_S_FILE="$(obj)/Fsp_S.fd"
 CONFIG_FSP_S_CBFS="fsps.bin"
 CONFIG_FSP_M_CBFS="fspm.bin"
 CONFIG_CPU_ADDR_BITS=36
+CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1323
+CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x1558
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 CONFIG_MAINBOARD_VERSION="galp3-c"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
@@ -199,7 +199,7 @@ CONFIG_X86_TOP4G_BOOTMEDIA_MAP=y
 CONFIG_ROMSTAGE_ADDR=0x2000000
 CONFIG_VERSTAGE_ADDR=0x2000000
 CONFIG_FSP_HEADER_PATH="3rdparty/fsp/CoffeeLakeFspBinPkg/Include/"
-CONFIG_FSP_FD_PATH="3rdparty/fsp/CoffeeLakeFspBinPkg/Fsp.fd"
+CONFIG_FSP_FD_PATH="3rdparty/fsp/CoffeeLakeFspBinPkg/FSP.fd"
 # CONFIG_NHLT_DMIC_1CH_16B is not set
 # CONFIG_NHLT_DMIC_2CH_16B is not set
 # CONFIG_NHLT_DMIC_4CH_16B is not set
@@ -228,6 +228,7 @@ CONFIG_MAX_ROOT_PORTS=16
 # CONFIG_MB_HAS_ACTIVE_HIGH_SD_PWR_ENABLE is not set
 # CONFIG_USE_CANNONLAKE_CAR_NEM_ENHANCED is not set
 CONFIG_USE_CANNONLAKE_FSP_CAR=y
+CONFIG_SOC_INTEL_CANNONLAKE_DEBUG_CONSENT=0
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 # CONFIG_SOC_INTEL_KABYLAKE is not set
@@ -298,7 +299,6 @@ CONFIG_SA_PCIEX_LENGTH=0x10000000
 # CONFIG_SA_ENABLE_DPR is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_UART=y
-# CONFIG_SOC_INTEL_COMMON_BLOCK_VMX is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG is not set
@@ -320,6 +320,7 @@ CONFIG_SOC_INTEL_COMMON_ACPI_WAKE_SOURCE=y
 # CONFIG_SOC_INTEL_COMMON_ACPI is not set
 CONFIG_SOC_INTEL_COMMON_ACPI_EC_PTS_WAK=y
 CONFIG_SOC_INTEL_COMMON_NHLT=y
+# CONFIG_SOC_INTEL_DEBUG_CONSENT is not set
 # CONFIG_SOC_MEDIATEK_MT8173 is not set
 # CONFIG_SOC_MEDIATEK_MT8183 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
@@ -345,6 +346,9 @@ CONFIG_NUM_IPI_STARTS=2
 CONFIG_SSE2=y
 CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE=y
 # CONFIG_CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED is not set
+CONFIG_CPU_INTEL_COMMON=y
+CONFIG_ENABLE_VMX=y
+CONFIG_SET_IA32_FC_LOCK_BIT=y
 CONFIG_MICROCODE_UPDATE_PRE_RAM=y
 # CONFIG_CPU_TI_AM335X is not set
 # CONFIG_PARALLEL_CPU_INIT is not set
@@ -529,6 +533,7 @@ CONFIG_POSTCAR_STAGE=y
 CONFIG_BOOTBLOCK_SIMPLE=y
 # CONFIG_BOOTBLOCK_NORMAL is not set
 CONFIG_BOOTBLOCK_SOURCE="bootblock_simple.c"
+CONFIG_ACPI_HAVE_PCAT_8259=y
 # CONFIG_COLLECT_TIMESTAMPS_NO_TSC is not set
 CONFIG_COLLECT_TIMESTAMPS_TSC=y
 # CONFIG_PAGING_IN_CACHE_AS_RAM is not set