From 179b8444c31fc08965abefaabde530206f8fd6f7 Mon Sep 17 00:00:00 2001 From: Jincheng Li Date: Sat, 23 Aug 2025 00:05:00 +0800 Subject: [PATCH] soc/intel/xeon-sp/gnr: Hook up public FSP bin and headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GNR-AP public FSP - https://github.com/intel/FSP/tree/master/BirchStreamFspBinPkg/ap GNR-SP public FSP - https://github.com/intel/FSP/tree/master/BirchStreamFspBinPkg/sp GNR mainboards will by default use public FSP bin and headers. If needing to use site-local FSP bin and headers, apply below settings in the defconfig (use beechnutcity CRB as example), CONFIG_FSP_USE_REPO=n CONFIG_ADD_FSP_BINARIES=y CONFIG_FSP_T_FILE="site-local/beechnutcity/Server_T.fd" CONFIG_FSP_M_FILE="site-local/beechnutcity/Server_M.fd" CONFIG_FSP_S_FILE="site-local/beechnutcity/Server_S.fd" CONFIG_FSP_HEADER_PATH="src/vendorcode/intel/fsp/fsp2_0/ graniterapids/sp/" TEST=Build and boot on intel/avenuecity CRB TEST=Build and boot on intel/beechnutcity CRB Change-Id: I88701316e21ec4737539294d17926aa0abe8c1fd Signed-off-by: Jincheng Li Reviewed-on: https://review.coreboot.org/c/coreboot/+/88898 Reviewed-by: Angel Pons Reviewed-by: Jérémy Compostella Reviewed-by: Hancockc Reviewed-by: Paul Menzel Reviewed-by: Schumi Chu Reviewed-by: Wilson-MiTACComputing Reviewed-by: Mark Chang Tested-by: build bot (Jenkins) --- configs/builder/config.intel.crb.avc | 6 ------ configs/builder/config.intel.crb.bnc | 6 ------ src/soc/intel/xeon_sp/gnr/Kconfig | 13 +++++++++++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/configs/builder/config.intel.crb.avc b/configs/builder/config.intel.crb.avc index 433f06dac7..c29d1066f1 100644 --- a/configs/builder/config.intel.crb.avc +++ b/configs/builder/config.intel.crb.avc @@ -15,7 +15,6 @@ CONFIG_NO_GFX_INIT=y CONFIG_HAVE_IFD_BIN=y CONFIG_HAVE_PBP_BIN=y CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION=y -CONFIG_ADD_FSP_BINARIES=y CONFIG_PAYLOAD_LINUX=y CONFIG_UART_FOR_CONSOLE=0 @@ -26,11 +25,6 @@ CONFIG_CONSOLE_SERIAL_115200=y # CONFIG_IFD_BIN_PATH="site-local/avenuecity/descriptor.bin" CONFIG_PBP_BIN_PATH="site-local/avenuecity/pbp.bin" -CONFIG_FSP_T_FILE="site-local/avenuecity/Server_T.fd" -CONFIG_FSP_M_FILE="site-local/avenuecity/Server_M.fd" -CONFIG_FSP_S_FILE="site-local/avenuecity/Server_S.fd" -CONFIG_FSP_HEADER_PATH="src/vendorcode/intel/fsp/fsp2_0/graniterapids/ap/" - CONFIG_PAYLOAD_FILE="site-local/avenuecity/linuxboot_bzImage" CONFIG_LINUX_COMMAND_LINE="loglevel=7 earlyprintk=serial,ttyS0,115200 console=ttyS0,115200" diff --git a/configs/builder/config.intel.crb.bnc b/configs/builder/config.intel.crb.bnc index 80ec39133e..b41921902f 100644 --- a/configs/builder/config.intel.crb.bnc +++ b/configs/builder/config.intel.crb.bnc @@ -15,7 +15,6 @@ CONFIG_NO_GFX_INIT=y CONFIG_HAVE_IFD_BIN=y CONFIG_HAVE_PBP_BIN=y CONFIG_DO_NOT_TOUCH_DESCRIPTOR_REGION=y -CONFIG_ADD_FSP_BINARIES=y CONFIG_PAYLOAD_LINUX=y CONFIG_UART_FOR_CONSOLE=0 @@ -26,11 +25,6 @@ CONFIG_CONSOLE_SERIAL_115200=y # CONFIG_IFD_BIN_PATH="site-local/beechnutcity/descriptor.bin" CONFIG_PBP_BIN_PATH="site-local/beechnutcity/pbp.bin" -CONFIG_FSP_T_FILE="site-local/beechnutcity/Server_T.fd" -CONFIG_FSP_M_FILE="site-local/beechnutcity/Server_M.fd" -CONFIG_FSP_S_FILE="site-local/beechnutcity/Server_S.fd" -CONFIG_FSP_HEADER_PATH="src/vendorcode/intel/fsp/fsp2_0/graniterapids/sp/" - CONFIG_PAYLOAD_FILE="site-local/beechnutcity/linuxboot_bzImage" CONFIG_LINUX_COMMAND_LINE="loglevel=7 earlyprintk=serial,ttyS0,115200 console=ttyS0,115200" diff --git a/src/soc/intel/xeon_sp/gnr/Kconfig b/src/soc/intel/xeon_sp/gnr/Kconfig index 3d855b20ff..2b59f2c5bb 100644 --- a/src/soc/intel/xeon_sp/gnr/Kconfig +++ b/src/soc/intel/xeon_sp/gnr/Kconfig @@ -15,6 +15,7 @@ config SOC_INTEL_GRANITERAPIDS select HAVE_IOAT_DOMAINS select FSP_SPEC_VIOLATION_XEON_SP_HEAP_WORKAROUND select DRAM_SUPPORT_DDR5 + select HAVE_INTEL_FSP_REPO help Intel Granite Rapids support @@ -36,9 +37,17 @@ config CHIPSET_DEVICETREE string default "soc/intel/xeon_sp/gnr/chipset.cb" +if FSP_USE_REPO + config FSP_HEADER_PATH - string "Location of FSP headers" - default "src/vendorcode/intel/fsp/fsp2_0/graniterapids/ap" + default "3rdparty/fsp/BirchStreamFspBinPkg/ap/Include" if SOC_INTEL_GRANITERAPIDS_AP + default "3rdparty/fsp/BirchStreamFspBinPkg/sp/Include" if SOC_INTEL_GRANITERAPIDS_SP + +config FSP_FD_PATH + default "3rdparty/fsp/BirchStreamFspBinPkg/ap/Fsp.fd" if SOC_INTEL_GRANITERAPIDS_AP + default "3rdparty/fsp/BirchStreamFspBinPkg/sp/Fsp.fd" if SOC_INTEL_GRANITERAPIDS_SP + +endif config MAX_CPUS int