From 7e7d27bf4b5b846456763c606315521548599005 Mon Sep 17 00:00:00 2001 From: Timofey Komarov Date: Tue, 27 Apr 2021 11:00:10 +0300 Subject: [PATCH] soc/intel/skylake: Add microcodes for Coffee Lake CPUs The Z370, H310C and B365 PCHs use the same silicon as 200-series PCHs and they are supported by soc/intel/skylake codebase (not by soc/intel/cannonlake). Mentioned PCHs are meant to be paired with Coffee Lake CPUs, so add the corresponding microcodes. Signed-off-by: Timofey Komarov Change-Id: I479c648e40c4c607d29f8cdd913fdbd6d7d7d991 Reviewed-on: https://review.coreboot.org/c/coreboot/+/52693 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Angel Pons Reviewed-by: Felix Singer --- src/soc/intel/skylake/Kconfig | 3 +++ src/soc/intel/skylake/Makefile.inc | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index 5024ef455b..a8f220f227 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -311,6 +311,9 @@ config MAINBOARD_SUPPORTS_KABYLAKE_CPU bool "Board can contain Kaby Lake CPU" default y if SOC_INTEL_KABYLAKE +config MAINBOARD_SUPPORTS_COFFEELAKE_CPU + bool "Board can contain Coffee Lake CPU" + endif if !SKYLAKE_SOC_PCH_H diff --git a/src/soc/intel/skylake/Makefile.inc b/src/soc/intel/skylake/Makefile.inc index 8dbadcc038..e88eab5340 100644 --- a/src/soc/intel/skylake/Makefile.inc +++ b/src/soc/intel/skylake/Makefile.inc @@ -84,6 +84,13 @@ ifeq ($(CONFIG_MAINBOARD_SUPPORTS_KABYLAKE_CPU),y) # Kabylake H B0 S0 cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-9e-09 endif +# CoffeeLake +ifeq ($(CONFIG_MAINBOARD_SUPPORTS_COFFEELAKE_CPU),y) +cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-9e-0a +cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-9e-0b +cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-9e-0c +cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-9e-0d +endif else ifeq ($(CONFIG_MAINBOARD_SUPPORTS_SKYLAKE_CPU),y) # Skylake D0