diff --git a/coreboot b/coreboot
index 2106c47..39223b8 160000
--- a/coreboot
+++ b/coreboot
@@ -1 +1 @@
-Subproject commit 2106c470f394134e82bcfcebcc93cb11ecd017db
+Subproject commit 39223b859ebb5be98ea1dc1de8bfb230fdfe6fc1
diff --git a/models/galp3-c/coreboot.config b/models/galp3-c/coreboot.config
index 8129e7a..8a28ac3 100644
--- a/models/galp3-c/coreboot.config
+++ b/models/galp3-c/coreboot.config
@@ -29,6 +29,7 @@ CONFIG_RELOCATABLE_RAMSTAGE=y
 CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM=y
 # CONFIG_UPDATE_IMAGE is not set
 # CONFIG_BOOTSPLASH_IMAGE is not set
+# CONFIG_RAMPAYLOAD is not set
 
 #
 # Mainboard
@@ -84,6 +85,7 @@ CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM=y
 CONFIG_VENDOR_SYSTEM76=y
 # CONFIG_VENDOR_TI is not set
 # CONFIG_VENDOR_TYAN is not set
+# CONFIG_VENDOR_UP is not set
 # CONFIG_VENDOR_VIA is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
 CONFIG_MAINBOARD_DIR="system76/whl-u"
@@ -114,6 +116,11 @@ CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
 CONFIG_MMCONF_BASE_ADDRESS=0xe0000000
 CONFIG_HAVE_INTEL_FIRMWARE=y
 # CONFIG_POST_DEVICE is not set
+CONFIG_CPU_MICROCODE_CBFS_LEN=0x0
+CONFIG_CPU_MICROCODE_CBFS_LOC=0x0
+CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
+CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
+CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_DRIVERS_UART_8250IO is not set
 # CONFIG_VBOOT is not set
 CONFIG_DIMM_MAX=2
@@ -148,6 +155,8 @@ CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x1323
 CONFIG_CONSOLE_POST=y
 CONFIG_PXE_ROM_ID="10ec,8168"
 CONFIG_FSP_M_XIP=y
+CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
+CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 CONFIG_BOARD_ROMSIZE_KB_16384=y
 # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set
 # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set
@@ -207,7 +216,6 @@ CONFIG_FSP_FD_PATH="3rdparty/fsp/CoffeeLakeFspBinPkg/FSP.fd"
 # CONFIG_NHLT_DMIC_4CH_16B is not set
 # CONFIG_NHLT_MAX98357 is not set
 # CONFIG_NHLT_DA7219 is not set
-CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_IFD_CHIPSET="cnl"
 CONFIG_CPU_BCLK_MHZ=100
 CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
@@ -232,8 +240,6 @@ CONFIG_MAX_PCIE_CLOCKS=6
 # CONFIG_USE_CANNONLAKE_CAR_NEM_ENHANCED is not set
 CONFIG_USE_CANNONLAKE_FSP_CAR=y
 CONFIG_SOC_INTEL_CANNONLAKE_DEBUG_CONSENT=0
-CONFIG_CPU_MICROCODE_CBFS_LOC=0x0
-CONFIG_CPU_MICROCODE_CBFS_LEN=0x0
 CONFIG_CONSOLE_CBMEM=y
 CONFIG_UART_PCI_ADDR=0x0
 # CONFIG_SOC_INTEL_KABYLAKE is not set
@@ -289,6 +295,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_RTC=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SATA=y
 CONFIG_SOC_AHCI_PORT_IMPLEMENTED_INVERT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_SCS=y
+# CONFIG_SOC_INTEL_COMMON_EARLY_MMC_WAKE is not set
 # CONFIG_SOC_INTEL_COMMON_BLOCK_SGX is not set
 CONFIG_SOC_INTEL_COMMON_BLOCK_SMBUS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_TCO=y
@@ -329,7 +336,7 @@ CONFIG_SOC_INTEL_COMMON_NHLT=y
 # CONFIG_SOC_MEDIATEK_MT8183 is not set
 # CONFIG_SOC_NVIDIA_TEGRA124 is not set
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
-# CONFIG_QC_SDI_ENABLE is not set
+# CONFIG_SOC_QUALCOMM_COMMON is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_QUALCOMM_QCS405 is not set
@@ -375,7 +382,6 @@ CONFIG_SMM_STUB_STACK_SIZE=0x400
 # CONFIG_SMM_LAPIC_REMAP_MITIGATION is not set
 # CONFIG_SERIALIZED_SMM_INITIALIZATION is not set
 # CONFIG_X86_AMD_FIXED_MTRRS is not set
-# CONFIG_PLATFORM_USES_FSP1_0 is not set
 # CONFIG_MIRROR_PAYLOAD_TO_RAM_BEFORE_LOADING is not set
 # CONFIG_SOC_SETS_MSRS is not set
 CONFIG_CACHE_AS_RAM=y
@@ -418,6 +424,8 @@ CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED=y
 #
 # Super I/O
 #
+# CONFIG_SUPERIO_ASPEED_AST2400 is not set
+# CONFIG_SUPERIO_ASPEED_COMMON_PRE_RAM is not set
 # CONFIG_SUPERIO_NUVOTON_NCT6776_COM_A is not set
 
 #
@@ -493,7 +501,7 @@ CONFIG_UDK_VERSION=2017
 # CONFIG_ARCH_ROMSTAGE_PPC64 is not set
 # CONFIG_ARCH_RAMSTAGE_PPC64 is not set
 # CONFIG_ARCH_RISCV is not set
-CONFIG_ARCH_RISCV_M=y
+# CONFIG_ARCH_RISCV_M is not set
 # CONFIG_ARCH_RISCV_S is not set
 # CONFIG_ARCH_RISCV_U is not set
 # CONFIG_ARCH_RISCV_RV64 is not set
@@ -572,8 +580,6 @@ CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 # CONFIG_AZALIA_PLUGIN_SUPPORT is not set
 CONFIG_PCIEXP_PLUGIN_SUPPORT=y
 # CONFIG_EARLY_PCI_BRIDGE is not set
-CONFIG_SUBSYSTEM_VENDOR_ID=0x0000
-CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 CONFIG_INTEL_GMA_HAVE_VBT=y
 CONFIG_INTEL_GMA_ADD_VBT=y
 # CONFIG_SOFTWARE_I2C is not set
@@ -587,7 +593,6 @@ CONFIG_INTEL_GMA_ADD_VBT=y
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
 CONFIG_CACHE_MRC_SETTINGS=y
-CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_MRC_SETTINGS_PROTECT=y
 # CONFIG_HAS_RECOVERY_MRC_CACHE is not set
 # CONFIG_MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN is not set
@@ -614,7 +619,6 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
 # CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set
 # CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set
 # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set
@@ -645,6 +649,7 @@ CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL is not set
 # CONFIG_MAINBOARD_HAS_I2C_TPM_CR50 is not set
 # CONFIG_MAINBOARD_HAS_I2C_TPM_GENERIC is not set
+# CONFIG_PLATFORM_USES_FSP1_0 is not set
 CONFIG_FSP_USE_REPO=y
 # CONFIG_DISPLAY_HOBS is not set
 # CONFIG_DISPLAY_UPD_DATA is not set
@@ -829,6 +834,7 @@ CONFIG_HAVE_DEBUG_GPIO=y
 CONFIG_HAVE_EM100_SUPPORT=y
 # CONFIG_EM100 is not set
 CONFIG_NO_EDID_FILL_FB=y
+CONFIG_SPD_READ_BY_WORD=y
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
 # CONFIG_POWER_BUTTON_DEFAULT_ENABLE is not set
@@ -841,5 +847,4 @@ CONFIG_REG_SCRIPT=y
 # CONFIG_EARLY_CBMEM_LIST is not set
 CONFIG_RELOCATABLE_MODULES=y
 CONFIG_GENERIC_GPIO_LIB=y
-CONFIG_SPD_READ_BY_WORD=y
 CONFIG_C_ENVIRONMENT_BOOTBLOCK=y