summaryrefslogtreecommitdiff
path: root/src/cpu/intel/haswell
diff options
context:
space:
mode:
authorAlexandru Gagniuc <mr.nuke.me@gmail.com>2013-12-13 16:50:28 -0600
committerAlexandru Gagniuc <mr.nuke.me@gmail.com>2015-02-28 00:14:49 +0100
commitee89435798022021026f511deddf0e3b401ad031 (patch)
treed8807aefabce6205fa35108221bb9d90ceb04c0f /src/cpu/intel/haswell
parent422e296d560b5f076e0cb866202b2aab4dcfaebb (diff)
downloadcoreboot-ee89435798022021026f511deddf0e3b401ad031.tar.xz
cpu/intel (non-FSP): Use microcode from blobs repository
Now that microcode has been added to blobs, use that one instead of the one included in the tree. Microcode from the tree will be removed in a subsequent patch. Since the microcode updates are blobs, they belong in the blobs repository. This change may introduce a build failure if the "Generate from tree" microcode option is selected, but the blobs repository is not enabled. We have to live with this for now, until microcode is moved to blobs for all CPUs, at which point we may adjust Kconfig accordingly. Leave the FSP cpu alone for now, as that will need approval from SAGE. Change-Id: Ia77ba2e26c083da092449b04ab2323b91a2ca15b Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-on: http://review.coreboot.org/4530 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/cpu/intel/haswell')
-rw-r--r--src/cpu/intel/haswell/microcode_blob.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/cpu/intel/haswell/microcode_blob.c b/src/cpu/intel/haswell/microcode_blob.c
index 992ee18422..df54ddbe8d 100644
--- a/src/cpu/intel/haswell/microcode_blob.c
+++ b/src/cpu/intel/haswell/microcode_blob.c
@@ -18,5 +18,13 @@
*/
unsigned microcode[] = {
-#include "microcode_blob.h"
+ /*
+ * FIXME: Can we just include both microcodes regardless, or is there
+ * a very good reason why we only use one at a time?
+ */
+ #if CONFIG_INTEL_LYNXPOINT_LP
+ #include "../../../../3rdparty/cpu/intel/model_4065x/microcode.h"
+ #else
+ #include "../../../../3rdparty/cpu/intel/model_306cx/microcode.h"
+ #endif
};