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>

21 files changed, 27 insertions, 193 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
 };
diff --git a/src/cpu/intel/model_1067x/microcode_blob.c b/src/cpu/intel/model_1067x/microcode_blob.c
index 1a626c15ed..36f4caf036 100644
--- a/src/cpu/intel/model_1067x/microcode_blob.c
+++ b/src/cpu/intel/model_1067x/microcode_blob.c
@@ -1,11 +1,3 @@
 unsigned microcode_updates_1067ax[] = {
-	#include "microcode-m011067660F.h"
-	#include "microcode-m041067660F.h"
-	#include "microcode-m101067660F.h"
-	#include "microcode-m101067770A.h"
-	#include "microcode-m111067AA0B.h"
-	#include "microcode-m401067660F.h"
-	#include "microcode-m441067AA0B.h"
-	#include "microcode-m801067660F.h"
-	#include "microcode-mA01067AA0B.h"
+	#include "../../../../3rdparty/cpu/intel/model_1067x/microcode.h"
 };
diff --git a/src/cpu/intel/model_106cx/microcode_blob.c b/src/cpu/intel/model_106cx/microcode_blob.c
index 1ca4cdc4b0..97d36edff8 100644
--- a/src/cpu/intel/model_106cx/microcode_blob.c
+++ b/src/cpu/intel/model_106cx/microcode_blob.c
@@ -1,9 +1,3 @@
 unsigned microcode_updates_106cx[] = {
-	#include "microcode-M01106C2217.h"
-	#include "microcode-M01106CA107.h"
-	#include "microcode-M04106C2218.h"
-	#include "microcode-M04106CA107.h"
-	#include "microcode-M08106C2219.h"
-	#include "microcode-M08106CA107.h"
-	#include "microcode-M10106CA107.h"
+	#include "../../../../3rdparty/cpu/intel/model_106cx/microcode.h"
 };
diff --git a/src/cpu/intel/model_2065x/microcode_blob.c b/src/cpu/intel/model_2065x/microcode_blob.c
index c2538e8ede..df2e85b26f 100644
--- a/src/cpu/intel/model_2065x/microcode_blob.c
+++ b/src/cpu/intel/model_2065x/microcode_blob.c
@@ -18,5 +18,5 @@
  */
 
 unsigned microcode[] = {
-#include "microcode_blob.h"
+	#include "../../../../3rdparty/cpu/intel/model_2065x/microcode.h"
 };
diff --git a/src/cpu/intel/model_2065x/microcode_blob.h b/src/cpu/intel/model_2065x/microcode_blob.h
deleted file mode 100644
index bced3b1d7e..0000000000
--- a/src/cpu/intel/model_2065x/microcode_blob.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Google Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-	#include "microcode-m1220652_0000000e.h"
-	#include "microcode-m9220655_00000004.h"
diff --git a/src/cpu/intel/model_206ax/microcode_blob.c b/src/cpu/intel/model_206ax/microcode_blob.c
index c2538e8ede..197daf2bf9 100644
--- a/src/cpu/intel/model_206ax/microcode_blob.c
+++ b/src/cpu/intel/model_206ax/microcode_blob.c
@@ -18,5 +18,5 @@
  */
 
 unsigned microcode[] = {
-#include "microcode_blob.h"
+	#include "../../../../3rdparty/cpu/intel/model_206ax/microcode.h"
 };
diff --git a/src/cpu/intel/model_206ax/microcode_blob.h b/src/cpu/intel/model_206ax/microcode_blob.h
deleted file mode 100644
index ae24daff8a..0000000000
--- a/src/cpu/intel/model_206ax/microcode_blob.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Google Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-	#include "microcode-m12206a7_00000029.h"
-	#include "microcode-m12306a9_0000001b.h"
diff --git a/src/cpu/intel/model_65x/microcode_blob.c b/src/cpu/intel/model_65x/microcode_blob.c
index ff3d87e45d..d0f6a2a8e8 100644
--- a/src/cpu/intel/model_65x/microcode_blob.c
+++ b/src/cpu/intel/model_65x/microcode_blob.c
@@ -1,19 +1,3 @@
 unsigned microcode_updates_65x[] = {
-	#include "microcode-410-MU16522d.h"
-	#include "microcode-422-MU26530b.h"
-	#include "microcode-412-MU16530d.h"
-	#include "microcode-423-MU26522b.h"
-	#include "microcode-407-MU16522a.h"
-	#include "microcode-146-MU16502e.h"
-	#include "microcode-409-MU16522c.h"
-	#include "microcode-147-MU16502f.h"
-	#include "microcode-94-MU265019.h"
-	#include "microcode-430-MU165041.h"
-	#include "microcode-452-MU165310.h"
-	#include "microcode-434-MU165140.h"
-	#include "microcode-435-MU165141.h"
-	#include "microcode-433-MU165045.h"
-	#include "microcode-429-MU165040.h"
-	#include "microcode-436-MU165142.h"
-	#include "microcode-411-MU16530c.h"
+	#include "../../../../3rdparty/cpu/intel/model_65x/microcode.h"
 };
diff --git a/src/cpu/intel/model_67x/microcode_blob.c b/src/cpu/intel/model_67x/microcode_blob.c
index 55d0112f51..1302928341 100644
--- a/src/cpu/intel/model_67x/microcode_blob.c
+++ b/src/cpu/intel/model_67x/microcode_blob.c
@@ -1,8 +1,3 @@
 unsigned microcode_updates_67x[] = {
-	/* Include microcode updates here. */
-	#include "microcode-293-MU267114.h"
-	#include "microcode-530-MU16730e.h"
-	#include "microcode-531-MU26732e.h"
-	#include "microcode-539-MU167210.h"
-	#include "microcode-540-MU267238.h"
+	#include "../../../../3rdparty/cpu/intel/model_67x/microcode.h"
 };
diff --git a/src/cpu/intel/model_68x/microcode_blob.c b/src/cpu/intel/model_68x/microcode_blob.c
index 686a7683fb..fa72086305 100644
--- a/src/cpu/intel/model_68x/microcode_blob.c
+++ b/src/cpu/intel/model_68x/microcode_blob.c
@@ -1,20 +1,3 @@
 unsigned microcode_updates_68x[] = {
-	#include "microcode-534-MU16810d.h"
-	#include "microcode-535-MU16810e.h"
-	#include "microcode-536-MU16810f.h"
-	#include "microcode-537-MU268110.h"
-	#include "microcode-538-MU168111.h"
-	#include "microcode-550-MU168307.h"
-	#include "microcode-551-MU168308.h"
-	#include "microcode-727-MU168313.h"
-	#include "microcode-728-MU168314.h"
-	#include "microcode-729-MU268310.h"
-	#include "microcode-611-MU168607.h"
-	#include "microcode-612-MU168608.h"
-	#include "microcode-615-MU16860a.h"
-	#include "microcode-617-MU16860c.h"
-	#include "microcode-618-MU268602.h"
-	#include "microcode-662-MU168a01.h"
-	#include "microcode-691-MU168a04.h"
-	#include "microcode-692-MU168a05.h"
+	#include "../../../../3rdparty/cpu/intel/model_68x/microcode.h"
 };
diff --git a/src/cpu/intel/model_69x/microcode_blob.c b/src/cpu/intel/model_69x/microcode_blob.c
index d6beb0ff6f..a06c859398 100644
--- a/src/cpu/intel/model_69x/microcode_blob.c
+++ b/src/cpu/intel/model_69x/microcode_blob.c
@@ -1,5 +1,3 @@
 unsigned microcode_updates_69x[] = {
-	#include "microcode-1376-m8069547.h"
-	#include "microcode-1373-m1069507.h"
-	#include "microcode-1374-m2069507.h"
+	#include "../../../../3rdparty/cpu/intel/model_69x/microcode.h"
 };
diff --git a/src/cpu/intel/model_6bx/microcode_blob.c b/src/cpu/intel/model_6bx/microcode_blob.c
index e9a7cb73fe..debd650647 100644
--- a/src/cpu/intel/model_6bx/microcode_blob.c
+++ b/src/cpu/intel/model_6bx/microcode_blob.c
@@ -1,6 +1,3 @@
 unsigned microcode_updates_6bx[] = {
-	#include "microcode-737-MU16b11c.h"
-	#include "microcode-738-MU16b11d.h"
-	#include "microcode-875-MU16b401.h"
-	#include "microcode-885-MU16b402.h"
+	#include "../../../../3rdparty/cpu/intel/model_6bx/microcode.h"
 };
diff --git a/src/cpu/intel/model_6dx/microcode_blob.c b/src/cpu/intel/model_6dx/microcode_blob.c
index c66eca4db1..8f13d1b160 100644
--- a/src/cpu/intel/model_6dx/microcode_blob.c
+++ b/src/cpu/intel/model_6dx/microcode_blob.c
@@ -1,3 +1,3 @@
 unsigned microcode_updates_6dx[] = {
-	#include "microcode-1355-m206d618.h"
+	#include "../../../../3rdparty/cpu/intel/model_6dx/microcode.h"
 };
diff --git a/src/cpu/intel/model_6ex/microcode_blob.c b/src/cpu/intel/model_6ex/microcode_blob.c
index e934da789d..e270059a4b 100644
--- a/src/cpu/intel/model_6ex/microcode_blob.c
+++ b/src/cpu/intel/model_6ex/microcode_blob.c
@@ -1,5 +1,3 @@
 unsigned microcode_updates_6ex[] = {
-	#include "microcode-1624-m206e839.h"
-	#include "microcode-1729-m206ec54.h"
-	#include "microcode-1869-m806ec59.h"
+	#include "../../../../3rdparty/cpu/intel/model_6ex/microcode.h"
 };
diff --git a/src/cpu/intel/model_6fx/microcode_blob.c b/src/cpu/intel/model_6fx/microcode_blob.c
index 85bf467ab9..67a10cd280 100644
--- a/src/cpu/intel/model_6fx/microcode_blob.c
+++ b/src/cpu/intel/model_6fx/microcode_blob.c
@@ -1,20 +1,3 @@
 unsigned microcode_updates_6fx[] = {
-	#include "microcode-m016fbBA.h"
-	#include "microcode-m046fbBC.h"
-	#include "microcode-m086fbBB.h"
-	#include "microcode-m106f76a.h"
-	#include "microcode-m106fbBA.h"
-	#include "microcode-m16f25d.h"
-	#include "microcode-m16f6d0.h"
-	#include "microcode-m16fda4.h"
-	#include "microcode-m206f25c.h"
-	#include "microcode-m206f6d1.h"
-	#include "microcode-m206fbBA.h"
-	#include "microcode-m206fda4.h"
-	#include "microcode-m406f76b.h"
-	#include "microcode-m406fbBC.h"
-	#include "microcode-m46f6d2.h"
-	#include "microcode-m806fa95.h"
-	#include "microcode-m806fbBA.h"
-	#include "microcode-m806fda4.h"
+	#include "../../../../3rdparty/cpu/intel/model_6fx/microcode.h"
 };
diff --git a/src/cpu/intel/model_6xx/microcode_blob.c b/src/cpu/intel/model_6xx/microcode_blob.c
index 1de815ccc5..ab082da664 100644
--- a/src/cpu/intel/model_6xx/microcode_blob.c
+++ b/src/cpu/intel/model_6xx/microcode_blob.c
@@ -1,22 +1,3 @@
 unsigned microcode_updates_6xx[] = {
-#include "microcode-99-B_c6_612.h"
-#include "microcode-43-B_c6_617.h"
-#include "microcode-51-B_c6_616.h"
-#include "microcode-153-d2_619.h"
-
-#include "microcode-308-MU163336.h"
-#include "microcode-309-MU163437.h"
-
-#include "microcode-358-MU166d05.h"
-#include "microcode-359-MU166d06.h"
-#include "microcode-386-MU16600a.h"
-#include "microcode-398-MU166503.h"
-#include "microcode-399-MU166a0b.h"
-#include "microcode-400-MU166a0c.h"
-#include "microcode-401-MU166a0d.h"
-#include "microcode-402-MU166d07.h"
-
-#include "microcode-566-mu26a003.h"
-#include "microcode-588-mu26a101.h"
-#include "microcode-620-MU26a401.h"
+	#include "../../../../3rdparty/cpu/intel/model_6xx/microcode.h"
 };
diff --git a/src/cpu/intel/model_f0x/microcode_blob.c b/src/cpu/intel/model_f0x/microcode_blob.c
index 314b02472a..96577facf4 100644
--- a/src/cpu/intel/model_f0x/microcode_blob.c
+++ b/src/cpu/intel/model_f0x/microcode_blob.c
@@ -1,8 +1,4 @@
 /* 256KB cache */
 unsigned microcode_updates_f0x[] = {
-	#include "microcode-678-2f0708.h"
-	#include "microcode-965-m01f0a13.h"
-	#include "microcode-983-m02f0a15.h"
-	#include "microcode-964-m01f0712.h"
-	#include "microcode-966-m04f0a14.h"
+	#include "../../../../3rdparty/cpu/intel/model_f0x/microcode.h"
 };
diff --git a/src/cpu/intel/model_f1x/microcode_blob.c b/src/cpu/intel/model_f1x/microcode_blob.c
index 6adcc41452..bf2fe92bb8 100644
--- a/src/cpu/intel/model_f1x/microcode_blob.c
+++ b/src/cpu/intel/model_f1x/microcode_blob.c
@@ -1,7 +1,4 @@
 /* 256KB cache */
 unsigned microcode_updates_f1x[] = {
-	#include "microcode-1068-m01f122d.h"
-	#include "microcode-1069-m04f122e.h"
-	#include "microcode-1070-m02f122f.h"
-	#include "microcode-1072-m04f1305.h"
+	#include "../../../../3rdparty/cpu/intel/model_f1x/microcode.h"
 };
diff --git a/src/cpu/intel/model_f2x/microcode_blob.c b/src/cpu/intel/model_f2x/microcode_blob.c
index e9ee147f8e..55133f2c74 100644
--- a/src/cpu/intel/model_f2x/microcode_blob.c
+++ b/src/cpu/intel/model_f2x/microcode_blob.c
@@ -1,22 +1,4 @@
 /* 512KB cache */
 unsigned microcode_updates_f2x[] = {
-	/* Old microcode file not present in Intel's microcode.dat. */
-#include "microcode_m02f2203.h"
-
-	/* files from Intel's microcode.dat */
-#include "microcode-1343-m04f252b.h"
-#include "microcode-1346-m10f252c.h"
-#include "microcode-1338-m02f292d.h"
-#include "microcode-1340-m08f292f.h"
-#include "microcode-1107-m10f2421.h"
-#include "microcode-1339-m04f292e.h"
-#include "microcode-1105-m08f2420.h"
-#include "microcode-1336-m02f2610.h"
-#include "microcode-1101-m02f2738.h"
-#include "microcode-1100-m04f2737.h"
-#include "microcode-1341-m01f2529.h"
-#include "microcode-1102-m08f2739.h"
-#include "microcode-1104-m04f241e.h"
-#include "microcode-1342-m02f252a.h"
-#include "microcode-1106-m02f241f.h"
+	#include "../../../../3rdparty/cpu/intel/model_f2x/microcode.h"
 };
diff --git a/src/cpu/intel/model_f3x/microcode_blob.c b/src/cpu/intel/model_f3x/microcode_blob.c
index 2847f75716..80a0af7c68 100644
--- a/src/cpu/intel/model_f3x/microcode_blob.c
+++ b/src/cpu/intel/model_f3x/microcode_blob.c
@@ -1,5 +1,3 @@
 unsigned microcode_updates_f3x[] = {
-#include "microcode-1290-m0df320a.h"
-#include "microcode-1467-m0df330c.h"
-#include "microcode-1468-m1df3417.h"
+	#include "../../../../3rdparty/cpu/intel/model_f3x/microcode.h"
 };
diff --git a/src/cpu/intel/model_f4x/microcode_blob.c b/src/cpu/intel/model_f4x/microcode_blob.c
index dd5e3faacb..2d9850897d 100644
--- a/src/cpu/intel/model_f4x/microcode_blob.c
+++ b/src/cpu/intel/model_f4x/microcode_blob.c
@@ -1,13 +1,3 @@
 unsigned microcode_updates_f4x[] = {
-	#include "microcode-1735-m01f480c.h"
-	#include "microcode-1460-m9df4305.h"
-	#include "microcode-2492-m02f480e.h"
-	#include "microcode-1470-m9df4703.h"
-	#include "microcode-1521-m5ff4807.h"
-	#include "microcode-1466-m02f4116.h"
-	#include "microcode-1469-m9df4406.h"
-	#include "microcode-1471-mbdf4117.h"
-	#include "microcode-1637-m5cf4a04.h"
-	#include "microcode-1462-mbdf4903.h"
-	#include "microcode-1498-m5df4a02.h"
+	#include "../../../../3rdparty/cpu/intel/model_f4x/microcode.h"
 };