diff --git a/coreboot b/coreboot
index 12bb328..53c0e6c 160000
--- a/coreboot
+++ b/coreboot
@@ -1 +1 @@
-Subproject commit 12bb32890fe07a5dabf555a3d2f181a9844400bf
+Subproject commit 53c0e6c49496b83cb60b91f6837331db60737f0e
diff --git a/edk2 b/edk2
index dd91bf2..6ff658a 160000
--- a/edk2
+++ b/edk2
@@ -1 +1 @@
-Subproject commit dd91bf252d45e64c5cf96674c01fcc01b463d4ce
+Subproject commit 6ff658a216dd5f68b92f705f35de0cd974079efe
diff --git a/models/gaze14_1650_15/coreboot.config b/models/gaze14_1650_15/coreboot.config
index a99318c..a170fbc 100644
--- a/models/gaze14_1650_15/coreboot.config
+++ b/models/gaze14_1650_15/coreboot.config
@@ -88,6 +88,7 @@ CONFIG_MAINBOARD_DIR="system76/cfl-h"
 CONFIG_MAINBOARD_PART_NUMBER="gaze14"
 CONFIG_MAX_CPUS=12
 CONFIG_CBFS_SIZE=0xA00000
+CONFIG_UART_FOR_CONSOLE=2
 CONFIG_MAINBOARD_VENDOR="System76"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_DIMM_SPD_SIZE=512
@@ -113,6 +114,7 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 # CONFIG_DRIVERS_UART_8250IO is not set
 # CONFIG_VBOOT is not set
 CONFIG_DIMM_MAX=2
+CONFIG_TTYS0_LCS=3
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Gazelle"
 CONFIG_IFD_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/fd.rom"
 CONFIG_ME_BIN_PATH="$(FIRMWARE_OPEN_MODEL_DIR)/me.rom"
@@ -123,14 +125,10 @@ 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=0x8560
-CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x1558
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_MAINBOARD_VERSION="gaze14"
 # CONFIG_DRIVERS_PS2_KEYBOARD is not set
 CONFIG_PCIEXP_L1_SUB_STATE=y
-CONFIG_CPU_MICROCODE_CBFS_LEN=0x0
-CONFIG_CPU_MICROCODE_CBFS_LOC=0x0
 CONFIG_SMBIOS_ENCLOSURE_TYPE=0x09
 CONFIG_HEAP_SIZE=0x8000
 CONFIG_BOARD_SYSTEM76_GAZE14_1650_15=y
@@ -143,6 +141,8 @@ CONFIG_BOARD_SYSTEM76_GAZE14_1650_15=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_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x1558
+CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x8560
 CONFIG_CONSOLE_POST=y
 CONFIG_PXE_ROM_ID="10ec,8168"
 CONFIG_FSP_M_XIP=y
@@ -217,6 +217,7 @@ CONFIG_IED_REGION_SIZE=0x400000
 CONFIG_PCIEXP_ASPM=y
 CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_PCIEXP_CLK_PM=y
+CONFIG_TTYS0_BASE=0x3e8
 CONFIG_SOC_INTEL_CANNONLAKE=y
 CONFIG_SOC_INTEL_COMMON_CANNONLAKE_BASE=y
 CONFIG_SOC_INTEL_COFFEELAKE=y
@@ -225,10 +226,13 @@ CONFIG_SOC_INTEL_COFFEELAKE=y
 CONFIG_SOC_INTEL_CANNONLAKE_PCH_H=y
 # CONFIG_NHLT_MAX98373 is not set
 CONFIG_MAX_ROOT_PORTS=24
+CONFIG_MAX_PCIE_CLOCKS=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_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
@@ -264,7 +268,7 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_ITSS_POL_CFG=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_IOSTANDBY is not set
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS is not set
 # CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_MULTI_ACPI_DEVICES is not set
-# CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_DUAL_ROUTE_SUPPORT is not set
+CONFIG_SOC_INTEL_COMMON_BLOCK_GPIO_DUAL_ROUTE_SUPPORT=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GRAPHICS=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_GSPI_VERSION_2=y
@@ -299,6 +303,7 @@ 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_INTEL_LPSS_UART_FOR_CONSOLE=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XDCI=y
 CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI=y
 # CONFIG_SOC_INTEL_COMMON_BLOCK_XHCI_ELOG is not set
@@ -318,13 +323,13 @@ CONFIG_SOC_INTEL_COMMON_RESET=y
 CONFIG_SOC_INTEL_COMMON_ACPI_WAKE_SOURCE=y
 # CONFIG_ACPI_CONSOLE is not set
 # 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
 # CONFIG_SOC_NVIDIA_TEGRA210 is not set
+# CONFIG_QC_SDI_ENABLE is not set
 # CONFIG_SOC_QC_IPQ40XX is not set
 # CONFIG_SOC_QC_IPQ806X is not set
 # CONFIG_SOC_QUALCOMM_QCS405 is not set
@@ -611,13 +616,13 @@ 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
+CONFIG_DRIVERS_UART=y
 # CONFIG_NO_UART_ON_SUPERIO is not set
 # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set
 # CONFIG_UART_OVERRIDE_REFCLK is not set
-# CONFIG_DRIVERS_UART_8250MEM is not set
-# CONFIG_DRIVERS_UART_8250MEM_32 is not set
+CONFIG_DRIVERS_UART_8250MEM=y
+CONFIG_DRIVERS_UART_8250MEM_32=y
 # CONFIG_HAVE_UART_SPECIAL is not set
-# CONFIG_DRIVERS_UART_OXPCIE is not set
 # CONFIG_DRIVERS_UART_PL011 is not set
 # CONFIG_UART_USE_REFCLK_AS_INPUT_CLOCK is not set
 # CONFIG_HAVE_USBDEBUG is not set
@@ -638,6 +643,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_FSP_USE_REPO=y
 # CONFIG_DISPLAY_HOBS is not set
 # CONFIG_DISPLAY_UPD_DATA is not set
 CONFIG_PLATFORM_USES_FSP2_0=y
@@ -645,7 +651,6 @@ CONFIG_PLATFORM_USES_FSP2_0=y
 # CONFIG_DISPLAY_FSP_CALLS_AND_STATUS is not set
 # CONFIG_DISPLAY_FSP_HEADER is not set
 CONFIG_FSP_T_CBFS="fspt.bin"
-CONFIG_FSP_USE_REPO=y
 CONFIG_FSP_T_FILE="$(obj)/Fsp_T.fd"
 CONFIG_FSP_CAR=y
 CONFIG_FSP_T_XIP=y
@@ -708,13 +713,31 @@ CONFIG_RTC=y
 CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
+CONFIG_CONSOLE_SERIAL=y
+CONFIG_FIXED_UART_FOR_CONSOLE=y
+
+#
+# memory mapped, 8250-compatible
+#
+
+#
+# Serial port base address = 0x3e8
+#
+# CONFIG_CONSOLE_SERIAL_921600 is not set
+# CONFIG_CONSOLE_SERIAL_460800 is not set
+# CONFIG_CONSOLE_SERIAL_230400 is not set
+CONFIG_CONSOLE_SERIAL_115200=y
+# CONFIG_CONSOLE_SERIAL_57600 is not set
+# CONFIG_CONSOLE_SERIAL_38400 is not set
+# CONFIG_CONSOLE_SERIAL_19200 is not set
+# CONFIG_CONSOLE_SERIAL_9600 is not set
+CONFIG_TTYS0_BAUD=115200
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
-# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 # CONFIG_CONSOLE_SPI_FLASH is not set
-# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7=y
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set
 # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set
@@ -805,6 +828,7 @@ CONFIG_HAVE_DISPLAY_MTRRS=y
 #
 # General Debug Settings
 #
+# CONFIG_GDB_STUB is not set
 # CONFIG_FATAL_ASSERTS is not set
 CONFIG_HAVE_DEBUG_GPIO=y
 # CONFIG_DEBUG_GPIO is not set