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> Reviewed-on: http://review.coreboot.org/4506 Tested-by: build bot (Jenkins)
This commit is contained in:
parent
2c38f50b4a
commit
07d881a02d
|
@ -5,9 +5,4 @@
|
||||||
* coreboot.rom image.
|
* coreboot.rom image.
|
||||||
*/
|
*/
|
||||||
unsigned microcode_updates_ep80579[] = {
|
unsigned microcode_updates_ep80579[] = {
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -26,8 +26,3 @@
|
||||||
#include "microcode-M32306c3_00000012.h"
|
#include "microcode-M32306c3_00000012.h"
|
||||||
#include "microcode-M3240660_ffff000b.h"
|
#include "microcode-M3240660_ffff000b.h"
|
||||||
#endif
|
#endif
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
|
|
|
@ -8,10 +8,4 @@ unsigned microcode_updates_1067ax[] = {
|
||||||
#include "microcode-m441067AA0B.h"
|
#include "microcode-m441067AA0B.h"
|
||||||
#include "microcode-m801067660F.h"
|
#include "microcode-m801067660F.h"
|
||||||
#include "microcode-mA01067AA0B.h"
|
#include "microcode-mA01067AA0B.h"
|
||||||
|
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,10 +6,4 @@ unsigned microcode_updates_106cx[] = {
|
||||||
#include "microcode-M08106C2219.h"
|
#include "microcode-M08106C2219.h"
|
||||||
#include "microcode-M08106CA107.h"
|
#include "microcode-M08106CA107.h"
|
||||||
#include "microcode-M10106CA107.h"
|
#include "microcode-M10106CA107.h"
|
||||||
|
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -18,9 +18,3 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "microcode-m9220655_00000003.h"
|
#include "microcode-m9220655_00000003.h"
|
||||||
|
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
|
|
|
@ -19,9 +19,3 @@
|
||||||
|
|
||||||
#include "microcode-m12206a7_00000028.h"
|
#include "microcode-m12206a7_00000028.h"
|
||||||
#include "microcode-m12306a9_00000017.h"
|
#include "microcode-m12306a9_00000017.h"
|
||||||
|
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
|
|
|
@ -16,10 +16,4 @@ unsigned microcode_updates_65x[] = {
|
||||||
#include "microcode-429-MU165040.h"
|
#include "microcode-429-MU165040.h"
|
||||||
#include "microcode-436-MU165142.h"
|
#include "microcode-436-MU165142.h"
|
||||||
#include "microcode-411-MU16530c.h"
|
#include "microcode-411-MU16530c.h"
|
||||||
|
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,9 +5,4 @@ unsigned microcode_updates_67x[] = {
|
||||||
#include "microcode-531-MU26732e.h"
|
#include "microcode-531-MU26732e.h"
|
||||||
#include "microcode-539-MU167210.h"
|
#include "microcode-539-MU167210.h"
|
||||||
#include "microcode-540-MU267238.h"
|
#include "microcode-540-MU267238.h"
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -17,9 +17,4 @@ unsigned microcode_updates_68x[] = {
|
||||||
#include "microcode-662-MU168a01.h"
|
#include "microcode-662-MU168a01.h"
|
||||||
#include "microcode-691-MU168a04.h"
|
#include "microcode-691-MU168a04.h"
|
||||||
#include "microcode-692-MU168a05.h"
|
#include "microcode-692-MU168a05.h"
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,10 +2,4 @@ unsigned microcode_updates_69x[] = {
|
||||||
#include "microcode-1376-m8069547.h"
|
#include "microcode-1376-m8069547.h"
|
||||||
#include "microcode-1373-m1069507.h"
|
#include "microcode-1373-m1069507.h"
|
||||||
#include "microcode-1374-m2069507.h"
|
#include "microcode-1374-m2069507.h"
|
||||||
|
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -3,9 +3,4 @@ unsigned microcode_updates_6bx[] = {
|
||||||
#include "microcode-738-MU16b11d.h"
|
#include "microcode-738-MU16b11d.h"
|
||||||
#include "microcode-875-MU16b401.h"
|
#include "microcode-875-MU16b401.h"
|
||||||
#include "microcode-885-MU16b402.h"
|
#include "microcode-885-MU16b402.h"
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,9 +1,3 @@
|
||||||
unsigned microcode_updates_6dx[] = {
|
unsigned microcode_updates_6dx[] = {
|
||||||
#include "microcode-1355-m206d618.h"
|
#include "microcode-1355-m206d618.h"
|
||||||
|
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,9 +2,4 @@ unsigned microcode_updates_6ex[] = {
|
||||||
#include "microcode-1624-m206e839.h"
|
#include "microcode-1624-m206e839.h"
|
||||||
#include "microcode-1729-m206ec54.h"
|
#include "microcode-1729-m206ec54.h"
|
||||||
#include "microcode-1869-m806ec59.h"
|
#include "microcode-1869-m806ec59.h"
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -17,10 +17,4 @@ unsigned microcode_updates_6fx[] = {
|
||||||
#include "microcode-m806fa95.h"
|
#include "microcode-m806fa95.h"
|
||||||
#include "microcode-m806fbBA.h"
|
#include "microcode-m806fbBA.h"
|
||||||
#include "microcode-m806fda4.h"
|
#include "microcode-m806fda4.h"
|
||||||
|
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,9 +1,4 @@
|
||||||
unsigned microcode_updates_6xx[] = {
|
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-99-B_c6_612.h"
|
||||||
#include "microcode-43-B_c6_617.h"
|
#include "microcode-43-B_c6_617.h"
|
||||||
#include "microcode-51-B_c6_616.h"
|
#include "microcode-51-B_c6_616.h"
|
||||||
|
@ -24,10 +19,4 @@ unsigned microcode_updates_6xx[] = {
|
||||||
#include "microcode-566-mu26a003.h"
|
#include "microcode-566-mu26a003.h"
|
||||||
#include "microcode-588-mu26a101.h"
|
#include "microcode-588-mu26a101.h"
|
||||||
#include "microcode-620-MU26a401.h"
|
#include "microcode-620-MU26a401.h"
|
||||||
|
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,10 +5,4 @@ unsigned microcode_updates_f0x[] = {
|
||||||
#include "microcode-983-m02f0a15.h"
|
#include "microcode-983-m02f0a15.h"
|
||||||
#include "microcode-964-m01f0712.h"
|
#include "microcode-964-m01f0712.h"
|
||||||
#include "microcode-966-m04f0a14.h"
|
#include "microcode-966-m04f0a14.h"
|
||||||
|
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,17 +1,7 @@
|
||||||
/* 256KB cache */
|
/* 256KB cache */
|
||||||
unsigned microcode_updates_f1x[] = {
|
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-1068-m01f122d.h"
|
||||||
#include "microcode-1069-m04f122e.h"
|
#include "microcode-1069-m04f122e.h"
|
||||||
#include "microcode-1070-m02f122f.h"
|
#include "microcode-1070-m02f122f.h"
|
||||||
#include "microcode-1072-m04f1305.h"
|
#include "microcode-1072-m04f1305.h"
|
||||||
|
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
/* 512KB cache */
|
/* 512KB cache */
|
||||||
unsigned microcode_updates_f2x[] = {
|
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. */
|
/* Old microcode file not present in Intel's microcode.dat. */
|
||||||
#include "microcode_m02f2203.h"
|
#include "microcode_m02f2203.h"
|
||||||
|
|
||||||
|
@ -24,10 +19,4 @@ unsigned microcode_updates_f2x[] = {
|
||||||
#include "microcode-1104-m04f241e.h"
|
#include "microcode-1104-m04f241e.h"
|
||||||
#include "microcode-1342-m02f252a.h"
|
#include "microcode-1342-m02f252a.h"
|
||||||
#include "microcode-1106-m02f241f.h"
|
#include "microcode-1106-m02f241f.h"
|
||||||
|
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,16 +1,5 @@
|
||||||
unsigned microcode_updates_f3x[] = {
|
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-1290-m0df320a.h"
|
||||||
#include "microcode-1467-m0df330c.h"
|
#include "microcode-1467-m0df330c.h"
|
||||||
#include "microcode-1468-m1df3417.h"
|
#include "microcode-1468-m1df3417.h"
|
||||||
|
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,9 +1,4 @@
|
||||||
unsigned microcode_updates_f4x[] = {
|
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-1735-m01f480c.h"
|
||||||
#include "microcode-1460-m9df4305.h"
|
#include "microcode-1460-m9df4305.h"
|
||||||
#include "microcode-2492-m02f480e.h"
|
#include "microcode-2492-m02f480e.h"
|
||||||
|
@ -15,10 +10,4 @@ unsigned microcode_updates_f4x[] = {
|
||||||
#include "microcode-1637-m5cf4a04.h"
|
#include "microcode-1637-m5cf4a04.h"
|
||||||
#include "microcode-1462-mbdf4903.h"
|
#include "microcode-1462-mbdf4903.h"
|
||||||
#include "microcode-1498-m5df4a02.h"
|
#include "microcode-1498-m5df4a02.h"
|
||||||
|
|
||||||
/* Dummy terminator */
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
0x0, 0x0, 0x0, 0x0,
|
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue