splatink/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-03-25 13:29:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix fsp extraction for topton x2e n150

Browse Source 
coreboot updated the fsp file. we know the old one worked,
so no point testing the new one so close to a stable lbmk
release.

i've modified 3rdparty/fsp/ to re-add the old one as another
file, so that other boards are unaffected, and updated the
Kconfig so that the special file is used for x2e n150 only.

more specifically, added a second fsp submodule.

it's a bit dirty, but avoids bloating lbmk.git

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-01-06 21:44:17 +00:00
parent d5351aee37
commit bbfee155ba
4 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
config/coreboot/default/patches/0048-topton-x2e-n150-use-old-fsp.patch Normal file
View File

@@ -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

2
config/coreboot/x2e_n150/config/fspgop
View File

@@ -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

5
config/submodule/coreboot/default/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c/module.cfg Normal file
View File

@@ -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"

1
config/submodule/coreboot/default/module.list
View File

@@ -1,5 +1,6 @@
3rdparty/arm-trusted-firmware
3rdparty/fsp
3rdparty/fspcc36ae2b5775fa7400cb3282680afc0f6cb37a3c
3rdparty/intel-microcode
3rdparty/libgfxinit
3rdparty/libhwbase