summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/hcl/x200_remove_me.html20
-rw-r--r--docs/install/index.html9
-rw-r--r--docs/install/x200_external.html5
3 files changed, 25 insertions, 9 deletions
diff --git a/docs/hcl/x200_remove_me.html b/docs/hcl/x200_remove_me.html
index cda9bd8..3d72951 100644
--- a/docs/hcl/x200_remove_me.html
+++ b/docs/hcl/x200_remove_me.html
@@ -25,6 +25,11 @@
get X200 support in libreboot (the machine can also work without the microcode blobs).
</p>
<p>
+ The ME is removed and disabled in libreboot by modifying the descriptor. More info about
+ this can be found in the ich9deblob/ich9gen source code in resources/utilities/ich9deblob/
+ in libreboot, or more generally on this page.
+ </p>
+ <p>
Or <a href="x200.html">back to main X200 compatibility page (x200.html)</a>.
</p>
@@ -39,7 +44,7 @@
<p>
It is no longer necessary to use <a href="#ich9deblob">ich9deblob</a> to generate
- a deblobbed descriptor+gme image for the X200. ich9gen is a small utility within
+ a deblobbed descriptor+gbe image for the X200. ich9gen is a small utility within
ich9deblob that can generate them from scratch, without a factory.bin dump.
</p>
@@ -52,8 +57,8 @@
Two new files will be created:
</p>
<ul>
- <li>ich9fdgbe_4m.bin: this is for X200 laptops with the 4MB flash chip.</li>
- <li>ich9fdgbe_8m.bin: this is for X200 laptops with the 8MB flash chip.</li>
+ <li><b>ich9fdgbe_4m.bin</b>: this is for X200 laptops with the 4MB flash chip.</li>
+ <li><b>ich9fdgbe_8m.bin</b>: this is for X200 laptops with the 8MB flash chip.</li>
</ul>
<p>
@@ -73,7 +78,9 @@
</p>
<p>
- Your X200 libreboot.rom image is now ready to be flashed on the machine.
+ Your X200 libreboot.rom image is now ready to be flashed on the machine. Refer back to
+ <a href="../install/index.html#flashrom_x200">../install/index.html#flashrom_x200</a>
+ for how to flash it.
</p>
<hr/>
@@ -84,6 +91,11 @@
<b>This is no longer strictly necessary. Libreboot ROM images for X200 now
contain the 12KiB descriptor+gbe generated from ich9gen, by default.</b>
</p>
+
+ <p>
+ This was the tool originally used to disable the ME on X200. <a href="#ich9gen">ich9gen</a> now supersedes it;
+ ich9gen is better because it does not rely on dumping the factory.rom image (whereas, ich9deblob does).
+ </p>
<p>
This is what you will use to generate the deblobbed descriptor+gbe regions for your libreboot ROM image.
diff --git a/docs/install/index.html b/docs/install/index.html
index dc53ace..207d1cc 100644
--- a/docs/install/index.html
+++ b/docs/install/index.html
@@ -415,9 +415,7 @@
</p>
<p>
- Software flashing instructions: the guide from <a href="#flashrom">#flashrom</a> ought to work,
- but do make sure that the ROM you flash has a flash descriptor and gbe region dd'd into it,
- based on the instructions at <a href="../hcl/x200_remove_me.html">../hcl/x200_remove_me.html</a>.
+ Software flashing instructions: the guide from <a href="#flashrom">#flashrom</a> ought to work.
</p>
<p>
@@ -428,6 +426,11 @@
</p>
<p>
+ Notes about how the ME was removed (and disabled) for libreboot can be found at
+ <a href="../hcl/x200_remove_me.html">../hcl/x200_remove_me.html</a>.
+ </p>
+
+ <p>
<a href="#pagetop">Back to top of page.</a>
</p>
diff --git a/docs/install/x200_external.html b/docs/install/x200_external.html
index 207a769..a95825c 100644
--- a/docs/install/x200_external.html
+++ b/docs/install/x200_external.html
@@ -159,8 +159,9 @@ Please specify which chip definition to use with the -c &lt;chipname&gt; option.
<p>
Information about the descriptor and gbe can be found in the notes linked at
<a href="../hcl/x200_remove_me.html">../hcl/x200_remove_me.html</a> - also shows how to modify them to disable and remove the ME/AMT blob.
- <span style="font-size:1.5em; background:#ccc;"><b><u><i>MAKE SURE TO FOLLOW THE GUIDE IN THIS LINK, BEFORE CONTINUING.
- FAILURE TO DO SO WILL RESULT IN A BRICKED MACHINE.</i></u></b></span>
+ <span style="font-size:1.5em; background:#ccc;"><s><b><u><i>MAKE SURE TO FOLLOW THE GUIDE IN THIS LINK, BEFORE CONTINUING.
+ FAILURE TO DO SO WILL RESULT IN A BRICKED MACHINE.</i></u></b></s> - libreboot ROM images now include
+ the 12KiB descriptor+gbe by default, generated from <a href="../hcl/x200_remove_me.html#ich9gen">ich9gen</a></span>
</p>
<p>
Assuming that your libreboot ROM image is properly setup (modified descriptor plus gbe region included in the ROM),