From d1bb5d6fcc75f07ca6a58b5536906980aff9d253 Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Sat, 18 Jul 2015 19:31:16 -0400 Subject: New board: ThinkPad R500 (experimental) The ich9deblob and ich9gen utilities were modified, so that they support reading and/or writing descriptor images where the GbE region is not defined. These utilities were also re-factored and tidied up a bit. A quick was noticed during the course of this work, in that Compenent 1 Density was being set to 8MiB constantly, even on systems with 4MiB flash chips. Component 2 Density was set statically to 2MiB. ich9gen now sets both to 4MiB or 8MiB, depending on whether building the descriptor for a 4MiB or 8MiB ROM image. There are still some ACPI bugs (see docs/hcl/r500.html), which will have to be fixed upstream. TODO: get hw reg dumps from a factory R500, and compare with the X200 or T400 dumps. --- (limited to 'resources/utilities/ich9deblob/src/demefactory.c') diff --git a/resources/utilities/ich9deblob/src/demefactory.c b/resources/utilities/ich9deblob/src/demefactory.c index 13e0f0b..56618f5 100644 --- a/resources/utilities/ich9deblob/src/demefactory.c +++ b/resources/utilities/ich9deblob/src/demefactory.c @@ -52,7 +52,7 @@ int main() /* * ------------------------------------------------------------------ - * Extract the descriptor and gbe regions from the factory.rom dump + * Extract the descriptor region from the factory.rom dump * ------------------------------------------------------------------ */ FILE* fp = NULL; @@ -98,7 +98,8 @@ int main() */ // Disable the ME/TPM: - descriptorStruct = descriptorDisableMeTpm(descriptorStruct); + descriptorStruct = descriptorDisableMe(descriptorStruct); + descriptorStruct = descriptorDisableTpm(descriptorStruct); /* Host/CPU is allowed to read/write all regions. */ descriptorStruct = descriptorHostRegionsUnlocked(descriptorStruct); @@ -111,7 +112,7 @@ int main() /* * ------------------------------------------------------------------ - * Create the file with the modified descriptor and gbe inside + * Create the file with the modified descriptor inside * ------------------------------------------------------------------ */ @@ -122,7 +123,7 @@ int main() /* * ------------------------------------------------------------------ - * Generate ich9gen data (C code that will recreate the deblobbed descriptor+gbe from scratch) + * Generate ich9gen data (C code that will recreate the deactivatedME descriptor from scratch) * ------------------------------------------------------------------ */ /* Code for generating the Descriptor struct */ -- cgit v0.9.1