From 4e68aa6b0b359d1ded3afed3e361b86fe2e6b67a Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Sun, 28 Dec 2014 20:38:52 -0500 Subject: ich9gen: when changing Gbe mac address, spit out new mkgbe.c --- (limited to 'resources/utilities/ich9deblob') diff --git a/resources/utilities/ich9deblob/src/ich9deblob.c b/resources/utilities/ich9deblob/src/ich9deblob.c index b7bbf88..1c9ea1e 100644 --- a/resources/utilities/ich9deblob/src/ich9deblob.c +++ b/resources/utilities/ich9deblob/src/ich9deblob.c @@ -227,7 +227,6 @@ int main(int argc, char *argv[]) * Generate ich9gen data (C code that will recreate the deblobbed descriptor+gbe from scratch) * ------------------------------------------------------------------ */ - /* Code for generating the Gbe struct */ /* mkgbe.h */ if (notCreatedHFileForGbeCFile("mkgbe.h", "mkgbe.c")) { @@ -236,7 +235,6 @@ int main(int argc, char *argv[]) if (notCreatedCFileFromGbeStruct4k(deblobbedGbeStruct8k.backup, "mkgbe.c", "mkgbe.h")) { return 1; } - /* Code for generating the Descriptor struct */ /* mkdescriptor.h */ if (notCreatedHFileForDescriptorCFile("mkdescriptor.h", "mkdescriptor.c")) { @@ -245,7 +243,6 @@ int main(int argc, char *argv[]) if (notCreatedCFileFromDescriptorStruct(deblobbedDescriptorStruct, "mkdescriptor.c", "mkdescriptor.h")) { return 1; } - printf("The modified descriptor and gbe regions have also been dumped as src files: mkgbe.c, mkgbe.h, mkdescriptor.c, mkdescriptor.h\n"); printf("To use these in ich9gen, place them in src/ich9gen/ and re-build ich9gen.\n\n"); diff --git a/resources/utilities/ich9deblob/src/ich9gen.c b/resources/utilities/ich9deblob/src/ich9gen.c index 81fd182..7ae4980 100644 --- a/resources/utilities/ich9deblob/src/ich9gen.c +++ b/resources/utilities/ich9deblob/src/ich9gen.c @@ -87,6 +87,19 @@ int main(int argc, char *argv[]) memcpy(&gbeStruct8k.main.macAddress, &customMacAddress, 6); /* Update MAC address in main Gbe */ gbeStruct8k.main.checkSum = gbeGetChecksumFrom4kStruct(gbeStruct8k.main, GBECHECKSUMTOTAL); /* Fix the checksum */ memcpy(&gbeStruct8k.backup, &gbeStruct8k.main, GBEREGIONSIZE_4K); /* Copy to the backup */ + + /* Generate ich9gen data (C code for Gbe region): */ + + /* mkgbe.h */ + if (notCreatedHFileForGbeCFile("mkgbe.h", "mkgbe.c")) { + return 1; + } /* and now mkgbe.c */ + if (notCreatedCFileFromGbeStruct4k(gbeStruct8k.backup, "mkgbe.c", "mkgbe.h")) { + return 1; + } + + printf("The modified gbe regions has also been dumped as src files: mkgbe.c, mkgbe.h\n"); + printf("To use these in ich9gen, place them in src/ich9gen/ and re-build ich9gen.\n\n"); } } -- cgit v0.9.1