coreboot/next: merge with coreboot/default

I also cherry-picked a patch from Heads, that fixes build
issues caused by the hacks in the T480 port; several changes
made by Mate are now ifdef'd based on whether a KabyLake
ThinkPad is specified in defconfig.

Signed-off-by: Leah Rowe <leah@libreboot.org>

1 files changed, 0 insertions, 33 deletions

diff --git a/config/coreboot/next/patches/0014-src-intel-x4x-Disable-stack-overflow-debug.patch b/config/coreboot/next/patches/0014-src-intel-x4x-Disable-stack-overflow-debug.patch
deleted file mode 100644
index e2eae2a9..00000000
--- a/config/coreboot/next/patches/0014-src-intel-x4x-Disable-stack-overflow-debug.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5671d54d347b110ffade5b8b6e2d052612a8716c Mon Sep 17 00:00:00 2001
-From: Leah Rowe <leah@libreboot.org>
-Date: Mon, 6 Jan 2025 01:53:53 +0000
-Subject: [PATCH 1/1] src/intel/x4x: Disable stack overflow debug
-
-Signed-off-by: Leah Rowe <leah@libreboot.org>
----
- src/northbridge/intel/x4x/Kconfig | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/northbridge/intel/x4x/Kconfig b/src/northbridge/intel/x4x/Kconfig
-index 097e11126c..7e4e14cf94 100644
---- a/src/northbridge/intel/x4x/Kconfig
-+++ b/src/northbridge/intel/x4x/Kconfig
-@@ -28,6 +28,15 @@ config ECAM_MMCONF_BUS_NUMBER
- 	int
- 	default 256
- 
-+# Override DEBUG Kconfig to avoid false alarm about stack overflow.
-+config DEBUG_STACK_OVERFLOW_BREAKPOINTS
-+	bool
-+	default n
-+
-+config DEBUG_STACK_OVERFLOW_BREAKPOINTS_IN_ALL_STAGES
-+	bool
-+	default n
-+
- # This number must be equal or lower than what's reported in ACPI PCI _CRS
- config DOMAIN_RESOURCE_32BIT_LIMIT
- 	default 0xfec00000
--- 
-2.39.5
-