diff --git a/coreboot b/coreboot
index 37c69a0..560238e 160000
--- a/coreboot
+++ b/coreboot
@@ -1 +1 @@
-Subproject commit 37c69a0123f3666a0bed0348b65a0c43014c4f1b
+Subproject commit 560238e05280ac7592244ab8d1604c3006b8c0ed
diff --git a/edk2 b/edk2
index ab4b7c3..bbe0a4b 160000
--- a/edk2
+++ b/edk2
@@ -1 +1 @@
-Subproject commit ab4b7c35a826bd542ff23cc5c19baa0ba7423093
+Subproject commit bbe0a4b22ff02f526fa55940e4bda818aba77969
diff --git a/models/galp3-c/coreboot.config b/models/galp3-c/coreboot.config
index df8c8aa..62ffa61 100644
--- a/models/galp3-c/coreboot.config
+++ b/models/galp3-c/coreboot.config
@@ -22,6 +22,7 @@ CONFIG_INCLUDE_CONFIG_FILE=y
 CONFIG_COLLECT_TIMESTAMPS=y
 # CONFIG_TIMESTAMPS_ON_CONSOLE is not set
 CONFIG_USE_BLOBS=y
+# CONFIG_USE_AMD_BLOBS is not set
 # CONFIG_COVERAGE is not set
 # CONFIG_UBSAN is not set
 # CONFIG_NO_RELOCATABLE_RAMSTAGE is not set
@@ -122,6 +123,7 @@ 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_INTEL_WIFI=y
 # CONFIG_VBOOT is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=2
@@ -138,8 +140,8 @@ CONFIG_FSP_M_CBFS="fspm.bin"
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 CONFIG_MAINBOARD_VERSION="galp3-c"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
-CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
+# CONFIG_NO_POST is not set
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x09
 CONFIG_HEAP_SIZE=0x8000
 CONFIG_CONSOLE_POST=y
@@ -344,6 +346,7 @@ CONFIG_SOC_INTEL_COMMON_NHLT=y
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_QUALCOMM_QCS405 is not set
+# CONFIG_SOC_QUALCOMM_SC7180 is not set
 # CONFIG_SOC_QUALCOMM_SDM845 is not set
 # CONFIG_SOC_ROCKCHIP_RK3288 is not set
 # CONFIG_SOC_ROCKCHIP_RK3399 is not set
@@ -371,7 +374,6 @@ CONFIG_PARALLEL_MP=y
 CONFIG_PARALLEL_MP_AP_WORK=y
 # CONFIG_UDELAY_LAPIC is not set
 CONFIG_UDELAY_TSC=y
-CONFIG_TSC_CONSTANT_RATE=y
 CONFIG_TSC_MONOTONIC_TIMER=y
 # CONFIG_TSC_SYNC_LFENCE is not set
 # CONFIG_TSC_SYNC_MFENCE is not set
@@ -430,6 +432,7 @@ CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #
 # CONFIG_SUPERIO_ASPEED_AST2400 is not set
 # CONFIG_SUPERIO_ASPEED_COMMON_PRE_RAM is not set
+# CONFIG_SUPERIO_ASPEED_HAS_UART_DELAY_WORKAROUND is not set
 # CONFIG_SUPERIO_FINTEK_FAN_CONTROL is not set
 
 #
@@ -479,7 +482,6 @@ CONFIG_RAMTOP=0x1000000
 CONFIG_EARLY_EBDA_INIT=y
 CONFIG_PC80_SYSTEM=y
 # CONFIG_BOOTBLOCK_DEBUG_SPINLOOP is not set
-# CONFIG_BOOTBLOCK_SAVE_BIST_AND_TIMESTAMP is not set
 CONFIG_HAVE_CMOS_DEFAULT=y
 CONFIG_CMOS_DEFAULT_FILE="src/mainboard/$(MAINBOARDDIR)/cmos.default"
 CONFIG_IOAPIC_INTERRUPTS_ON_FSB=y
@@ -592,6 +594,7 @@ CONFIG_DRIVERS_I2C_DESIGNWARE=y
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
 # CONFIG_DRIVERS_I2C_PCA9538 is not set
 # CONFIG_DRIVERS_I2C_PCF8523 is not set
+# CONFIG_DRIVERS_I2C_RT1011 is not set
 # CONFIG_DRIVERS_I2C_RT5663 is not set
 # CONFIG_DRIVERS_I2C_RTD2132 is not set
 # CONFIG_DRIVERS_I2C_RX6110SA is not set
@@ -709,7 +712,6 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_1 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0 is not set
-# CONFIG_NO_POST is not set
 # CONFIG_CMOS_POST is not set
 # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set
 CONFIG_HWBASE_DEBUG_CB=y
@@ -799,6 +801,7 @@ CONFIG_HAVE_DEBUG_GPIO=y
 CONFIG_HAVE_EM100_SUPPORT=y
 # CONFIG_EM100 is not set
 CONFIG_NO_EDID_FILL_FB=y
+CONFIG_RAMSTAGE_CBMEM_TOP_ARG=y
 CONFIG_SPD_READ_BY_WORD=y
 # CONFIG_ENABLE_APIC_EXT_ID is not set
 CONFIG_WARNINGS_ARE_ERRORS=y
@@ -814,5 +817,4 @@ CONFIG_RELOCATABLE_MODULES=y
 CONFIG_GENERIC_GPIO_LIB=y
 CONFIG_C_ENVIRONMENT_BOOTBLOCK=y
 CONFIG_HAVE_ROMSTAGE=y
-CONFIG_HAVE_POSTCAR=y
 CONFIG_HAVE_RAMSTAGE=y