Alexandru Gagniuc (mr.nuke.me@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4506
-gerrit
commit 1ebd959647a835e5afc5dfc549f48caf4c619819 Author: Alexandru Gagniuc mr.nuke.me@gmail.com Date: Sun Dec 8 16:41:18 2013 -0600
cpu/intel: Remove dummy terminators from microcode blobs
Now that CBFS microcode no longer requires a NULL termination, remove the dummy terminators from all microcode blobs. This also enables microcode blobs from different CPU models to be linked in the same cpu_microcode_blob.bin without the terminators getting in the way.
Change-Id: I25a6454780fd5d56ae7660b0733ac4f8c4d90096 Signed-off-by: Alexandru Gagniuc mr.nuke.me@gmail.com --- src/cpu/intel/ep80579/microcode_blob.c | 5 ----- src/cpu/intel/haswell/microcode_blob.h | 5 ----- src/cpu/intel/model_1067x/microcode_blob.c | 6 ------ src/cpu/intel/model_106cx/microcode_blob.c | 6 ------ src/cpu/intel/model_2065x/microcode_blob.h | 6 ------ src/cpu/intel/model_206ax/microcode_blob.h | 6 ------ src/cpu/intel/model_65x/microcode_blob.c | 6 ------ src/cpu/intel/model_67x/microcode_blob.c | 5 ----- src/cpu/intel/model_68x/microcode_blob.c | 5 ----- src/cpu/intel/model_69x/microcode_blob.c | 6 ------ src/cpu/intel/model_6bx/microcode_blob.c | 5 ----- src/cpu/intel/model_6dx/microcode_blob.c | 6 ------ src/cpu/intel/model_6ex/microcode_blob.c | 5 ----- src/cpu/intel/model_6fx/microcode_blob.c | 6 ------ src/cpu/intel/model_6xx/microcode_blob.c | 11 ----------- src/cpu/intel/model_f0x/microcode_blob.c | 6 ------ src/cpu/intel/model_f1x/microcode_blob.c | 10 ---------- src/cpu/intel/model_f2x/microcode_blob.c | 11 ----------- src/cpu/intel/model_f3x/microcode_blob.c | 11 ----------- src/cpu/intel/model_f4x/microcode_blob.c | 11 ----------- 20 files changed, 138 deletions(-)
diff --git a/src/cpu/intel/ep80579/microcode_blob.c b/src/cpu/intel/ep80579/microcode_blob.c index cb95b1a..689f59e 100644 --- a/src/cpu/intel/ep80579/microcode_blob.c +++ b/src/cpu/intel/ep80579/microcode_blob.c @@ -5,9 +5,4 @@ * coreboot.rom image. */ unsigned microcode_updates_ep80579[] = { - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/haswell/microcode_blob.h b/src/cpu/intel/haswell/microcode_blob.h index 5776154..c616f80 100644 --- a/src/cpu/intel/haswell/microcode_blob.h +++ b/src/cpu/intel/haswell/microcode_blob.h @@ -26,8 +26,3 @@ #include "microcode-M32306c3_00000012.h" #include "microcode-M3240660_ffff000b.h" #endif - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, diff --git a/src/cpu/intel/model_1067x/microcode_blob.c b/src/cpu/intel/model_1067x/microcode_blob.c index 3b22e70..1a626c1 100644 --- a/src/cpu/intel/model_1067x/microcode_blob.c +++ b/src/cpu/intel/model_1067x/microcode_blob.c @@ -8,10 +8,4 @@ unsigned microcode_updates_1067ax[] = { #include "microcode-m441067AA0B.h" #include "microcode-m801067660F.h" #include "microcode-mA01067AA0B.h" - - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_106cx/microcode_blob.c b/src/cpu/intel/model_106cx/microcode_blob.c index 573d41f..1ca4cdc 100644 --- a/src/cpu/intel/model_106cx/microcode_blob.c +++ b/src/cpu/intel/model_106cx/microcode_blob.c @@ -6,10 +6,4 @@ unsigned microcode_updates_106cx[] = { #include "microcode-M08106C2219.h" #include "microcode-M08106CA107.h" #include "microcode-M10106CA107.h" - - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_2065x/microcode_blob.h b/src/cpu/intel/model_2065x/microcode_blob.h index 1da40d9..7aa6fdf 100644 --- a/src/cpu/intel/model_2065x/microcode_blob.h +++ b/src/cpu/intel/model_2065x/microcode_blob.h @@ -18,9 +18,3 @@ */
#include "microcode-m9220655_00000003.h" - - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, diff --git a/src/cpu/intel/model_206ax/microcode_blob.h b/src/cpu/intel/model_206ax/microcode_blob.h index 10865ab..9b8d4af 100644 --- a/src/cpu/intel/model_206ax/microcode_blob.h +++ b/src/cpu/intel/model_206ax/microcode_blob.h @@ -19,9 +19,3 @@
#include "microcode-m12206a7_00000028.h" #include "microcode-m12306a9_00000017.h" - - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, diff --git a/src/cpu/intel/model_65x/microcode_blob.c b/src/cpu/intel/model_65x/microcode_blob.c index f14f317..ff3d87e 100644 --- a/src/cpu/intel/model_65x/microcode_blob.c +++ b/src/cpu/intel/model_65x/microcode_blob.c @@ -16,10 +16,4 @@ unsigned microcode_updates_65x[] = { #include "microcode-429-MU165040.h" #include "microcode-436-MU165142.h" #include "microcode-411-MU16530c.h" - - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_67x/microcode_blob.c b/src/cpu/intel/model_67x/microcode_blob.c index 7840484..55d0112 100644 --- a/src/cpu/intel/model_67x/microcode_blob.c +++ b/src/cpu/intel/model_67x/microcode_blob.c @@ -5,9 +5,4 @@ unsigned microcode_updates_67x[] = { #include "microcode-531-MU26732e.h" #include "microcode-539-MU167210.h" #include "microcode-540-MU267238.h" - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_68x/microcode_blob.c b/src/cpu/intel/model_68x/microcode_blob.c index 78e2e03..686a768 100644 --- a/src/cpu/intel/model_68x/microcode_blob.c +++ b/src/cpu/intel/model_68x/microcode_blob.c @@ -17,9 +17,4 @@ unsigned microcode_updates_68x[] = { #include "microcode-662-MU168a01.h" #include "microcode-691-MU168a04.h" #include "microcode-692-MU168a05.h" - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_69x/microcode_blob.c b/src/cpu/intel/model_69x/microcode_blob.c index e9ca20f..74d606c 100644 --- a/src/cpu/intel/model_69x/microcode_blob.c +++ b/src/cpu/intel/model_69x/microcode_blob.c @@ -4,10 +4,4 @@ unsigned microcode_updates_69x[] = { #include "microcode-1376-m8069547.h" #include "microcode-1373-m1069507.h" #include "microcode-1374-m2069507.h" - - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_6bx/microcode_blob.c b/src/cpu/intel/model_6bx/microcode_blob.c index a6f9bc6..e9a7cb7 100644 --- a/src/cpu/intel/model_6bx/microcode_blob.c +++ b/src/cpu/intel/model_6bx/microcode_blob.c @@ -3,9 +3,4 @@ unsigned microcode_updates_6bx[] = { #include "microcode-738-MU16b11d.h" #include "microcode-875-MU16b401.h" #include "microcode-885-MU16b402.h" - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_6dx/microcode_blob.c b/src/cpu/intel/model_6dx/microcode_blob.c index 52489e4..c66eca4 100644 --- a/src/cpu/intel/model_6dx/microcode_blob.c +++ b/src/cpu/intel/model_6dx/microcode_blob.c @@ -1,9 +1,3 @@ unsigned microcode_updates_6dx[] = { #include "microcode-1355-m206d618.h" - - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_6ex/microcode_blob.c b/src/cpu/intel/model_6ex/microcode_blob.c index 0798316..e934da7 100644 --- a/src/cpu/intel/model_6ex/microcode_blob.c +++ b/src/cpu/intel/model_6ex/microcode_blob.c @@ -2,9 +2,4 @@ unsigned microcode_updates_6ex[] = { #include "microcode-1624-m206e839.h" #include "microcode-1729-m206ec54.h" #include "microcode-1869-m806ec59.h" - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_6fx/microcode_blob.c b/src/cpu/intel/model_6fx/microcode_blob.c index f17613b..85bf467 100644 --- a/src/cpu/intel/model_6fx/microcode_blob.c +++ b/src/cpu/intel/model_6fx/microcode_blob.c @@ -17,10 +17,4 @@ unsigned microcode_updates_6fx[] = { #include "microcode-m806fa95.h" #include "microcode-m806fbBA.h" #include "microcode-m806fda4.h" - - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_6xx/microcode_blob.c b/src/cpu/intel/model_6xx/microcode_blob.c index 8a7ef26..1de815c 100644 --- a/src/cpu/intel/model_6xx/microcode_blob.c +++ b/src/cpu/intel/model_6xx/microcode_blob.c @@ -1,9 +1,4 @@ unsigned microcode_updates_6xx[] = { - /* WARNING - Intel has a new data structure that has variable length - * microcode update lengths. They are encoded in int 8 and 9. A - * dummy header of nulls must terminate the list. - */ - #include "microcode-99-B_c6_612.h" #include "microcode-43-B_c6_617.h" #include "microcode-51-B_c6_616.h" @@ -24,10 +19,4 @@ unsigned microcode_updates_6xx[] = { #include "microcode-566-mu26a003.h" #include "microcode-588-mu26a101.h" #include "microcode-620-MU26a401.h" - - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_f0x/microcode_blob.c b/src/cpu/intel/model_f0x/microcode_blob.c index 079a2cb..314b024 100644 --- a/src/cpu/intel/model_f0x/microcode_blob.c +++ b/src/cpu/intel/model_f0x/microcode_blob.c @@ -5,10 +5,4 @@ unsigned microcode_updates_f0x[] = { #include "microcode-983-m02f0a15.h" #include "microcode-964-m01f0712.h" #include "microcode-966-m04f0a14.h" - - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_f1x/microcode_blob.c b/src/cpu/intel/model_f1x/microcode_blob.c index 308402c..6adcc41 100644 --- a/src/cpu/intel/model_f1x/microcode_blob.c +++ b/src/cpu/intel/model_f1x/microcode_blob.c @@ -1,17 +1,7 @@ /* 256KB cache */ unsigned microcode_updates_f1x[] = { - /* WARNING - Intel has a new data structure that has variable length - * microcode update lengths. They are encoded in int 8 and 9. A - * dummy header of nulls must terminate the list. - */ #include "microcode-1068-m01f122d.h" #include "microcode-1069-m04f122e.h" #include "microcode-1070-m02f122f.h" #include "microcode-1072-m04f1305.h" - - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_f2x/microcode_blob.c b/src/cpu/intel/model_f2x/microcode_blob.c index e8c9302..e9ee147 100644 --- a/src/cpu/intel/model_f2x/microcode_blob.c +++ b/src/cpu/intel/model_f2x/microcode_blob.c @@ -1,10 +1,5 @@ /* 512KB cache */ unsigned microcode_updates_f2x[] = { - /* WARNING - Intel has a new data structure that has variable length - * microcode update lengths. They are encoded in int 8 and 9. A - * dummy header of nulls must terminate the list. - */ - /* Old microcode file not present in Intel's microcode.dat. */ #include "microcode_m02f2203.h"
@@ -24,10 +19,4 @@ unsigned microcode_updates_f2x[] = { #include "microcode-1104-m04f241e.h" #include "microcode-1342-m02f252a.h" #include "microcode-1106-m02f241f.h" - - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_f3x/microcode_blob.c b/src/cpu/intel/model_f3x/microcode_blob.c index 0bd2a5b..2847f75 100644 --- a/src/cpu/intel/model_f3x/microcode_blob.c +++ b/src/cpu/intel/model_f3x/microcode_blob.c @@ -1,16 +1,5 @@ unsigned microcode_updates_f3x[] = { - /* WARNING - Intel has a new data structure that has variable length - * microcode update lengths. They are encoded in int 8 and 9. A - * dummy header of nulls must terminate the list. - */ - #include "microcode-1290-m0df320a.h" #include "microcode-1467-m0df330c.h" #include "microcode-1468-m1df3417.h" - - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, }; diff --git a/src/cpu/intel/model_f4x/microcode_blob.c b/src/cpu/intel/model_f4x/microcode_blob.c index 4f1147c..dd5e3fa 100644 --- a/src/cpu/intel/model_f4x/microcode_blob.c +++ b/src/cpu/intel/model_f4x/microcode_blob.c @@ -1,9 +1,4 @@ unsigned microcode_updates_f4x[] = { - /* WARNING - Intel has a new data structure that has variable length - * microcode update lengths. They are encoded in int 8 and 9. A - * dummy header of nulls must terminate the list. - */ - #include "microcode-1735-m01f480c.h" #include "microcode-1460-m9df4305.h" #include "microcode-2492-m02f480e.h" @@ -15,10 +10,4 @@ unsigned microcode_updates_f4x[] = { #include "microcode-1637-m5cf4a04.h" #include "microcode-1462-mbdf4903.h" #include "microcode-1498-m5df4a02.h" - - /* Dummy terminator */ - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, };