Merge branch 'leftoverslashes' of swiftgeek/libreboot into master

4 files changed, 25 insertions, 76 deletions

diff --git a/docs/gnulinux/encrypted_debian.md b/docs/gnulinux/encrypted_debian.md
index 23b4503f..eb8093cf 100644
--- a/docs/gnulinux/encrypted_debian.md
+++ b/docs/gnulinux/encrypted_debian.md
@@ -199,29 +199,29 @@ directory from another system, so write it down and keep the note
 somewhere secret. Ideally, you should memorize it and then burn the note
 (or not even write it down, and memorize it still)>
 
-Modify grub.cfg (CBFS)
+Generate distro's grub.cfg
 ======================
 
 Now you need to set it up so that the system will automatically boot,
 without having to type a bunch of commands.
 
-Modify your grub.cfg (in the firmware) [using this
-tutorial](grub_cbfs.md); just change the default menu entry 'Load
-Operating System' to say this inside:
+Install grub-coreboot if not already installed:
 
-    cryptomount -a
-    set root='lvm/matrix-rootvol'
-    linux /vmlinuz root=/dev/mapper/matrix-rootvol cryptdevice=/dev/mapper/matrix-rootvol:root
-    initrd /initrd.img
-    
-Without specifying a device, the *-a* parameter tries to unlock all
-detected LUKS volumes. You can also specify -u UUID or -a (device).
+    # apt-get install grub-coreboot
+
+Modify or add following lines to /etc/default/grub
+
+    GRUB_CMDLINE_LINUX="cryptdevice=/dev/mapper/matrix-rootvol:root"
+    GRUB_ENABLE_CRYPTODISK=y
+
+Copy fonts/backgrounds to /boot/grub and
+generate grub.cfg using following command:
+
+    # grub-install --target=i386-coreboot
 
 [Refer to this guide](grub_hardening.md) for further guidance on
 hardening your GRUB configuration, for security purposes.
 
-Flash the modified ROM using [this tutorial](../install/#flashrom).
-
 Troubleshooting
 ===============
 
diff --git a/docs/hardware/index.md b/docs/hardware/index.md
index d939fad6..818be496 100644
--- a/docs/hardware/index.md
+++ b/docs/hardware/index.md
@@ -109,7 +109,7 @@ proprietary VGA Option ROM ('[Video
 BIOS](https://en.wikipedia.org/wiki/Video_BIOS)' or 'VBIOS'), all
 known LCD panels are currently compatible:
 
-To find what LCD panel you have, see:
+Only panels with EDID are currently supported, see:
 [../misc/\#get\_edid\_panelname](../misc/#get_edid_panelname).
 
 -   TMD-Toshiba LTD121ECHB: \#
@@ -136,7 +136,7 @@ Native gpu initialization ('native graphics') which replaces the
 proprietary VGA Option ROM ('[Video
 BIOS](https://en.wikipedia.org/wiki/Video_BIOS)' or 'VBIOS').
 
-To find what LCD panel you have, see:
+Only panels with EDID are currently supported, see:
 [../misc/\#get\_edid\_panelname](../misc/#get_edid_panelname).
 
 There are 6 known LCD panels for the X60 Tablet:
@@ -151,8 +151,7 @@ There are 6 known LCD panels for the X60 Tablet:
     -   BOE-Hydis HV121P01-101 (works)
 
 Most X60Ts only have digitizer (pen), but some have finger (touch)
-aswell as pen; finger/multitouch doesn't work, only digitizer (pen)
-does.
+as well as pen.
 
 You can remove an X61/X61s motherboard from the chassis and install an
 X60/X60s motherboard in its place (for flashing libreboot). The chassis
@@ -221,7 +220,7 @@ Native gpu initialization ('native graphics') which replaces the
 proprietary VGA Option ROM ('[Video
 BIOS](https://en.wikipedia.org/wiki/Video_BIOS)' or 'VBIOS').
 
-To find what LCD panel you have, see:
+Only panels with EDID are currently supported, see:
 [../misc/\#get\_edid\_panelname](../misc/#get_edid_panelname).
 
 *Some T60 variants have ATI GPUs, and all T60p laptops have ATI GPUs These are
@@ -246,7 +245,7 @@ Tested LCD panels: (working)
 -   Samsung LTN141XA-L01 (14.1" 1024x768)
 
 Tested LCD panels: *not working yet (incompatible; see
-[../future/\#lcd\_i945\_incompatibility](../future/#lcd_i945_incompatibility))*
+[Issue \#677](https://notabug.org/libreboot/libreboot/issues/677))*
 
 -   LG-Philips LP150X09 (15.1" 1024x768)
 -   Samsung LTN150XG (15.1" 1024x768)
@@ -291,7 +290,7 @@ is very easily replaced; just remove the card and install another one
 *after* libreboot is installed. See
 [\#recommended\_wifi](#recommended_wifi) for replacements.
 
-ThinkPad T60 (ATI GPU) and ThinkPad T60 (Intel GPU) differences
+ThinkPad T60/R60 dGPU (ATI GPU) and iGPU (Intel GPU) differences
 ----------------------------------------------------------------
 
 If your T60 is a 14.1" or 15.1" model with an ATI GPU, it won't work
@@ -299,13 +298,12 @@ with libreboot by default but you can replace the motherboard with
 another T60 motherboard that has an Intel GPU, and then libreboot should
 work.
 
-As far as I know, 14.1" (Intel GPU) and 15.1" (Intel GPU) T60
-motherboards are the same, where 'spacers' are used on the 15.1" T60.
-In any case, it makes sense to find one that is guaranteed to fit in
-your chassis.
-
 There is also a 15.4" T60 with Intel GPU.
 
+Widescreen T60/R60 can come with either boards taking full space or
+with non-widescreen motherboard and extension adapter for
+UltraBay/hard drive connectors.
+
 Note: the T60*p* laptops all have ATI graphics. The T60p laptops
 cannot be used with libreboot under any circumstances.
 
diff --git a/docs/hardware/x200.md b/docs/hardware/x200.md
index 99f9ff21..b0ff096a 100644
--- a/docs/hardware/x200.md
+++ b/docs/hardware/x200.md
@@ -219,57 +219,6 @@ outputs from the X200:
 -   BIOS 3.15, EC 1.06
     -   [hwdumps/x200/](hwdumps/x200/)
 
-RAM, S3 and microcode updates {#ram_s3_microcode}
-=============================
-
-Not all memory modules work. Most of the default ones do, but you have
-to be careful when upgrading to 8GiB; some modules work, some don't.
-
-Someone on reddit also did their own research on RAM compatibility: [on
-this
-post](https://www.reddit.com/r/libreboot/comments/5ax17e/liberated_x200_is_really_picky_with_memory/)
-
-[This page](http://www.forum.thinkpads.com/viewtopic.php?p=760721) might
-be useful for RAM compatibility info (note: coreboot raminit is
-different, so this page might be BS)
-
-pehjota started collecting some steppings for different CPUs on several
-X200 laptops. You can get the CPUID by running:
-
-    # dmesg | sed -n 's/.*microcode:.*sig=\([^,]*\),.*$/\1/p' | uniq
-
-What pehjota wrote: The laptops that have issues resuming from suspend,
-as well as a laptop that (as I mentioned earlier in \#libreboot) won't
-boot with any Samsung DIMMs, all have CPUID 0x10676 (stepping M0).
-
-What pehjota wrote: Laptops with CPUID 0x167A (stepping R0) resume
-properly every time and work with Samsung DIMMs. I'll need to do more
-testing on more units to better confirm these trends, but it looks like
-the M0 microcode is very buggy. That would also explain why I didn't
-have issues with Samsung DIMMs with the Lenovo BIOS (which would have
-microcode updates). I wonder if VT-x works on R0.
-
-What pehjota wrote: As I said, 10676 is M0 and 1067A is R0; those are
-the two CPUIDs and steppings for Intel Core 2 Duo P8xxx CPUs with
-factory microcode. (1067 is the family and model, and 6 or A is the
-stepping ID.)
-
-*TODO: check the CPUIDs and test S3 resume and/or KVM on any C2D
-systems (including non-P8xxx ones, which I don't have here) you have
-available. I'd be curious if you could confirm these results.*
-
-It might not be coreboot that's buggy with raminit/S3; it might just be down to
-the microcode updates.
-
-Unsorted notes {#unsorted}
---------------
-
-    <sgsit> do you know if it's possible to flash thinkpads over the LPC debug connector at the front edge?
-    <sgsit> that would make life much easier for systems like this
-    <sgsit> all the Wistron manufactured systems have this thing called a "golden finger", normally at the front edge of the board
-    <sgsit> you can plug a board in which gives diagnostic codes but i'm wondering whether it is capable of more
-    <sgsit> http://www.endeer.cz/bios.tools/bios.html
-
 Copyright © 2014, 2015 Leah Rowe <info@minifree.org>\
 Copyright © 2015 Patrick "P. J." McDermott <pj@pehjota.net>\
 
diff --git a/docs/install/index.md b/docs/install/index.md
index ddaa1163..080faabf 100644
--- a/docs/install/index.md
+++ b/docs/install/index.md
@@ -316,6 +316,8 @@ You should see within the output the following:
 
 You should also see within the output the following:
 
+    (...) failed during command execution at address 0x1f0000
+    ...
     Your flash chip is in an unknown state
     ...
     FAILED