From ba898b9c5629bf725a25b2b32d83f1b5be71bab5 Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Tue, 30 Dec 2014 07:41:24 -0500 Subject: Documentation: merged X200 flashing instructions with main --- diff --git a/docs/hcl/x200.html b/docs/hcl/x200.html index 58801f3..5675842 100644 --- a/docs/hcl/x200.html +++ b/docs/hcl/x200.html @@ -41,7 +41,7 @@

- Flashing instructions can be found at ../install/index.html#flashrom_x200 + Flashing instructions can be found at ../install/index.html#flashrom

diff --git a/docs/hcl/x200_remove_me.html b/docs/hcl/x200_remove_me.html index da3ca4d..e306433 100644 --- a/docs/hcl/x200_remove_me.html +++ b/docs/hcl/x200_remove_me.html @@ -106,7 +106,7 @@

Your X200 libreboot.rom image is now ready to be flashed on the machine. Refer back to - ../install/index.html#flashrom_x200 + ../install/index.html#flashrom for how to flash it.

@@ -176,7 +176,7 @@

You should now have a libreboot.rom image containing the correct 4K descriptor and 8K gbe regions, which - will then be safe to flash. Refer back to ../install/index.html#flashrom_x200 + will then be safe to flash. Refer back to ../install/index.html#flashrom for how to flash it.

diff --git a/docs/install/index.html b/docs/install/index.html index 241ef3d..5502a9c 100644 --- a/docs/install/index.html +++ b/docs/install/index.html @@ -29,8 +29,7 @@
  • Recommended ROM's to flash
  • X60/X60S/X60T/T60: How to flash your ROM (if running Lenovo BIOS firmware)
  • macbook21: How to flash your ROM (if running Apple EFI firmware)
    • -
  • X60/X60S/X60T/T60/macbook21: How to flash your ROM (if running libreboot or coreboot already)
    • -
  • X200: Flashing libreboot (hardware or software)
    • +
  • X60/X60S/X60T/T60/X200/macbook21: How to flash your ROM (if running libreboot or coreboot already)

    • Installing libreboot (hardware)

    @@ -38,6 +37,7 @@
  • ThinkPad X60/X60S: How to unbrick
  • ThinkPad X60 Tablet: How to unbrick
  • ThinkPad T60: How to unbrick
    • +
  • ThinkPad X200: How to unbrick (also the initial installation guide for this machine)
    • @@ -321,7 +321,7 @@
    -

    X60/X60S/X60T/T60/macbook21: How to flash the ROM's onto your machine (if running libreboot or coreboot already)

    +

    X60/X60S/X60T/T60/X200/macbook21: How to flash the ROM's onto your machine (if running libreboot or coreboot already)

    @@ -340,6 +340,11 @@

    + If you have Lenovo BIOS running (X200), go to x200_external.html instead. + +

    +

    + If you have Apple EFI firmware running (macbook21), go to #flashrom_macbook21 instead.

    @@ -350,6 +355,20 @@

    + If you have an X200 with libreboot or coreboot already running, note that + the Gbe in the boot flash contains your MAC address. You will need to change the default + MAC address inside the ROM images before flashing a new libreboot image. See + ich9gen for details. + + Another important note about the X200: even if you do already have libreboot or coreboot, + it is possible for the user to write-protect regions in the flash chip, by modifying + the flash descriptor. If you have locked regions, you will need an external flasher + (see x200_external.html) to re-flash those regions. By default, + the X200 ROM images in libreboot contain a descriptor+gbe with all regions unlocked. + +

    +

    + If you are flashing an Apple MacBook2,1, be sure to read the information in ../hcl/index.html#macbook21.

    @@ -391,7 +410,7 @@

    - If you boot and you see nothing, try turning up the backlight (Fn+Home for X60/X60S/X60T/T60, F2 for macbook21). + If you boot and you see nothing, try turning up the backlight (Fn+Home for X60/X60S/X60T/T60/X200, F2 for macbook21).

    @@ -404,42 +423,6 @@

    Back to top of page

    - -
    - -

    X200: Flashing libreboot (hardware or software)

    - -

    - If your X200 is running the original firmware (Lenovo BIOS), follow the instructions at - x200_external.html first. -

    - -

    - Software flashing instructions: the guide from #flashrom ought to work. -

    -

    - Notes about how the ME was removed (and disabled) for libreboot can be found at - ../hcl/x200_remove_me.html. -

    -

    - On the X200, the Gbe region in the flash chip contains your MAC address. - Libreboot ROM images already contain a descriptor and gbe in them, but - with the same MAC address, which probably isn't the one you want. You can change it. - Read the notes about ich9gen to - know how to change the MAC address inside your ROM image before flashing it to your - machine. -

    - -

    - Flashrom supports the flash chips in the X200, but might complain that the laptop isn't whitelisted. - There are two possible solutions: add a whitelist for X200 (and others) to flashrom, use use - -p internal:laptop=force_I_want_a_brick instead of -p internal as an argument when - running flashrom. -

    - -

    - Back to top of page. -

    diff --git a/docs/release.html b/docs/release.html index 0ed0963..274ddf3 100644 --- a/docs/release.html +++ b/docs/release.html @@ -98,8 +98,7 @@ Lenovo ThinkPad X200
  • -- cgit v0.9.1