diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2014-12-30 03:43:00 +0000 |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2014-12-30 04:16:40 +0000 |
| commit | f7e4961c04808311c55a018096b81ce6852d992e (patch) | |
| tree | 5a270ea4c37553cf5c1fc6722f70f380505644ab /resources/utilities/ich9deblob | |
| parent | 3e60ad76e2cef38bc59f6055c677ea2d890e10fe (diff) | |
| download | librebootfr-f7e4961c04808311c55a018096b81ce6852d992e.tar.gz librebootfr-f7e4961c04808311c55a018096b81ce6852d992e.zip | |
ich9deblob/ich9gen: change descriptor OEM string to LIBERATE
Diffstat (limited to 'resources/utilities/ich9deblob')
| -rw-r--r-- | resources/utilities/ich9deblob/src/descriptor/descriptor.c | 18 | ||||
| -rw-r--r-- | resources/utilities/ich9deblob/src/ich9gen/mkdescriptor.c | 17 |
2 files changed, 26 insertions, 9 deletions
diff --git a/resources/utilities/ich9deblob/src/descriptor/descriptor.c b/resources/utilities/ich9deblob/src/descriptor/descriptor.c index 6b7a75b1..3ef26732 100644 --- a/resources/utilities/ich9deblob/src/descriptor/descriptor.c +++ b/resources/utilities/ich9deblob/src/descriptor/descriptor.c @@ -97,7 +97,7 @@ struct DESCRIPTORREGIONRECORD deblobbedDescriptorStructFromFactory(struct DESCRI * * To disable a region, set the BASE to 1FFF. Shifted by FLREGIONBITSHIFT, * this puts the beginning of that region well outside the ROM image. - * Also set the LIMIT (size) to 0. + * Also set the LIMIT to 0. */ /* Disable (delete) the ME region */ deblobbedDescriptorStruct.regionSection.flReg2.BASE = 0x1FFF; @@ -136,6 +136,21 @@ struct DESCRIPTORREGIONRECORD deblobbedDescriptorStructFromFactory(struct DESCRI * (this is probably redundant, since the ME is already removed from libreboot) */ deblobbedDescriptorStruct = descriptorMeRegionsForbidden(deblobbedDescriptorStruct); + /* + * Miscellaneous + * ------------- + */ + + /* Set OEM string to "LIBERATE" */ + deblobbedDescriptorStruct.oemSection.magicString[0] = 0x4C; + deblobbedDescriptorStruct.oemSection.magicString[1] = 0x49; + deblobbedDescriptorStruct.oemSection.magicString[2] = 0x42; + deblobbedDescriptorStruct.oemSection.magicString[3] = 0x45; + deblobbedDescriptorStruct.oemSection.magicString[4] = 0x52; + deblobbedDescriptorStruct.oemSection.magicString[5] = 0x41; + deblobbedDescriptorStruct.oemSection.magicString[6] = 0x54; + deblobbedDescriptorStruct.oemSection.magicString[7] = 0x45; + return deblobbedDescriptorStruct; } @@ -474,6 +489,7 @@ int notCreatedCFileFromDescriptorStruct(struct DESCRIPTORREGIONRECORD descriptor fprintf(fp, "\n"); /* OEM section */ fprintf(fp, " /* OEM section */\n"); + fprintf(fp, " /* see ../descriptor/descriptor.c */\n"); fprintf(fp, " /* Magic String (ascii characters) */\n"); for(i = 0; i < 8; i++) { fprintf(fp, " descriptorStruct.oemSection.magicString[%d] = 0x%02x;\n", i, descriptorStruct.oemSection.magicString[i]); diff --git a/resources/utilities/ich9deblob/src/ich9gen/mkdescriptor.c b/resources/utilities/ich9deblob/src/ich9gen/mkdescriptor.c index e166c55d..cc7e0222 100644 --- a/resources/utilities/ich9deblob/src/ich9gen/mkdescriptor.c +++ b/resources/utilities/ich9deblob/src/ich9gen/mkdescriptor.c @@ -213,15 +213,16 @@ struct DESCRIPTORREGIONRECORD generatedDescriptorStruct(unsigned int romSize) descriptorStruct.descriptor2Map.reserved = 0x0000; /* OEM section */ + /* see ../descriptor/descriptor.c */ /* Magic String (ascii characters) */ - descriptorStruct.oemSection.magicString[0] = 0x37; - descriptorStruct.oemSection.magicString[1] = 0x55; - descriptorStruct.oemSection.magicString[2] = 0x52; - descriptorStruct.oemSection.magicString[3] = 0x35; - descriptorStruct.oemSection.magicString[4] = 0x31; - descriptorStruct.oemSection.magicString[5] = 0x32; - descriptorStruct.oemSection.magicString[6] = 0x57; - descriptorStruct.oemSection.magicString[7] = 0x57; + descriptorStruct.oemSection.magicString[0] = 0x4c; + descriptorStruct.oemSection.magicString[1] = 0x49; + descriptorStruct.oemSection.magicString[2] = 0x42; + descriptorStruct.oemSection.magicString[3] = 0x45; + descriptorStruct.oemSection.magicString[4] = 0x52; + descriptorStruct.oemSection.magicString[5] = 0x41; + descriptorStruct.oemSection.magicString[6] = 0x54; + descriptorStruct.oemSection.magicString[7] = 0x45; /* Padding */ for (i = 0; i < 248; i++) { descriptorStruct.oemSection.padding[i] = 0xFF; |