From 6297df85d625548ae9ec2f2c1ab8616f4fb11829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= Date: Thu, 30 Jun 2022 16:22:35 +0200 Subject: soc/intel/alderlake: Hook-up public Alder Lake microcode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CPUIDs and Engineering Samples decoding based on DOC #618427. Keep MICROCODE_BLOB_UNDISCLOSED for PCH-N SKUs as microcode blobs are still missing. Signed-off-by: Michał Żygowski Change-Id: Ibb1337e5cbf5b82fdaceb7eb4661d708a32ff0ad Reviewed-on: https://review.coreboot.org/c/coreboot/+/65564 Reviewed-by: Arthur Heymans Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik Reviewed-by: Kangheui Won --- src/soc/intel/alderlake/Kconfig | 2 +- src/soc/intel/alderlake/Makefile.inc | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) (limited to 'src/soc') diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index 117bf064eb..c973d3bf47 100644 --- a/src/soc/intel/alderlake/Kconfig +++ b/src/soc/intel/alderlake/Kconfig @@ -20,6 +20,7 @@ config SOC_INTEL_ALDERLAKE_PCH_M config SOC_INTEL_ALDERLAKE_PCH_N bool select SOC_INTEL_ALDERLAKE + select MICROCODE_BLOB_UNDISCLOSED help Choose this option if your mainboard has a PCH-N chipset. @@ -73,7 +74,6 @@ config CPU_SPECIFIC_OPTIONS select INTEL_TME select MRC_SETTINGS_PROTECT select PARALLEL_MP_AP_WORK - select MICROCODE_BLOB_UNDISCLOSED select PLATFORM_USES_FSP2_2 select PMC_GLOBAL_RESET_ENABLE_LOCK select SOC_INTEL_COMMON diff --git a/src/soc/intel/alderlake/Makefile.inc b/src/soc/intel/alderlake/Makefile.inc index bb14d72c80..db99d89aec 100644 --- a/src/soc/intel/alderlake/Makefile.inc +++ b/src/soc/intel/alderlake/Makefile.inc @@ -69,6 +69,24 @@ endif CPPFLAGS_common += -I$(src)/soc/intel/alderlake CPPFLAGS_common += -I$(src)/soc/intel/alderlake/include +ifeq ($(CONFIG_SOC_INTEL_ALDERLAKE_PCH_S),y) +# 06-97-00, 06-97-01, 06-97-04 are ADL-S Engineering Samples +# 06-97-02 are ADL-S/HX Quality Samples but also ADL-HX Engineering Samples +# ADL-S/HX C0 +cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-97-02 +# ADL-S H0 +cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-97-05 +else +ifneq ($(CONFIG_SOC_INTEL_ALDERLAKE_PCH_N),y) +# 06-9a-00, 06-9a-01 are ADL-P/ADL-M Engineering Samples +# Missing 06-9a-02 ADL-P K0 +# ADL-P L0 +cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-9a-03 +# ADL-P R0 and ADL-M R0 +cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-9a-04 +endif +endif + ifeq ($(CONFIG_STITCH_ME_BIN),y) $(eval $(call cse_add_dummy_to_bp1_bp2,DLMP)) -- cgit v1.2.3