vc/intel/raptorlake: Use FSP v4301.01 headers for Google

Remove the existing FSP 4221.00 headers subdirectory called 4221.00_google, and have Google vendor devices use FSP 4301.01. BUG=b:306181828 TEST=`emerge-brya coreboot chromeos-bootimage`, flash and boot skolas to kernel. Change-Id: Ic64b3aec62f0d6302278393bf06d090f43c0d592 Signed-off-by: Nick Vaccaro <nvaccaro@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/78444 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: <srinivas.kulkarni@intel.com> Reviewed-by: Bora Guvendik <bora.guvendik@intel.com> Reviewed-by: Subrata Banik <subratabanik@google.com>
coreboot · Oct 19, 2023 · 5560662 · 5560662
1 parent 5596a35
commit 5560662
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 8,455 deletions.
diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig
@@ -400,7 +400,6 @@ config FSP_TYPE_IOT
 config FSP_HEADER_PATH
 	string "Location of FSP headers"
 	default "src/vendorcode/intel/fsp/fsp2_0/alderlake_n/" if SOC_INTEL_ALDERLAKE_PCH_N && !FSP_USE_REPO
-	default "src/vendorcode/intel/fsp/fsp2_0/raptorlake/4221.00_google/" if VENDOR_GOOGLE && SOC_INTEL_RAPTORLAKE && !FSP_USE_REPO
 	default "src/vendorcode/intel/fsp/fsp2_0/raptorlake/4301.01/" if SOC_INTEL_RAPTORLAKE && !FSP_USE_REPO
 	default "3rdparty/fsp/RaptorLakeFspBinPkg/Client/RaptorLakeP/Include/" if SOC_INTEL_ALDERLAKE_PCH_P && SOC_INTEL_RAPTORLAKE
 	default "3rdparty/fsp/RaptorLakeFspBinPkg/Client/RaptorLakeS/Include/" if SOC_INTEL_ALDERLAKE_PCH_S && SOC_INTEL_RAPTORLAKE

diff --git a/src/vendorcode/intel/fsp/fsp2_0/raptorlake/4221.00_google/FirmwareVersionInfoHob.h b/src/vendorcode/intel/fsp/fsp2_0/raptorlake/4221.00_google/FirmwareVersionInfoHob.h
diff --git a/src/vendorcode/intel/fsp/fsp2_0/raptorlake/4221.00_google/FspUpd.h b/src/vendorcode/intel/fsp/fsp2_0/raptorlake/4221.00_google/FspUpd.h