summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2018-11-14 17:46:14 +0100
committerNico Huber <nico.h@gmx.de>2019-01-15 09:19:11 +0000
commitbae03a519580189c46ec559d0b2ecf0bc482d0c6 (patch)
treedff139229b83ab83adba557ba0b1f3bb8f0065b0
parenta649310ea478bff8092301bdd6128f36771afb2b (diff)
downloadcoreboot-bae03a519580189c46ec559d0b2ecf0bc482d0c6.tar.xz
soc/intel/apl: Hook microcode updates up
Only tested on APL. Change-Id: I53f680fc4342a9bd1cd0ba9d72e025995e25f7f2 Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/c/29902 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Lijian Zhao <lijian.zhao@intel.com>
-rw-r--r--src/soc/intel/apollolake/Kconfig1
-rw-r--r--src/soc/intel/apollolake/Makefile.inc8
2 files changed, 8 insertions, 1 deletions
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index ef7fa47dfe..cebfc6f478 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -30,7 +30,6 @@ config CPU_SPECIFIC_OPTIONS
select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
select IOAPIC
select PCR_COMMON_IOSF_1_0
- select MICROCODE_BLOB_NOT_HOOKED_UP
select SMP
select SSE2
select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 822158c3c1..1fd16038a7 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -175,4 +175,12 @@ cbfs-files-$(CONFIG_NHLT_RT5682) += $(RT5682_RENDER_CAPTURE)
$(RT5682_RENDER_CAPTURE)-file := $(NHLT_BLOB_PATH)/$(RT5682_RENDER_CAPTURE)
$(RT5682_RENDER_CAPTURE)-type := raw
+ifeq ($(CONFIG_SOC_INTEL_GLK),y)
+# Gemini Lake B0 (706a1) only atm.
+cpu_microcode_bins += 3rdparty/blobs/cpu/intel/model_706ax/microcode.bin
+else
+# Apollo Lake 506c2, B0 (506c9) and E0 (506ca) only atm.
+cpu_microcode_bins += 3rdparty/blobs/cpu/intel/model_506cx/microcode.bin
endif
+
+endif # if CONFIG_SOC_INTEL_APOLLOLAKE