From f81e2ad3852c62549741406329f573cd3ced83dc Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 19 Nov 2019 08:57:13 -0700
Subject: [PATCH] Update kbl-u

---
 src/mainboard/system76/kbl-u/Kconfig  | 11 +++++------
 src/mainboard/system76/kbl-u/dsdt.asl |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/mainboard/system76/kbl-u/Kconfig b/src/mainboard/system76/kbl-u/Kconfig
index b6bca27c77..97c0c0bf8a 100644
--- a/src/mainboard/system76/kbl-u/Kconfig
+++ b/src/mainboard/system76/kbl-u/Kconfig
@@ -46,11 +46,11 @@ config CBFS_SIZE
 	hex
 	default 0x600000
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+config SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x1558
 
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+config SUBSYSTEM_DEVICE_ID
 	hex
 	default 0x1303 if BOARD_SYSTEM76_GALP2
 	default 0x1313 if BOARD_SYSTEM76_GALP3
@@ -64,10 +64,9 @@ config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
 
-# This causes UEFI to hang
-#config UART_FOR_CONSOLE
-#	int
-#	default 2
+config UART_FOR_CONSOLE
+	int
+	default 2
 
 config MAX_CPUS
 	int
diff --git a/src/mainboard/system76/kbl-u/dsdt.asl b/src/mainboard/system76/kbl-u/dsdt.asl
index 2c7f2ddf7d..ffc7149ae7 100644
--- a/src/mainboard/system76/kbl-u/dsdt.asl
+++ b/src/mainboard/system76/kbl-u/dsdt.asl
@@ -43,7 +43,7 @@ DefinitionBlock(
 	}
 
 	// Chipset specific sleep states
-	#include <soc/intel/skylake/acpi/sleepstates.asl>
+	#include <southbridge/intel/common/acpi/sleepstates.asl>
 
 	// Mainboard specific
 	#include "acpi/mainboard.asl"