summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/coreboot/default/nuke.list17
-rw-r--r--config/coreboot/default/patches/0048-topton-x2e-n150-use-old-fsp.patch34
-rw-r--r--config/coreboot/x2e_n150/config/fspgop2
-rw-r--r--config/submodule/coreboot/default/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c/module.cfg5
-rw-r--r--config/submodule/coreboot/default/module.list1
5 files changed, 41 insertions, 18 deletions
diff --git a/config/coreboot/default/nuke.list b/config/coreboot/default/nuke.list
index e6c247d2..8ca7a4cf 100644
--- a/config/coreboot/default/nuke.list
+++ b/config/coreboot/default/nuke.list
@@ -1,18 +1 @@
-3rdparty/fsp/EagleStreamFspBinPkg
-3rdparty/fsp/MeteorLakeFspBinPkg
-3rdparty/fsp/IceLakeFspBinPkg
-3rdparty/fsp/AmberLakeFspBinPkg
-3rdparty/fsp/DenvertonNSFspBinPkg
-3rdparty/fsp/TigerLakeFspBinPkg
-3rdparty/fsp/CedarIslandFspBinPkg
-3rdparty/fsp/ElkhartLakeFspBinPkg
-3rdparty/fsp/CometLakeFspBinPkg
-3rdparty/fsp/WhitleyFspBinPkg
-3rdparty/fsp/ArrowLakeFspBinPkg
-3rdparty/fsp/IdavilleFspBinPkg
-3rdparty/fsp/BraswellFspBinPkg
-3rdparty/fsp/CoffeeLakeFspBinPkg
-3rdparty/fsp/RaptorLakeFspBinPkg
-3rdparty/fsp/ApolloLakeFspBinPkg
-3rdparty/fsp/SkylakeFspBinPkg
3rdparty/vboot/tests
diff --git a/config/coreboot/default/patches/0048-topton-x2e-n150-use-old-fsp.patch b/config/coreboot/default/patches/0048-topton-x2e-n150-use-old-fsp.patch
new file mode 100644
index 00000000..179cf6b3
--- /dev/null
+++ b/config/coreboot/default/patches/0048-topton-x2e-n150-use-old-fsp.patch
@@ -0,0 +1,34 @@
+From 3bb05d0486186400df8ed9ac66cfadcbff7a48a6 Mon Sep 17 00:00:00 2001
+From: Leah Rowe <leah@libreboot.org>
+Date: Tue, 6 Jan 2026 21:42:21 +0000
+Subject: [PATCH 1/1] topton x2e n150: use old fsp
+
+i added the old fsp back, so that we didn't have to
+mess around with vendor files in lbmk, because coreboot
+upstream updated the fsp repo, which modified this
+fsp file.
+
+we know the old fsp worked. there's no point testing
+the new one yet, unless someone can tell me about
+real bugs that got fixed.
+
+Signed-off-by: Leah Rowe <leah@libreboot.org>
+---
+ src/soc/intel/alderlake/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig
+index e9c56fc6b9..43cd6f8efe 100644
+--- a/src/soc/intel/alderlake/Kconfig
++++ b/src/soc/intel/alderlake/Kconfig
+@@ -438,6 +438,7 @@ config FSP_FD_PATH
+ default "3rdparty/fsp/RaptorLakeFspBinPkg/IoT/RaptorLakeS/FSP.fd" if FSP_TYPE_IOT && SOC_INTEL_RAPTORLAKE_PCH_S
+ default "3rdparty/fsp/AlderLakeFspBinPkg/IoT/AlderLakeP/Fsp.fd" if FSP_TYPE_IOT && SOC_INTEL_ALDERLAKE_PCH_P
+ default "3rdparty/fsp/AlderLakeFspBinPkg/IoT/AlderLakeS/Fsp.fd" if FSP_TYPE_IOT && SOC_INTEL_ALDERLAKE_PCH_S
++ default "3rdparty/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c/AlderLakeFspBinPkg/IoT/AlderLakeN/Fsp.fd" if BOARD_TOPTON_X2E_N150
+ default "3rdparty/fsp/AlderLakeFspBinPkg/IoT/AlderLakeN/Fsp.fd" if FSP_TYPE_IOT && SOC_INTEL_ALDERLAKE_PCH_N
+ default "3rdparty/fsp/RaptorLakeFspBinPkg/Client/RaptorLakeP/Fsp.fd" if SOC_INTEL_ALDERLAKE_PCH_P
+ default "3rdparty/fsp/RaptorLakeFspBinPkg/Client/RaptorLakeS/Fsp.fd" if SOC_INTEL_ALDERLAKE_PCH_S
+--
+2.47.3
+
diff --git a/config/coreboot/x2e_n150/config/fspgop b/config/coreboot/x2e_n150/config/fspgop
index 2c949ac2..977a8d58 100644
--- a/config/coreboot/x2e_n150/config/fspgop
+++ b/config/coreboot/x2e_n150/config/fspgop
@@ -145,7 +145,7 @@ CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data_twl.vbt"
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0x4000
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="X2E_N150"
# CONFIG_CONSOLE_POST is not set
-CONFIG_FSP_FD_PATH="3rdparty/fsp/AlderLakeFspBinPkg/IoT/AlderLakeN/Fsp.fd"
+CONFIG_FSP_FD_PATH="3rdparty/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c/AlderLakeFspBinPkg/IoT/AlderLakeN/Fsp.fd"
CONFIG_MAX_SOCKET=1
CONFIG_USE_PM_ACPI_TIMER=y
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
diff --git a/config/submodule/coreboot/default/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c/module.cfg b/config/submodule/coreboot/default/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c/module.cfg
new file mode 100644
index 00000000..297e1703
--- /dev/null
+++ b/config/submodule/coreboot/default/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c/module.cfg
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+subgit="https://review.coreboot.org/fsp.git"
+subgit_bkup="https://github.com/coreboot/fsp"
+subhash="cc36ae2b5775fa7400cb3282680afc0f6cb37a3c"
diff --git a/config/submodule/coreboot/default/module.list b/config/submodule/coreboot/default/module.list
index 95688e5f..40d3f46b 100644
--- a/config/submodule/coreboot/default/module.list
+++ b/config/submodule/coreboot/default/module.list
@@ -1,5 +1,6 @@
3rdparty/arm-trusted-firmware
3rdparty/fsp
+3rdparty/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c
3rdparty/intel-microcode
3rdparty/libgfxinit
3rdparty/libhwbase