From 224a941f4c7d56295a8ec10bf5e655971b1deb66 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 13 May 2017 08:24:56 -0700 Subject: Fix missing code tops --- docs/hardware/gm45_remove_me.md | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/hardware/gm45_remove_me.md') diff --git a/docs/hardware/gm45_remove_me.md b/docs/hardware/gm45_remove_me.md index a5343ac9..b697d244 100644 --- a/docs/hardware/gm45_remove_me.md +++ b/docs/hardware/gm45_remove_me.md @@ -37,11 +37,13 @@ factory.bin dump. ich9gen executables can be found under ./ich9deblob/ statically compiled in libreboot\_util. If you are using src or git, build ich9gen from source with: + $ ./oldbuild module ich9deblob The executable will appear under resources/utilities/ich9deblob/ Run: + $ ./ich9gen Running ich9gen this way (without any arguments) generates a default -- cgit v1.2.3-70-g09d2 From 144f4cd0a4db1783be9f81d9ba7cef5a5c86ccdc Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 13 May 2017 08:27:51 -0700 Subject: Missing bottoms --- docs/bsd/freebsd.md | 1 + docs/bsd/netbsd.md | 1 + docs/bsd/openbsd.md | 1 + docs/git/index.md | 6 ++++++ docs/gnulinux/configuring_parabola.md | 1 + docs/gnulinux/encrypted_parabola.md | 4 ++++ docs/gnulinux/grub_boot_installer.md | 1 + docs/gnulinux/grub_cbfs.md | 2 ++ docs/gnulinux/grub_hardening.md | 1 + docs/grub/index.md | 2 ++ docs/hardware/gm45_remove_me.md | 2 ++ docs/hardware/index.md | 1 + docs/misc/index.md | 2 ++ 13 files changed, 25 insertions(+) (limited to 'docs/hardware/gm45_remove_me.md') diff --git a/docs/bsd/freebsd.md b/docs/bsd/freebsd.md index f056b5b8..b524fb8d 100644 --- a/docs/bsd/freebsd.md +++ b/docs/bsd/freebsd.md @@ -79,6 +79,7 @@ the bootable FreeBSD USB drive: Connect the USB drive. Check dmesg: $ dmesg + Check lsblk to confirm which drive it is: $ lsblk diff --git a/docs/bsd/netbsd.md b/docs/bsd/netbsd.md index 0dceda38..3359690e 100644 --- a/docs/bsd/netbsd.md +++ b/docs/bsd/netbsd.md @@ -75,6 +75,7 @@ the bootable NetBSD USB drive: Connect the USB drive. Check dmesg: $ dmesg + Check lsblk to confirm which drive it is: $ lsblk diff --git a/docs/bsd/openbsd.md b/docs/bsd/openbsd.md index 8906ff00..4a195adb 100644 --- a/docs/bsd/openbsd.md +++ b/docs/bsd/openbsd.md @@ -74,6 +74,7 @@ the bootable OpenBSD USB drive: Connect the USB drive. Check dmesg: $ dmesg + Check lsblk to confirm which drive it is: $ lsblk diff --git a/docs/git/index.md b/docs/git/index.md index 81cb5dd3..eb8a0435 100644 --- a/docs/git/index.md +++ b/docs/git/index.md @@ -23,11 +23,13 @@ For Debian Stretch (may also work on Debian Jessie), you can run the following command: $ sudo ./oldbuild dependencies debian + (this will also work in Devuan) For Parabola, you can run the following command: $ sudo ./oldbuild dependencies parabola\ + or: # ./oldbuild dependencies parabola @@ -52,6 +54,7 @@ requirement is: $ git config --global user.name "Your Name" $ git config --global user.email your@emailaddress.com + This is what will also appear in git logs if you ever commit your own changes to a given repository. For more information, see . @@ -206,12 +209,14 @@ modulename*. To see the possible values for *modulename*, use: After that, build the ROM images (for all boards): $ ./oldbuild roms withgrub + Alternatively, you can build for a specific board or set of boards. For example: $ ./oldbuild roms withgrub x60 $ ./oldbuild roms withgrub x200\_8mb $ ./oldbuild roms withgrub x60 x200\_8mb + The list of board options can be found by looking at the directory names in **resources/libreboot/config/grub/**. @@ -309,6 +314,7 @@ The command that you used for generating the release archives will also run the following command: $ ./oldbuild release tobuild + The archive **tobuild.tar.xz** will have been created under **release/oldbuildsystem/**, containing bucts, flashrom and all other required resources for building them. diff --git a/docs/gnulinux/configuring_parabola.md b/docs/gnulinux/configuring_parabola.md index c6c1d6f4..a598f6f5 100644 --- a/docs/gnulinux/configuring_parabola.md +++ b/docs/gnulinux/configuring_parabola.md @@ -547,6 +547,7 @@ start lxde without lxdm. Read Open LXterminal: $ cp /etc/skel/.xinitrc \~ + Open .xinitrc and add the following plus a line break at the bottom of the file.\ *\# Probably not needed. The same locale info that we set before\ diff --git a/docs/gnulinux/encrypted_parabola.md b/docs/gnulinux/encrypted_parabola.md index f8b97fe8..37b36177 100644 --- a/docs/gnulinux/encrypted_parabola.md +++ b/docs/gnulinux/encrypted_parabola.md @@ -544,9 +544,11 @@ You can check if everything is in there (*grub.cfg* and *grubtest.cfg* would be really nice): $ ./cbfstool libreboot.rom print + Extract grubtest.cfg: $ ./cbfstool libreboot.rom extract -n grubtest.cfg -f grubtest.cfg\ + And modify: $ vi grubtest.cfg @@ -580,6 +582,7 @@ Save your changes in grubtest.cfg, then delete the unmodified config from the ROM image: $ ./cbfstool libreboot.rom remove -n grubtest.cfg + and insert the modified grubtest.cfg:\ \$ **./cbfstool libreboot.rom add -n grubtest.cfg -f grubtest.cfg -t raw**\ @@ -625,6 +628,7 @@ grub.cfg**\ Delete the grub.cfg that remained inside the ROM: $ ./cbfstool libreboot.rom remove -n grub.cfg + Add the modified version that you just made: $ ./cbfstool libreboot.rom add -n grub.cfg -f grub.cfg -t raw diff --git a/docs/gnulinux/grub_boot_installer.md b/docs/gnulinux/grub_boot_installer.md index c360a666..9d1147b3 100644 --- a/docs/gnulinux/grub_boot_installer.md +++ b/docs/gnulinux/grub_boot_installer.md @@ -66,6 +66,7 @@ how to create the bootable GNU+Linux USB drive: Connect the USB drive. Check dmesg: $ dmesg | tail + Check to confirm which drive it is, for example, if you think its sd3: $ disklabel sd3 diff --git a/docs/gnulinux/grub_cbfs.md b/docs/gnulinux/grub_cbfs.md index 223be4ee..624dec62 100644 --- a/docs/gnulinux/grub_cbfs.md +++ b/docs/gnulinux/grub_cbfs.md @@ -120,6 +120,7 @@ Extract grubtest.cfg from the ROM image {#extract_testconfig} You can check the contents of the ROM image, inside CBFS: $ cd \.../libreboot\_util/cbfstool** $ ./cbfstool libreboot.rom + print** The files *grub.cfg* and *grubtest.cfg* should be present. grub.cfg is @@ -152,6 +153,7 @@ Testing [../install/\#flashrom](../install/#flashrom) for information on how to flash it. $ cd /libreboot\_util** \# **./flash update libreboot.rom\ + Ocassionally, coreboot changes the name of a given board. If flashrom complains about a board mismatch, but you are sure that you chose the correct ROM image, then run this alternative command: diff --git a/docs/gnulinux/grub_hardening.md b/docs/gnulinux/grub_hardening.md index 12485949..31e4ccc8 100644 --- a/docs/gnulinux/grub_hardening.md +++ b/docs/gnulinux/grub_hardening.md @@ -33,6 +33,7 @@ Helpful links: - [GRUB manual \#security](https://www.gnu.org/software/grub/manual/html_node/Security.html#Security) + - [GRUB info pages](http://git.savannah.gnu.org/cgit/grub.git/tree/docs/grub.texi) - [SATA connected storage considered dangerous until proven diff --git a/docs/grub/index.md b/docs/grub/index.md index f148cc0f..43b53b4e 100644 --- a/docs/grub/index.md +++ b/docs/grub/index.md @@ -43,6 +43,7 @@ This is a free font that is also contained in GNU+Linux distributions like Debian, Devuan or Parabola. $ cd libreboot\_src/grub + compile grub (the build scripts info on how to do this)\ come back out into libreboot\_src/resources/grub: @@ -71,6 +72,7 @@ Keymaps are stored in resources/utilities/grub-assemble/keymap/. Example (French Azerty): $ ckbcomp fr > frazerty + \ Go in grub directory:\ **cat frazerty | ./grub/grub-mklayout -o frazerty.gkb** diff --git a/docs/hardware/gm45_remove_me.md b/docs/hardware/gm45_remove_me.md index b697d244..062fe545 100644 --- a/docs/hardware/gm45_remove_me.md +++ b/docs/hardware/gm45_remove_me.md @@ -72,6 +72,7 @@ generate a descriptor+gbe image with your own MAC address inside (with the Gbe checksum updated to match). Run: $ ./ich9gen --macaddress XX:XX:XX:XX:XX:XX + (replace the XX chars with the hexadecimal chars in the MAC address that you want) @@ -166,6 +167,7 @@ you ran **./oldbuild module all** or **./oldbuild module ich9deblob** from the main directory (./), otherwise you can build it like so: $ ./oldbuild module ich9deblob + An executable file named **ich9deblob** will now appear under resources/utilities/ich9deblob/ diff --git a/docs/hardware/index.md b/docs/hardware/index.md index 4863332e..f8096678 100644 --- a/docs/hardware/index.md +++ b/docs/hardware/index.md @@ -388,6 +388,7 @@ for whatever reason, since they include a lot of useful information. Backups created using wget: $ wget -m -p -E -k -K -np http://macbook.donderklumpen.de/ + **\$ wget -m -p -E -k -K -np http://macbook.donderklumpen.de/coreboot/**\ Use **-e robots=off** if using this trick for other sites and the site diff --git a/docs/misc/index.md b/docs/misc/index.md index a3fdcd6f..216a8244 100644 --- a/docs/misc/index.md +++ b/docs/misc/index.md @@ -224,9 +224,11 @@ package i2c-tools. $ sudo modprobe i2c-dev $ sudo i2cdump -y 5 0x50 (you might have to change the value for + -y) $ sudo rmmod i2c-dev + You'll see the panel name in the output (from the EDID dump). If neither of these options work (or they are unavailable), physically -- cgit v1.2.3-70-g09d2 From 0474bc55f2d74aa34f4869546d1ad3a51d7a277a Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 13 May 2017 08:33:20 -0700 Subject: Cleanup more pseudo-code --- docs/gnulinux/encrypted_parabola.md | 45 ++++++++++++++++++++++++------------- docs/gnulinux/grub_cbfs.md | 9 +++++--- docs/hardware/gm45_remove_me.md | 45 ++++++++++++++++++++++++------------- docs/hardware/x200.md | 9 +++++--- docs/install/index.md | 9 +++++--- docs/install/r400_external.md | 32 +++++++++++++++++--------- docs/install/t400_external.md | 32 +++++++++++++++++--------- docs/install/t500_external.md | 32 +++++++++++++++++--------- docs/install/t60_unbrick.md | 9 +++++--- docs/install/x60_unbrick.md | 9 +++++--- docs/install/x60tablet_unbrick.md | 9 +++++--- 11 files changed, 162 insertions(+), 78 deletions(-) (limited to 'docs/hardware/gm45_remove_me.md') diff --git a/docs/gnulinux/encrypted_parabola.md b/docs/gnulinux/encrypted_parabola.md index e37e4f6b..479f804d 100644 --- a/docs/gnulinux/encrypted_parabola.md +++ b/docs/gnulinux/encrypted_parabola.md @@ -163,10 +163,13 @@ on Reading through, it seems like Serpent (encryption) and Whirlpool (hash) is the best option. -I am initializing LUKS with the following:\ -\# **cryptsetup -v --cipher serpent-xts-plain64 --key-size 512 --hash +I am initializing LUKS with the following: + + # cryptsetup -v --cipher serpent-xts-plain64 --key-size 512 --hash whirlpool --iter-time 500 --use-random --verify-passphrase luksFormat -/dev/sda1** Choose a **secure** passphrase here. Ideally lots of +/dev/sda1 + + Choose a **secure** passphrase here. Ideally lots of lowercase/uppercase numbers, letters, symbols etc all in a random pattern. The password length should be as long as you are able to handle without writing it down or storing it anywhere. @@ -307,9 +310,12 @@ following would have also made it work:\ I also like to install other packages (base-devel, compilers and so on) and wpa\_supplicant/dialog/iw/wpa\_actiond are needed for wireless after -the install:\ -\# **pacstrap /mnt base base-devel wpa\_supplicant dialog iw -wpa\_actiond** +the install: + + # pacstrap /mnt base base-devel wpa\_supplicant dialog iw +wpa\_actiond + + Configure the system -------------------- @@ -587,9 +593,12 @@ from the ROM image: $ ./cbfstool libreboot.rom remove -n grubtest.cfg -and insert the modified grubtest.cfg:\ -\$ **./cbfstool libreboot.rom add -n grubtest.cfg -f grubtest.cfg -t -raw**\ +and insert the modified grubtest.cfg: + + # ./cbfstool libreboot.rom add -n grubtest.cfg -f grubtest.cfg -t +raw + +\ Now refer to [../install/#flashrom](../install/#flashrom). Cd (up) to the libreboot\_util directory and update the flash chip contents: @@ -625,10 +634,13 @@ the main config still links (in the menu) to grubtest.cfg, so that you don't have to manually switch to it, in case you ever want to follow this guide again in the future (modifying the already modified config). Inside libreboot\_util/cbfstool/{armv7l i686 x86\_64}, we can do this -with the following command:\ -\$ **sed -e 's:(cbfsdisk)/grub.cfg:(cbfsdisk)/grubtest.cfg:g' -e +with the following command: + + # sed -e 's:(cbfsdisk)/grub.cfg:(cbfsdisk)/grubtest.cfg:g' -e 's:Switch to grub.cfg:Switch to grubtest.cfg:g' < grubtest.cfg > -grub.cfg**\ +grub.cfg + +\ Delete the grub.cfg that remained inside the ROM: $ ./cbfstool libreboot.rom remove -n grub.cfg @@ -666,9 +678,12 @@ will be asked to enter your passphrase a second time. A workaround is to put a keyfile inside initramfs, with instructions for the kernel to use it when booting. This is safe, because /boot/ is encrypted (otherwise, putting a keyfile inside initramfs would be a bad idea).\ -Boot up and login as root or your user. Then generate the key file:\ -\# **dd bs=512 count=4 if=/dev/urandom of=/etc/mykeyfile -iflag=fullblock**\ +Boot up and login as root or your user. Then generate the key file: + + # dd bs=512 count=4 if=/dev/urandom of=/etc/mykeyfile +iflag=fullblock + +\ Insert it into the luks volume: # cryptsetup luksAddKey /dev/sdX /etc/mykeyfile diff --git a/docs/gnulinux/grub_cbfs.md b/docs/gnulinux/grub_cbfs.md index 624dec62..ea7f7f51 100644 --- a/docs/gnulinux/grub_cbfs.md +++ b/docs/gnulinux/grub_cbfs.md @@ -180,10 +180,13 @@ difference: the menuentry 'Switch to grub.cfg' will be changed to grubtest.cfg. This is so that the main config still links (in the menu) to grubtest.cfg, so that you don't have to manually switch to it, in case you ever want to follow this guide again in the future (modifying -the already modified config). From /libreboot\_util/cbfstool, do:\ -\$ **sed -e 's:(cbfsdisk)/grub.cfg:(cbfsdisk)/grubtest.cfg:g' -e +the already modified config). From /libreboot\_util/cbfstool, do: + + # sed -e 's:(cbfsdisk)/grub.cfg:(cbfsdisk)/grubtest.cfg:g' -e 's:Switch to grub.cfg:Switch to grubtest.cfg:g' < grubtest.cfg > -grub.cfg**\ +grub.cfg + +\ Delete the grub.cfg that remained inside the ROM: diff --git a/docs/hardware/gm45_remove_me.md b/docs/hardware/gm45_remove_me.md index 062fe545..31882fb7 100644 --- a/docs/hardware/gm45_remove_me.md +++ b/docs/hardware/gm45_remove_me.md @@ -88,15 +88,24 @@ Two new files will be created: Assuming that your libreboot image is named **libreboot.rom**, copy the file to where **libreboot.rom** is located and then insert the descriptor+gbe file into the ROM image.\ -For 16MiB flash chips:\ -\$ **dd if=ich9fdgbe\_16m.bin of=libreboot.rom bs=1 count=12k -conv=notrunc**\ -For 8MiB flash chips:\ -\$ **dd if=ich9fdgbe\_8m.bin of=libreboot.rom bs=1 count=12k -conv=notrunc**\ -For 4MiB flash chips:\ -\$ **dd if=ich9fdgbe\_4m.bin of=libreboot.rom bs=1 count=12k -conv=notrunc**\ +For 16MiB flash chips: + + # dd if=ich9fdgbe\_16m.bin of=libreboot.rom bs=1 count=12k +conv=notrunc + +\ +For 8MiB flash chips: + + # dd if=ich9fdgbe\_8m.bin of=libreboot.rom bs=1 count=12k +conv=notrunc + +\ +For 4MiB flash chips: + + # dd if=ich9fdgbe\_4m.bin of=libreboot.rom bs=1 count=12k +conv=notrunc + +\ Your libreboot.rom image is now ready to be flashed on the system. Refer back to [../install/\#flashrom](../install/#flashrom) for how to flash @@ -196,9 +205,12 @@ Intel. Only the Intel NICs need a GbE region in the flash chip. Assuming that your libreboot image is named **libreboot.rom**, copy the **deblobbed\_descriptor.bin** file to where **libreboot.rom** is located -and then run:\ -\$ **dd if=deblobbed\_descriptor.bin of=libreboot.rom bs=1 count=12k -conv=notrunc** +and then run: + + # dd if=deblobbed\_descriptor.bin of=libreboot.rom bs=1 count=12k +conv=notrunc + + Alternatively, if you got a the **deblobbed\_4kdescriptor.bin** file (no GbE defined), do this: \$ **dd if=deblobbed\_4kdescriptor.bin @@ -239,9 +251,12 @@ Simply run (with factory.rom in the same directory): It will generate a 4KiB descriptor file (only the descriptor, no GbE). Insert that into a factory.rom image (NOTE: do this on a copy of it. -Keep the original factory.rom stored safely somewhere):\ -\$ **dd if=demefactory\_4kdescriptor.bin of=factory\_nome.rom bs=1 -count=4k conv=notrunc** +Keep the original factory.rom stored safely somewhere): + + # dd if=demefactory\_4kdescriptor.bin of=factory\_nome.rom bs=1 +count=4k conv=notrunc + + TODO: test this.\ TODO: lenovobios (GM45 thinkpads) still write-protects parts of the diff --git a/docs/hardware/x200.md b/docs/hardware/x200.md index c6f9230a..61d80660 100644 --- a/docs/hardware/x200.md +++ b/docs/hardware/x200.md @@ -228,9 +228,12 @@ 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: CPU0 -sig=0x\\(\[\^,\]\*\\),.\*\$/\\1/p'** +X200 laptops. You can get the CPUID by running: + + # dmesg | sed -n 's/\^.\* microcode: CPU0 +sig=0x\\(\[\^,\]\*\\),.\*\$/\\1/p' + + 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 diff --git a/docs/install/index.md b/docs/install/index.md index 4ae683e6..2a0b1ef6 100644 --- a/docs/install/index.md +++ b/docs/install/index.md @@ -329,9 +329,12 @@ When you have booted up again, you must also do this: $ sudo ./flash i945lenovo\_secondflash [yourrom.rom](#rom) -If flashing fails at this stage, try the following:\ -\$ **sudo ./flashrom/i686/flashrom -p -internal:laptop=force\_I\_want\_a\_brick -w [yourrom.rom](#rom)** +If flashing fails at this stage, try the following: + + # sudo ./flashrom/i686/flashrom -p +internal:laptop=force\_I\_want\_a\_brick -w [yourrom.rom](#rom) + + You should see within the output the following:\ **"Updated BUC.TS=0 - 128kb address range 0xFFFE0000-0xFFFFFFFF is diff --git a/docs/install/r400_external.md b/docs/install/r400_external.md index 7d5721aa..45bc329c 100644 --- a/docs/install/r400_external.md +++ b/docs/install/r400_external.md @@ -227,13 +227,22 @@ In this case, the output was: Please specify which chip definition to use with the -c option. How to backup factory.rom (change the -c option as neeed, for your flash -chip):\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r -factory.rom**\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r -factory1.rom**\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r -factory2.rom**\ +chip): + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r +factory.rom + + + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r +factory1.rom + + + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r +factory2.rom + +\ Note: the **-c** option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in *flashchips.c* have been removed.\ @@ -253,9 +262,12 @@ flashing it. Although there is a default MAC address inside the ROM image, this is not what you want. **Make sure to always change the MAC address to one that is correct for your system.** -Now flash it:\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w -path/to/libreboot/rom/image.rom -V** +Now flash it: + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w +path/to/libreboot/rom/image.rom -V + + ![](images/x200/disassembly/0015.jpg) diff --git a/docs/install/t400_external.md b/docs/install/t400_external.md index b3773c34..f5ea561b 100644 --- a/docs/install/t400_external.md +++ b/docs/install/t400_external.md @@ -225,13 +225,22 @@ In this case, the output was: Please specify which chip definition to use with the -c option. How to backup factory.rom (change the -c option as neeed, for your flash -chip):\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r -factory.rom**\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r -factory1.rom**\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r -factory2.rom**\ +chip): + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r +factory.rom + + + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r +factory1.rom + + + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r +factory2.rom + +\ Note: the **-c** option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in *flashchips.c* have been removed.\ @@ -251,9 +260,12 @@ flashing it. Although there is a default MAC address inside the ROM image, this is not what you want. **Make sure to always change the MAC address to one that is correct for your system.** -Now flash it:\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w -path/to/libreboot/rom/image.rom -V** +Now flash it: + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w +path/to/libreboot/rom/image.rom -V + + ![](images/x200/disassembly/0015.jpg) diff --git a/docs/install/t500_external.md b/docs/install/t500_external.md index 567f9159..87697a71 100644 --- a/docs/install/t500_external.md +++ b/docs/install/t500_external.md @@ -242,13 +242,22 @@ In this case, the output was: Please specify which chip definition to use with the -c option. How to backup factory.rom (change the -c option as neeed, for your flash -chip):\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r -factory.rom**\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r -factory1.rom**\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r -factory2.rom**\ +chip): + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r +factory.rom + + + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r +factory1.rom + + + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r +factory2.rom + +\ Note: the **-c** option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in *flashchips.c* have been removed.\ @@ -268,9 +277,12 @@ flashing it. Although there is a default MAC address inside the ROM image, this is not what you want. **Make sure to always change the MAC address to one that is correct for your system.** -Now flash it:\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w -path/to/libreboot/rom/image.rom -V** +Now flash it: + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w +path/to/libreboot/rom/image.rom -V + + ![](images/x200/disassembly/0015.jpg) diff --git a/docs/install/t60_unbrick.md b/docs/install/t60_unbrick.md index 82600eee..05141904 100644 --- a/docs/install/t60_unbrick.md +++ b/docs/install/t60_unbrick.md @@ -141,9 +141,12 @@ Flashrom binaries for ARM (tested on a BBB) are distributed in libreboot\_util. Alternatively, libreboot also distributes flashrom source code which can be built. -SSH'd into the BBB:\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w -yourrom.rom** +SSH'd into the BBB: + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w +yourrom.rom + + It should be **Verifying flash\... VERIFIED** at the end. If flashrom complains about multiple flash chip definitions detected, then choose diff --git a/docs/install/x60_unbrick.md b/docs/install/x60_unbrick.md index 64488443..fdedcb11 100644 --- a/docs/install/x60_unbrick.md +++ b/docs/install/x60_unbrick.md @@ -126,9 +126,12 @@ Flashrom binaries for ARM (tested on a BBB) are distributed in libreboot\_util. Alternatively, libreboot also distributes flashrom source code which can be built. -SSH'd into the BBB:\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w -yourrom.rom** +SSH'd into the BBB: + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w +yourrom.rom + + It should be **Verifying flash\... VERIFIED** at the end. If flashrom complains about multiple flash chip definitions detected, then choose diff --git a/docs/install/x60tablet_unbrick.md b/docs/install/x60tablet_unbrick.md index 5f18db8b..f05a7142 100644 --- a/docs/install/x60tablet_unbrick.md +++ b/docs/install/x60tablet_unbrick.md @@ -105,9 +105,12 @@ Flashrom binaries for ARM (tested on a BBB) are distributed in libreboot\_util. Alternatively, libreboot also distributes flashrom source code which can be built. -SSH'd into the BBB:\ -\# **./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w -yourrom.rom** +SSH'd into the BBB: + + # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w +yourrom.rom + + It should be **Verifying flash\... VERIFIED** at the end. If flashrom complains about multiple flash chip definitions detected, then choose -- cgit v1.2.3-70-g09d2 From a68fcbe31a9b7c75503e8e18ee59b5ed4ab8ac4c Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 13 May 2017 08:34:36 -0700 Subject: Remove \ and squeaze --- docs/bsd/freebsd.md | 2 -- docs/bsd/index.md | 2 -- docs/bsd/netbsd.md | 2 -- docs/bsd/openbsd.md | 2 -- docs/depthcharge/index.md | 2 -- docs/fdl-1.3.md | 1 - docs/git/index.md | 2 -- docs/gnulinux/configuring_parabola.md | 4 +--- docs/gnulinux/encrypted_debian.md | 2 -- docs/gnulinux/encrypted_parabola.md | 10 +--------- docs/gnulinux/grub_boot_installer.md | 2 -- docs/gnulinux/grub_cbfs.md | 4 ---- docs/gnulinux/grub_hardening.md | 2 -- docs/gnulinux/index.md | 2 -- docs/grub/index.md | 3 --- docs/hardware/c201.md | 2 -- docs/hardware/d510mo.md | 2 -- docs/hardware/d945gclf.md | 2 -- docs/hardware/ga-g41m-es2l.md | 2 -- docs/hardware/gm45_remove_me.md | 10 ---------- docs/hardware/imac52.md | 2 -- docs/hardware/index.md | 4 +--- docs/hardware/kcma-d8.md | 2 -- docs/hardware/kfsn4-dre.md | 2 -- docs/hardware/kgpe-d16.md | 2 -- docs/hardware/r400.md | 2 -- docs/hardware/t400.md | 2 -- docs/hardware/t500.md | 2 -- docs/hardware/x200.md | 4 ---- docs/index.md | 2 -- docs/install/bbb_setup.md | 2 -- docs/install/c201.md | 2 -- docs/install/d510mo.md | 2 -- docs/install/d945gclf.md | 2 -- docs/install/ga-g41m-es2l.md | 2 -- docs/install/index.md | 4 ---- docs/install/kcma-d8.md | 2 -- docs/install/kgpe-d16.md | 2 -- docs/install/r400_external.md | 9 --------- docs/install/t400_external.md | 9 --------- docs/install/t500_external.md | 9 --------- docs/install/t60_unbrick.md | 8 ++------ docs/install/x200_external.md | 3 --- docs/install/x60_unbrick.md | 8 ++------ docs/install/x60tablet_unbrick.md | 8 ++------ docs/misc/bbb_ehci.md | 2 -- docs/misc/index.md | 2 -- docs/release.md | 7 ------- 48 files changed, 9 insertions(+), 158 deletions(-) (limited to 'docs/hardware/gm45_remove_me.md') diff --git a/docs/bsd/freebsd.md b/docs/bsd/freebsd.md index b524fb8d..9557ae45 100644 --- a/docs/bsd/freebsd.md +++ b/docs/bsd/freebsd.md @@ -147,8 +147,6 @@ numbers may differ. Use TAB completion. Copyright © 2016 Leah Rowe \ Copyright © 2016 Scott Bonds \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/bsd/index.md b/docs/bsd/index.md index 8237f884..6fc5d7e6 100644 --- a/docs/bsd/index.md +++ b/docs/bsd/index.md @@ -16,8 +16,6 @@ instructions have yet to be written.** Copyright © 2016 Scott Bonds \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/bsd/netbsd.md b/docs/bsd/netbsd.md index 3359690e..e80f8ffb 100644 --- a/docs/bsd/netbsd.md +++ b/docs/bsd/netbsd.md @@ -164,8 +164,6 @@ numbers may differ. Use TAB completion. Copyright © 2016 Leah Rowe \ Copyright © 2016 Scott Bonds \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/bsd/openbsd.md b/docs/bsd/openbsd.md index 4a195adb..ec2cf8b7 100644 --- a/docs/bsd/openbsd.md +++ b/docs/bsd/openbsd.md @@ -185,8 +185,6 @@ numbers may differ. Use TAB completion. Copyright © 2016 Scott Bonds \ Copyright © 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/depthcharge/index.md b/docs/depthcharge/index.md index 1c361a7d..e75d3fa6 100644 --- a/docs/depthcharge/index.md +++ b/docs/depthcharge/index.md @@ -195,8 +195,6 @@ The following parameters can be configured: Copyright © 2015 Paul Kocialkowski \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/fdl-1.3.md b/docs/fdl-1.3.md index 13e2839b..0f883f0c 100644 --- a/docs/fdl-1.3.md +++ b/docs/fdl-1.3.md @@ -426,7 +426,6 @@ license notices just after the title page: Copyright (C) YEAR YOUR NAME. - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; diff --git a/docs/git/index.md b/docs/git/index.md index eb8a0435..3e19a1c6 100644 --- a/docs/git/index.md +++ b/docs/git/index.md @@ -328,8 +328,6 @@ under **release/oldbuildsystem/rom/**. Copyright © 2014, 2015, 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/gnulinux/configuring_parabola.md b/docs/gnulinux/configuring_parabola.md index a598f6f5..e70204e1 100644 --- a/docs/gnulinux/configuring_parabola.md +++ b/docs/gnulinux/configuring_parabola.md @@ -554,7 +554,7 @@ the file.\ \# Based on advice from the LXDE wiki export LC\_ALL=en\_GB.UTF-8\ export LANGUAGE=en\_GB.UTF-8\ export LANG=en\_GB.UTF-8\ -\ + \# Start lxde desktop\ exec startlxde\ * Now make sure that it is executable: @@ -649,8 +649,6 @@ theme, in *lxappearance*. Copyright © 2014, 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/gnulinux/encrypted_debian.md b/docs/gnulinux/encrypted_debian.md index 12070be9..29e34e43 100644 --- a/docs/gnulinux/encrypted_debian.md +++ b/docs/gnulinux/encrypted_debian.md @@ -303,8 +303,6 @@ problems. Removing that worked around the issue. Copyright © 2014, 2015, 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/gnulinux/encrypted_parabola.md b/docs/gnulinux/encrypted_parabola.md index 479f804d..5f0b796b 100644 --- a/docs/gnulinux/encrypted_parabola.md +++ b/docs/gnulinux/encrypted_parabola.md @@ -315,8 +315,6 @@ the install: # pacstrap /mnt base base-devel wpa\_supplicant dialog iw wpa\_actiond - - Configure the system -------------------- @@ -598,8 +596,6 @@ and insert the modified grubtest.cfg: # ./cbfstool libreboot.rom add -n grubtest.cfg -f grubtest.cfg -t raw -\ - Now refer to [../install/#flashrom](../install/#flashrom). Cd (up) to the libreboot\_util directory and update the flash chip contents: @@ -640,7 +636,6 @@ with the following command: 's:Switch to grub.cfg:Switch to grubtest.cfg:g' < grubtest.cfg > grub.cfg -\ Delete the grub.cfg that remained inside the ROM: $ ./cbfstool libreboot.rom remove -n grub.cfg @@ -683,7 +678,6 @@ Boot up and login as root or your user. Then generate the key file: # dd bs=512 count=4 if=/dev/urandom of=/etc/mykeyfile iflag=fullblock -\ Insert it into the luks volume: # cryptsetup luksAddKey /dev/sdX /etc/mykeyfile @@ -700,7 +694,7 @@ Add the following to your grub.cfg - you are now able to do that, see above! -, or add it in the kernel command line for GRUB: # cryptkey=rootfs:/etc/mykeyfile -\ + You can also place this inside the grub.cfg that exists in CBFS: [grub\_cbfs.md](grub_cbfs.md). @@ -800,8 +794,6 @@ problems. Removing that worked around the issue. Copyright © 2014, 2015, 2016 Leah Rowe \ Copyright © 2015 Jeroen Quint \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/gnulinux/grub_boot_installer.md b/docs/gnulinux/grub_boot_installer.md index 9d1147b3..b89c5b5d 100644 --- a/docs/gnulinux/grub_boot_installer.md +++ b/docs/gnulinux/grub_boot_installer.md @@ -206,8 +206,6 @@ debian-installer (text mode) net install method. Copyright © 2014, 2015, 2016 Leah Rowe \ Copyright © 2016 Scott Bonds \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/gnulinux/grub_cbfs.md b/docs/gnulinux/grub_cbfs.md index ea7f7f51..8d10c478 100644 --- a/docs/gnulinux/grub_cbfs.md +++ b/docs/gnulinux/grub_cbfs.md @@ -186,8 +186,6 @@ the already modified config). From /libreboot\_util/cbfstool, do: 's:Switch to grub.cfg:Switch to grubtest.cfg:g' < grubtest.cfg > grub.cfg -\ - Delete the grub.cfg that remained inside the ROM: $ ./cbfstool libreboot.rom remove -n grub.cfg @@ -204,8 +202,6 @@ boot up with your new configuration.** Copyright © 2014, 2015 Leah Rowe \ Copyright © 2015 Jeroen Quint \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/gnulinux/grub_hardening.md b/docs/gnulinux/grub_hardening.md index 31e4ccc8..780d2c03 100644 --- a/docs/gnulinux/grub_hardening.md +++ b/docs/gnulinux/grub_hardening.md @@ -181,8 +181,6 @@ What remains now is to include the modifications into the image (rom): Copyright © 2017 Fedja Beader \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/gnulinux/index.md b/docs/gnulinux/index.md index 3814b75f..4903d1c6 100644 --- a/docs/gnulinux/index.md +++ b/docs/gnulinux/index.md @@ -24,8 +24,6 @@ instructions have yet to be written.** Copyright © 2014, 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/grub/index.md b/docs/grub/index.md index 43b53b4e..c68ff69c 100644 --- a/docs/grub/index.md +++ b/docs/grub/index.md @@ -73,7 +73,6 @@ Example (French Azerty): $ ckbcomp fr > frazerty -\ Go in grub directory:\ **cat frazerty | ./grub/grub-mklayout -o frazerty.gkb** @@ -100,8 +99,6 @@ file was created Copyright © 2014 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/hardware/c201.md b/docs/hardware/c201.md index 59f3228e..1dd142bf 100644 --- a/docs/hardware/c201.md +++ b/docs/hardware/c201.md @@ -168,8 +168,6 @@ is such a stupidly simple idea, which all designs should implement. Copyright © 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/hardware/d510mo.md b/docs/hardware/d510mo.md index 9d4350b1..b2e85b0a 100644 --- a/docs/hardware/d510mo.md +++ b/docs/hardware/d510mo.md @@ -15,8 +15,6 @@ Flashing instructions can be found at Copyright © 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/hardware/d945gclf.md b/docs/hardware/d945gclf.md index aeb85706..c3f4754a 100644 --- a/docs/hardware/d945gclf.md +++ b/docs/hardware/d945gclf.md @@ -76,8 +76,6 @@ fan connector back, and you are done. Copyright © 2016 Arthur Heymans \ Copyright © 2016 Vitaly Castaño Solana \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/hardware/ga-g41m-es2l.md b/docs/hardware/ga-g41m-es2l.md index 143c2f85..fbcf2132 100644 --- a/docs/hardware/ga-g41m-es2l.md +++ b/docs/hardware/ga-g41m-es2l.md @@ -19,8 +19,6 @@ Flashing instructions can be found at Copyright © 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/hardware/gm45_remove_me.md b/docs/hardware/gm45_remove_me.md index 31882fb7..e083990a 100644 --- a/docs/hardware/gm45_remove_me.md +++ b/docs/hardware/gm45_remove_me.md @@ -93,20 +93,16 @@ For 16MiB flash chips: # dd if=ich9fdgbe\_16m.bin of=libreboot.rom bs=1 count=12k conv=notrunc -\ For 8MiB flash chips: # dd if=ich9fdgbe\_8m.bin of=libreboot.rom bs=1 count=12k conv=notrunc -\ For 4MiB flash chips: # dd if=ich9fdgbe\_4m.bin of=libreboot.rom bs=1 count=12k conv=notrunc -\ - Your libreboot.rom image is now ready to be flashed on the system. Refer back to [../install/\#flashrom](../install/#flashrom) for how to flash it. @@ -210,8 +206,6 @@ and then run: # dd if=deblobbed\_descriptor.bin of=libreboot.rom bs=1 count=12k conv=notrunc - - Alternatively, if you got a the **deblobbed\_4kdescriptor.bin** file (no GbE defined), do this: \$ **dd if=deblobbed\_4kdescriptor.bin of=libreboot.rom bs=1 count=4k conv=notrunc** @@ -256,8 +250,6 @@ Keep the original factory.rom stored safely somewhere): # dd if=demefactory\_4kdescriptor.bin of=factory\_nome.rom bs=1 count=4k conv=notrunc - - TODO: test this.\ TODO: lenovobios (GM45 thinkpads) still write-protects parts of the flash. Modify the assembly code inside. Note: the factory.rom (BIOS @@ -537,8 +529,6 @@ It has only a 448 byte fragment different from 0x00 or 0xFF. Copyright © 2014, 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/hardware/imac52.md b/docs/hardware/imac52.md index 54efd3e6..99db1977 100644 --- a/docs/hardware/imac52.md +++ b/docs/hardware/imac52.md @@ -6,8 +6,6 @@ Information to be written soon, but this board is merged in libreboot. Copyright © 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/hardware/index.md b/docs/hardware/index.md index f8096678..638767f5 100644 --- a/docs/hardware/index.md +++ b/docs/hardware/index.md @@ -310,7 +310,7 @@ cannot be used with libreboot under any circumstances. The following T60 motherboard (see area highlighted in white) shows an empty space where the ATI GPU would be (this particular motherboard has an Intel GPU):\ -\ + ![](../images/t60_dev/t60_unbrick.jpg) The reason that the ATI GPU on T60 is unsupported is due to the VBIOS @@ -531,8 +531,6 @@ libreboot git repository. Copyright © 2014, 2015, 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/hardware/kcma-d8.md b/docs/hardware/kcma-d8.md index fa5a2615..9d5067b1 100644 --- a/docs/hardware/kcma-d8.md +++ b/docs/hardware/kcma-d8.md @@ -97,8 +97,6 @@ Check the ASUS website. Copyright © 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/hardware/kfsn4-dre.md b/docs/hardware/kfsn4-dre.md index da3a75bb..4efc4648 100644 --- a/docs/hardware/kfsn4-dre.md +++ b/docs/hardware/kfsn4-dre.md @@ -70,8 +70,6 @@ Other information Copyright © 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/hardware/kgpe-d16.md b/docs/hardware/kgpe-d16.md index 87868249..19d68416 100644 --- a/docs/hardware/kgpe-d16.md +++ b/docs/hardware/kgpe-d16.md @@ -211,8 +211,6 @@ The information here is adapted, from the ASUS website. Copyright © 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/hardware/r400.md b/docs/hardware/r400.md index f8c1f213..66854b5c 100644 --- a/docs/hardware/r400.md +++ b/docs/hardware/r400.md @@ -63,8 +63,6 @@ TODO: put hardware register logs here like on the [X200](x200.md) and Copyright © 2014, 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/hardware/t400.md b/docs/hardware/t400.md index b30c436b..bec2d895 100644 --- a/docs/hardware/t400.md +++ b/docs/hardware/t400.md @@ -75,8 +75,6 @@ outputs from the T400: Copyright © 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/hardware/t500.md b/docs/hardware/t500.md index 7a0ac85c..862484dd 100644 --- a/docs/hardware/t500.md +++ b/docs/hardware/t500.md @@ -97,8 +97,6 @@ outputs from the T500: Copyright © 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/hardware/x200.md b/docs/hardware/x200.md index 61d80660..492083c0 100644 --- a/docs/hardware/x200.md +++ b/docs/hardware/x200.md @@ -233,8 +233,6 @@ X200 laptops. You can get the CPUID by running: # dmesg | sed -n 's/\^.\* microcode: CPU0 sig=0x\\(\[\^,\]\*\\),.\*\$/\\1/p' - - 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). @@ -269,8 +267,6 @@ Unsorted notes {#unsorted} Copyright © 2014, 2015 Leah Rowe \ Copyright © 2015 Patrick "P. J." McDermott \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/index.md b/docs/index.md index c9ecbc33..70d3e5f7 100644 --- a/docs/index.md +++ b/docs/index.md @@ -180,8 +180,6 @@ libreboot. Copyright © 2014, 2015, 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/bbb_setup.md b/docs/install/bbb_setup.md index 1182bb16..6f2bc07d 100644 --- a/docs/install/bbb_setup.md +++ b/docs/install/bbb_setup.md @@ -331,8 +331,6 @@ Copyright © 2014, 2015 Leah Rowe \ Copyright © 2015 Patrick "P. J." McDermott \ Copyright © 2015 Albin Söderqvist\ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/c201.md b/docs/install/c201.md index 48b11427..3e924614 100644 --- a/docs/install/c201.md +++ b/docs/install/c201.md @@ -200,8 +200,6 @@ See . Copyright © 2015 Paul Kocialkowski \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/d510mo.md b/docs/install/d510mo.md index 818b5464..3ef79462 100644 --- a/docs/install/d510mo.md +++ b/docs/install/d510mo.md @@ -22,8 +22,6 @@ This is an image of the flash chip, for reference:\ Copyright © 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/d945gclf.md b/docs/install/d945gclf.md index 4a87b1c3..ddb52a64 100644 --- a/docs/install/d945gclf.md +++ b/docs/install/d945gclf.md @@ -19,8 +19,6 @@ Here is an image of the flash chip:\ Copyright © 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/ga-g41m-es2l.md b/docs/install/ga-g41m-es2l.md index a11364ed..d2d15b73 100644 --- a/docs/install/ga-g41m-es2l.md +++ b/docs/install/ga-g41m-es2l.md @@ -46,8 +46,6 @@ operating system. Copyright © 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/index.md b/docs/install/index.md index 2a0b1ef6..7e2161b7 100644 --- a/docs/install/index.md +++ b/docs/install/index.md @@ -334,8 +334,6 @@ If flashing fails at this stage, try the following: # sudo ./flashrom/i686/flashrom -p internal:laptop=force\_I\_want\_a\_brick -w [yourrom.rom](#rom) - - You should see within the output the following:\ **"Updated BUC.TS=0 - 128kb address range 0xFFFE0000-0xFFFFFFFF is untranslated"** @@ -377,8 +375,6 @@ Shut down. Copyright © 2014, 2015, 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/kcma-d8.md b/docs/install/kcma-d8.md index 7dff9a66..c4f83eea 100644 --- a/docs/install/kcma-d8.md +++ b/docs/install/kcma-d8.md @@ -31,8 +31,6 @@ extractor tool. Copyright © 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/kgpe-d16.md b/docs/install/kgpe-d16.md index a84716b8..8e0ad8fd 100644 --- a/docs/install/kgpe-d16.md +++ b/docs/install/kgpe-d16.md @@ -31,8 +31,6 @@ extractor tool. Copyright © 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/r400_external.md b/docs/install/r400_external.md index 45bc329c..b4429e56 100644 --- a/docs/install/r400_external.md +++ b/docs/install/r400_external.md @@ -232,17 +232,12 @@ chip): # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r factory.rom - - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r factory1.rom - - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r factory2.rom -\ Note: the **-c** option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in *flashchips.c* have been removed.\ @@ -267,8 +262,6 @@ Now flash it: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w path/to/libreboot/rom/image.rom -V - - ![](images/x200/disassembly/0015.jpg) You might see errors, but if it says **Verifying flash\... VERIFIED** at @@ -364,8 +357,6 @@ Now [install GNU+Linux](../gnulinux/). Copyright © 2014, 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/t400_external.md b/docs/install/t400_external.md index f5ea561b..8dc2204a 100644 --- a/docs/install/t400_external.md +++ b/docs/install/t400_external.md @@ -230,17 +230,12 @@ chip): # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r factory.rom - - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r factory1.rom - - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r factory2.rom -\ Note: the **-c** option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in *flashchips.c* have been removed.\ @@ -265,8 +260,6 @@ Now flash it: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w path/to/libreboot/rom/image.rom -V - - ![](images/x200/disassembly/0015.jpg) You might see errors, but if it says **Verifying flash\... VERIFIED** at @@ -362,8 +355,6 @@ Now [install GNU+Linux](../gnulinux/). Copyright © 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/t500_external.md b/docs/install/t500_external.md index 87697a71..56021fe0 100644 --- a/docs/install/t500_external.md +++ b/docs/install/t500_external.md @@ -247,17 +247,12 @@ chip): # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r factory.rom - - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r factory1.rom - - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r factory2.rom -\ Note: the **-c** option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in *flashchips.c* have been removed.\ @@ -282,8 +277,6 @@ Now flash it: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w path/to/libreboot/rom/image.rom -V - - ![](images/x200/disassembly/0015.jpg) You might see errors, but if it says **Verifying flash\... VERIFIED** at @@ -379,8 +372,6 @@ Now [install GNU+Linux](../gnulinux/). Copyright © 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/t60_unbrick.md b/docs/install/t60_unbrick.md index 05141904..d2d59f42 100644 --- a/docs/install/t60_unbrick.md +++ b/docs/install/t60_unbrick.md @@ -12,12 +12,12 @@ Brick type 1: bucts not reset. {#bucts_brick} You still have Lenovo BIOS, or you had libreboot running and you flashed another ROM; and you had bucts 1 set and the ROM wasn't dd'd.\* or if Lenovo BIOS was present and libreboot wasn't flashed.\ -\ + In this case, unbricking is easy: reset BUC.TS to 0 by removing that yellow cmos coin (it's a battery) and putting it back after a minute or two:\ ![](../images/t60_dev/0006.JPG)\ -\ + \*Those dd commands should be applied to all newly compiled T60 ROM images (the ROM images in libreboot binary archives already have this applied!):\ @@ -146,8 +146,6 @@ SSH'd into the BBB: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom - - It should be **Verifying flash\... VERIFIED** at the end. If flashrom complains about multiple flash chip definitions detected, then choose one of them following the instructions in the output. @@ -201,8 +199,6 @@ replacing cpu paste/heatsink:\ Copyright © 2014, 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/x200_external.md b/docs/install/x200_external.md index 3c1d8cfc..2cce70ba 100644 --- a/docs/install/x200_external.md +++ b/docs/install/x200_external.md @@ -64,7 +64,6 @@ header), for SOIC-16 (clip: Pomona 5252): This is how you will connect. Numbers refer to pin numbers on the BBB, on the plugs near the DC jack. Here is a photo of the SOIC-16 flash chip. Pins are labelled: - The following shows how to connect the clip to the BBB (on the P9 header), for SOIC-8 (clip: Pomona 5250): @@ -310,8 +309,6 @@ investigating this: Copyright © 2014, 2015 Leah Rowe - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/x60_unbrick.md b/docs/install/x60_unbrick.md index fdedcb11..24b4cb63 100644 --- a/docs/install/x60_unbrick.md +++ b/docs/install/x60_unbrick.md @@ -12,12 +12,12 @@ Brick type 1: bucts not reset. {#bucts_brick} You still have Lenovo BIOS, or you had libreboot running and you flashed another ROM; and you had bucts 1 set and the ROM wasn't dd'd.\* or if Lenovo BIOS was present and libreboot wasn't flashed.\ -\ + In this case, unbricking is easy: reset BUC.TS to 0 by removing that yellow cmos coin (it's a battery) and putting it back after a minute or two:\ ![](../images/x60_unbrick/0004.jpg)\ -\ + \*Those dd commands should be applied to all newly compiled X60 ROM images (the ROM images in libreboot binary archives already have this applied!):\ @@ -131,8 +131,6 @@ SSH'd into the BBB: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom - - It should be **Verifying flash\... VERIFIED** at the end. If flashrom complains about multiple flash chip definitions detected, then choose one of them following the instructions in the output. @@ -213,8 +211,6 @@ Operating system:\ Copyright © 2014, 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/install/x60tablet_unbrick.md b/docs/install/x60tablet_unbrick.md index f05a7142..d02a8ae6 100644 --- a/docs/install/x60tablet_unbrick.md +++ b/docs/install/x60tablet_unbrick.md @@ -12,12 +12,12 @@ Brick type 1: bucts not reset. {#bucts_brick} You still have Lenovo BIOS, or you had libreboot running and you flashed another ROM; and you had bucts 1 set and the ROM wasn't dd'd.\* or if Lenovo BIOS was present and libreboot wasn't flashed.\ -\ + In this case, unbricking is easy: reset BUC.TS to 0 by removing that yellow cmos coin (it's a battery) and putting it back after a minute or two:\ ![](../images/x60t_unbrick/0008.JPG)\ -\ + \*Those dd commands should be applied to all newly compiled X60 ROM images (the ROM images in libreboot binary archives already have this applied!):\ @@ -110,8 +110,6 @@ SSH'd into the BBB: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom - - It should be **Verifying flash\... VERIFIED** at the end. If flashrom complains about multiple flash chip definitions detected, then choose one of them following the instructions in the output. @@ -120,8 +118,6 @@ Reverse the steps to re-assemble your system. Copyright © 2014, 2015 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/misc/bbb_ehci.md b/docs/misc/bbb_ehci.md index f1240d24..6af3c2a4 100644 --- a/docs/misc/bbb_ehci.md +++ b/docs/misc/bbb_ehci.md @@ -353,8 +353,6 @@ Interface](http://cs.usfca.edu/~cruse/cs698s10/) Copyright © 2015 Alex David \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/misc/index.md b/docs/misc/index.md index 216a8244..79b8d367 100644 --- a/docs/misc/index.md +++ b/docs/misc/index.md @@ -269,8 +269,6 @@ Put this script in /etc/init.d/ on debian-based systems. Copyright © 2014, 2015, 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation diff --git a/docs/release.md b/docs/release.md index 7c73a4d8..56b2548f 100644 --- a/docs/release.md +++ b/docs/release.md @@ -425,8 +425,6 @@ Changes for this release, relative to r20150208 (earliest changes last, recent c - **New board:** ThinkPad R400 support added to libreboot. - bbb\_setup.html: tell user to use libreboot's own flashrom - - Release 20150124, 20150126 and 20150208 {#release20150124} ======================================= @@ -638,8 +636,6 @@ Changes for this release (latest changes first, earliest changes last) html errors - Documentation (macbook21 related): clean up - - Release 20141015 {#release20141015} ================ @@ -1482,11 +1478,8 @@ Development notes - initial release - source code deblobbed - Copyright © 2014, 2015, 2016 Leah Rowe \ - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License Version 1.3 or any later version published by the Free Software Foundation -- cgit v1.2.3-70-g09d2 From 4023e32d806365234d0d931be8ebf15a7b728e4b Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 13 May 2017 08:36:17 -0700 Subject: Pad code bottoms --- docs/gnulinux/configuring_parabola.md | 18 ++++++++++++++++++ docs/gnulinux/encrypted_parabola.md | 27 +++++++++++++++++++++++++++ docs/gnulinux/grub_cbfs.md | 3 +++ docs/hardware/gm45_remove_me.md | 5 +++++ docs/hardware/x200.md | 1 + docs/install/bbb_setup.md | 5 +++++ docs/install/c201.md | 4 ++++ docs/install/index.md | 1 + docs/install/r400_external.md | 6 ++++++ docs/install/t400_external.md | 6 ++++++ docs/install/t500_external.md | 6 ++++++ docs/install/t60_unbrick.md | 1 + docs/install/x60_unbrick.md | 1 + docs/install/x60tablet_unbrick.md | 1 + 14 files changed, 85 insertions(+) (limited to 'docs/hardware/gm45_remove_me.md') diff --git a/docs/gnulinux/configuring_parabola.md b/docs/gnulinux/configuring_parabola.md index e70204e1..7fc9d688 100644 --- a/docs/gnulinux/configuring_parabola.md +++ b/docs/gnulinux/configuring_parabola.md @@ -56,8 +56,10 @@ careful about this when reading anything on the Arch wiki. Some of these steps require internet access. I'll go into networking later but for now, I just connected my system to a switch and did: # systemctl start dhcpcd.service + You can stop it later by running: # systemctl stop dhcpcd.service\ + For most people this should be enough, but if you don't have DHCP on your network then you should setup your network connection first:\ [Setup network connection in Parabola](#network) @@ -83,6 +85,7 @@ In the end, I didn't change my configuration for pacman. When you are updating, resync with the latest package names/versions: # pacman -Syy + (according to the wiki, -Syy is better than Sy because it refreshes the package list even if it appears to be up to date, which can be useful when switching to another mirror).\ @@ -159,6 +162,7 @@ The wiki also mentions this method for removing everything from the cache, including currently installed packages that are cached: # pacman -Scc + This is inadvisable, since it means re-downloading the package again if you wanted to quickly re-install it. This should only be used when disk space is at a premium. @@ -196,6 +200,7 @@ Read the entire document linked to above, and then continue. Add your user: # useradd -m -G wheel -s /bin/bash *yourusername* + Set a password: # passwd *yourusername* @@ -223,6 +228,7 @@ supplier) to use systemd. The manpage should also help: # man systemd + The section on 'unit types' is especially useful. According to the wiki, systemd 'journal' keeps logs of a size up to @@ -256,9 +262,11 @@ Finally, the wiki mentions 'temporary' files and the utility for managing them. # man systemd-tmpfiles + The command for 'clean' is: # systemd-tmpfiles --clean + According to the manpage, this *"cleans all files and directories with an age parameter"*. According to the Arch wiki, this reads information in /etc/tmpfiles.d/ and /usr/lib/tmpfiles.d/ to know what actions to @@ -270,6 +278,7 @@ However, /usr/lib/tmpfiles.d/ contained some files. The first one was etc.conf, containing information and a reference to this manpage: # man tmpfiles.d + Read that manpage, and then continue studying all the files. The systemd developers tell me that it isn't usually necessary to touch @@ -312,6 +321,7 @@ when installing Parabola. You can also do it with systemd (do so now, if you like): # hostnamectl set-hostname *yourhostname* + This writes the specified hostname to /etc/hostname. More information can be found in these manpages: @@ -399,6 +409,7 @@ non-free firmware inside, but it's transparent to you but the smart data comes from it. Therefore, don't rely on it too much): # pacman -S smartmontools + Read to learn how to use it. @@ -418,6 +429,7 @@ Based on . Firstly, install it! # pacman -S xorg-server + I also recommend installing this (contains lots of useful tools, including *xrandr*): @@ -427,9 +439,11 @@ Install the driver. For me this was *xf86-video-intel* on the ThinkPad X60. T60 and macbook11/21 should be the same. # pacman -S xf86-video-intel + For other systems you can try: # pacman -Ss xf86-video- | less + Combined with looking at your *lspci* output, you can determine which driver is needed. By default, Xorg will revert to xf86-video-vesa which is a generic driver and doesn't provide true hardware acceleration. @@ -535,6 +549,7 @@ I also like to install these: Enable LXDM (the default display manager, providing a graphical login): # systemctl enable lxdm.service + It will start when you boot up the system. To start it now, do: # systemctl start lxdm.service @@ -615,6 +630,7 @@ Install Network Manager: You will also want the graphical applet: # pacman -S network-manager-applet + Arch wiki says that an autostart rule will be written at */etc/xdg/autostart/nm-applet.desktop* @@ -629,6 +645,7 @@ LXDE uses openbox, so I refer to:\ It tells me for the applet I need: # pacman -S xfce4-notifyd gnome-icon-theme + Also, for storing authentication details (wifi) I need: # pacman -S gnome-keyring @@ -637,6 +654,7 @@ I wanted to quickly enable networkmanager: # systemctl stop dhcpcd # systemctl start NetworkManager + Enable NetworkManager at boot time: # systemctl enable NetworkManager diff --git a/docs/gnulinux/encrypted_parabola.md b/docs/gnulinux/encrypted_parabola.md index 5f0b796b..e1f6a9d7 100644 --- a/docs/gnulinux/encrypted_parabola.md +++ b/docs/gnulinux/encrypted_parabola.md @@ -82,6 +82,7 @@ guide is recommending putting zero there. I'm going to use urandom. Do this: # head -c 3145728 /dev/urandom > /dev/sda; sync + (Wiping the LUKS header is important, since it has hashed passphrases and so on. It's 'secure', but 'potentially' a risk). @@ -93,6 +94,7 @@ list the available keymaps and use yours: # localectl list-keymaps # loadkeys LAYOUT + For me, LAYOUT would have been dvorak-uk. Establish an internet connection @@ -166,6 +168,7 @@ is the best option. I am initializing LUKS with the following: # cryptsetup -v --cipher serpent-xts-plain64 --key-size 512 --hash + whirlpool --iter-time 500 --use-random --verify-passphrase luksFormat /dev/sda1 @@ -313,6 +316,7 @@ and wpa\_supplicant/dialog/iw/wpa\_actiond are needed for wireless after the install: # pacstrap /mnt base base-devel wpa\_supplicant dialog iw + wpa\_actiond Configure the system @@ -323,9 +327,11 @@ Generate an fstab - UUIDs are used because they have certain advantages prefer labels instead, replace the -U option with -L): # genfstab -U -p /mnt >> /mnt/etc/fstab + Check the created file: # cat /mnt/etc/fstab + (If there are any errors, edit the file. Do **NOT** run the genfstab command again!) @@ -354,6 +360,7 @@ Parabola does not have wget. This is sinister. Install it: Locale: # vi /etc/locale.gen + Uncomment your needed localisations. For example en\_GB.UTF-8 (UTF-8 is highly recommended over other options). @@ -364,6 +371,7 @@ highly recommended over other options). Console font and keymap: # vi /etc/vconsole.conf + In my case: KEYMAP=dvorak-uk @@ -372,6 +380,7 @@ In my case: Time zone: # ln -s /usr/share/zoneinfo/Europe/London /etc/localtime + (Replace Zone and Subzone to your liking. See /usr/share/zoneinfo) Hardware clock: @@ -382,6 +391,7 @@ Hostname: Write your hostname to /etc/hostname. For example, if your hostname is parabola: # echo parabola > /etc/hostname + Add the same hostname to /etc/hosts: # vi /etc/hosts @@ -400,6 +410,7 @@ Mkinitcpio: Configure /etc/mkinitcpio.conf as needed (see information about each hook.) Specifically, for this use case: # vi /etc/mkinitcpio.conf + Then modify the file like so: - MODULES="i915" @@ -426,9 +437,11 @@ with (this is different from Arch, specifying linux-libre instead of linux): # mkinitcpio -p linux-libre + Also do it for linux-libre-lts: # mkinitcpio -p linux-libre-lts + Also do it for linux-libre-grsec: # mkinitcpio -p linux-libre-grsec @@ -438,9 +451,11 @@ default for its password hashing. I referred to . # vi /etc/pam.d/passwd + Add rounds=65536 at the end of the uncommented 'password' line. # passwd root + Make sure to set a secure password! Also, it must never be the same as your LUKS password. @@ -466,6 +481,7 @@ To unlock a user manually (if a password attempt is failed 3 times), do: # pam\_tally --user *theusername* --reset What the above + configuration does is lock the user out for 10 minutes, if they make 3 failed login attempts. @@ -495,6 +511,7 @@ Lock the encrypted partition (close it): # cryptsetup luksClose lvm # shutdown -h now + Remove the installation media, then boot up again. Booting from GRUB @@ -546,6 +563,7 @@ current firmware - where *libreboot.rom* is an example: make sure to adapt: # flashrom -p internal -r libreboot.rom + If flashrom complains about multiple flash chips detected, add a *-c* option at the end, with the name of your chosen chip is quotes.\ You can check if everything is in there (*grub.cfg* and *grubtest.cfg* @@ -594,17 +612,20 @@ from the ROM image: and insert the modified grubtest.cfg: # ./cbfstool libreboot.rom add -n grubtest.cfg -f grubtest.cfg -t + raw Now refer to [../install/#flashrom](../install/#flashrom). Cd (up) to the libreboot\_util directory and update the flash chip contents: # ./flash update libreboot.rom + Ocassionally, coreboot changes the name of a given board. If flashrom complains about a board mismatch, but you are sure that you chose the correct ROM image, then run this alternative command: # ./flash forceupdate libreboot.rom + You should see "Verifying flash\... VERIFIED." written at the end of the flashrom output. @@ -633,6 +654,7 @@ Inside libreboot\_util/cbfstool/{armv7l i686 x86\_64}, we can do this with the following command: # sed -e 's:(cbfsdisk)/grub.cfg:(cbfsdisk)/grubtest.cfg:g' -e + 's:Switch to grub.cfg:Switch to grubtest.cfg:g' < grubtest.cfg > grub.cfg @@ -649,6 +671,7 @@ Now you have a modified ROM. Once more, refer to directory and update the flash chip contents: # ./flash update libreboot.rom + And wait for the "Verifying flash\... VERIFIED." Once you have done that, shut down and then boot up with your new configuration. @@ -676,20 +699,24 @@ putting a keyfile inside initramfs would be a bad idea).\ Boot up and login as root or your user. Then generate the key file: # dd bs=512 count=4 if=/dev/urandom of=/etc/mykeyfile + iflag=fullblock Insert it into the luks volume: # cryptsetup luksAddKey /dev/sdX /etc/mykeyfile + and enter your LUKS passphrase when prompted. Add the keyfile to the initramfs by adding it to FILES in /etc/mkinitcpio.conf. For example: # FILES="/etc/mykeyfile" + Create the initramfs image from scratch: # mkinitcpio -p linux-libre # mkinitcpio -p linux-libre-lts # mkinitcpio -p linux-libre-grsec + Add the following to your grub.cfg - you are now able to do that, see above! -, or add it in the kernel command line for GRUB: diff --git a/docs/gnulinux/grub_cbfs.md b/docs/gnulinux/grub_cbfs.md index 8d10c478..09e2c288 100644 --- a/docs/gnulinux/grub_cbfs.md +++ b/docs/gnulinux/grub_cbfs.md @@ -109,6 +109,7 @@ your current firmware, using flashrom: $ sudo flashrom -p internal -r libreboot.rom # flashrom -p internal -r libreboot.rom + If you are told to specify the chip, add the option **-c {your chip}** to the command, for example: @@ -158,6 +159,7 @@ Ocassionally, coreboot changes the name of a given board. If flashrom complains about a board mismatch, but you are sure that you chose the correct ROM image, then run this alternative command: # ./flash forceupdate libreboot.rom + You should see **"Verifying flash\... VERIFIED."** written at the end of the flashrom output. Once you have done that, shut down and then boot up with your new test configuration.** @@ -183,6 +185,7 @@ case you ever want to follow this guide again in the future (modifying the already modified config). From /libreboot\_util/cbfstool, do: # sed -e 's:(cbfsdisk)/grub.cfg:(cbfsdisk)/grubtest.cfg:g' -e + 's:Switch to grub.cfg:Switch to grubtest.cfg:g' < grubtest.cfg > grub.cfg diff --git a/docs/hardware/gm45_remove_me.md b/docs/hardware/gm45_remove_me.md index e083990a..d230c2a5 100644 --- a/docs/hardware/gm45_remove_me.md +++ b/docs/hardware/gm45_remove_me.md @@ -91,16 +91,19 @@ descriptor+gbe file into the ROM image.\ For 16MiB flash chips: # dd if=ich9fdgbe\_16m.bin of=libreboot.rom bs=1 count=12k + conv=notrunc For 8MiB flash chips: # dd if=ich9fdgbe\_8m.bin of=libreboot.rom bs=1 count=12k + conv=notrunc For 4MiB flash chips: # dd if=ich9fdgbe\_4m.bin of=libreboot.rom bs=1 count=12k + conv=notrunc Your libreboot.rom image is now ready to be flashed on the system. Refer @@ -204,6 +207,7 @@ Assuming that your libreboot image is named **libreboot.rom**, copy the and then run: # dd if=deblobbed\_descriptor.bin of=libreboot.rom bs=1 count=12k + conv=notrunc Alternatively, if you got a the **deblobbed\_4kdescriptor.bin** file (no @@ -248,6 +252,7 @@ Insert that into a factory.rom image (NOTE: do this on a copy of it. Keep the original factory.rom stored safely somewhere): # dd if=demefactory\_4kdescriptor.bin of=factory\_nome.rom bs=1 + count=4k conv=notrunc TODO: test this.\ diff --git a/docs/hardware/x200.md b/docs/hardware/x200.md index 492083c0..8afbe504 100644 --- a/docs/hardware/x200.md +++ b/docs/hardware/x200.md @@ -231,6 +231,7 @@ pehjota started collecting some steppings for different CPUs on several X200 laptops. You can get the CPUID by running: # dmesg | sed -n 's/\^.\* microcode: CPU0 + sig=0x\\(\[\^,\]\*\\),.\*\$/\\1/p' What pehjota wrote: The laptops that have issues resuming from suspend, diff --git a/docs/install/bbb_setup.md b/docs/install/bbb_setup.md index 6f2bc07d..7c55319e 100644 --- a/docs/install/bbb_setup.md +++ b/docs/install/bbb_setup.md @@ -150,6 +150,7 @@ Alternatives to SSH (in case SSH fails) You can also use a serial FTDI debug board with GNU Screen, to access the serial console. # screen /dev/ttyUSB0 115200 + Here are some example photos:\ ![](images/x200/ftdi.jpg) ![](images/x200/ftdi_port.jpg)\ @@ -202,6 +203,7 @@ before continuing. Check that the firmware exists: # ls /lib/firmware/BB-SPI0-01-00A0.\* + Output: /lib/firmware/BB-SPI0-01-00A0.dtbo @@ -210,6 +212,7 @@ Then: # echo BB-SPI0-01 > /sys/devices/bone\_capemgr.\*/slots # cat /sys/devices/bone\_capemgr.\*/slots + Output: 0: 54:PF--- @@ -223,6 +226,7 @@ Output: Verify that the spidev device now exists: # ls -al /dev/spid\* + Output: crw-rw---T 1 root spi 153, 0 Nov 19 21:07 /dev/spidev1.0 @@ -247,6 +251,7 @@ your BBB. Now test flashrom: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 + Output: Calibrating delay loop... OK. diff --git a/docs/install/c201.md b/docs/install/c201.md index 3e924614..b8edc211 100644 --- a/docs/install/c201.md +++ b/docs/install/c201.md @@ -124,12 +124,14 @@ device (e.g. using the *root* account). In addition, the The SPI flash has to be read first: # flashrom -p host -r flash.img\ + **Note: it might be a good idea to copy the produced flash.img file at this point and store it outside of the device for backup purposes.** Then, the **cros-flash-replace** script has to be executed as such: # ./cros-flash-replace flash.img coreboot ro-frid + If any error is shown, it is definitely a bad idea to go further than this point. @@ -173,12 +175,14 @@ host (e.g. using the *root* account). In addition, the The SPI flash has to be read first (using the right spi programmer): # flashrom -p *programmer* -r flash.img + **Note: it might be a good idea to copy the produced flash.img file at this point and store it outside of the device for backup purposes.** Then, the **cros-flash-replace** script has to be executed as such: # ./cros-flash-replace flash.img coreboot ro-frid + If any error is shown, it is definitely a bad idea to go further than this point. diff --git a/docs/install/index.md b/docs/install/index.md index 7e2161b7..6a947da6 100644 --- a/docs/install/index.md +++ b/docs/install/index.md @@ -332,6 +332,7 @@ When you have booted up again, you must also do this: If flashing fails at this stage, try the following: # sudo ./flashrom/i686/flashrom -p + internal:laptop=force\_I\_want\_a\_brick -w [yourrom.rom](#rom) You should see within the output the following:\ diff --git a/docs/install/r400_external.md b/docs/install/r400_external.md index b4429e56..7c87b08d 100644 --- a/docs/install/r400_external.md +++ b/docs/install/r400_external.md @@ -215,6 +215,7 @@ Log in as root on your BBB, using the instructions in Test that flashrom works: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512\ + In this case, the output was: flashrom v0.9.7-r1854 on Linux 3.8.13-bone47 (armv7l) @@ -230,12 +231,15 @@ How to backup factory.rom (change the -c option as neeed, for your flash chip): # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + factory.rom # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + factory1.rom # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + factory2.rom Note: the **-c** option is not required in libreboot's patched @@ -244,6 +248,7 @@ have been removed.\ Now compare the 3 images: # sha512sum factory\*.rom + If the hashes match, then just copy one of them (the factory.rom) to a safe place (on a drive connected to another system, not the BBB). This is useful for reverse engineering work, if there is a desirable @@ -260,6 +265,7 @@ address to one that is correct for your system.** Now flash it: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + path/to/libreboot/rom/image.rom -V ![](images/x200/disassembly/0015.jpg) diff --git a/docs/install/t400_external.md b/docs/install/t400_external.md index 8dc2204a..bb3a93e2 100644 --- a/docs/install/t400_external.md +++ b/docs/install/t400_external.md @@ -213,6 +213,7 @@ Log in as root on your BBB, using the instructions in Test that flashrom works: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 + In this case, the output was: flashrom v0.9.7-r1854 on Linux 3.8.13-bone47 (armv7l) @@ -228,12 +229,15 @@ How to backup factory.rom (change the -c option as neeed, for your flash chip): # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + factory.rom # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + factory1.rom # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + factory2.rom Note: the **-c** option is not required in libreboot's patched @@ -242,6 +246,7 @@ have been removed.\ Now compare the 3 images: # sha512sum factory\*.rom + If the hashes match, then just copy one of them (the factory.rom) to a safe place (on a drive connected to another system, not the BBB). This is useful for reverse engineering work, if there is a desirable @@ -258,6 +263,7 @@ address to one that is correct for your system.** Now flash it: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + path/to/libreboot/rom/image.rom -V ![](images/x200/disassembly/0015.jpg) diff --git a/docs/install/t500_external.md b/docs/install/t500_external.md index 56021fe0..05f418c8 100644 --- a/docs/install/t500_external.md +++ b/docs/install/t500_external.md @@ -230,6 +230,7 @@ Log in as root on your BBB, using the instructions in Test that flashrom works: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 + In this case, the output was: flashrom v0.9.7-r1854 on Linux 3.8.13-bone47 (armv7l) @@ -245,12 +246,15 @@ How to backup factory.rom (change the -c option as neeed, for your flash chip): # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + factory.rom # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + factory1.rom # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + factory2.rom Note: the **-c** option is not required in libreboot's patched @@ -259,6 +263,7 @@ have been removed.\ Now compare the 3 images: # sha512sum factory\*.rom + If the hashes match, then just copy one of them (the factory.rom) to a safe place (on a drive connected to another system, not the BBB). This is useful for reverse engineering work, if there is a desirable @@ -275,6 +280,7 @@ address to one that is correct for your system.** Now flash it: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + path/to/libreboot/rom/image.rom -V ![](images/x200/disassembly/0015.jpg) diff --git a/docs/install/t60_unbrick.md b/docs/install/t60_unbrick.md index d2d59f42..9fd49bbf 100644 --- a/docs/install/t60_unbrick.md +++ b/docs/install/t60_unbrick.md @@ -144,6 +144,7 @@ source code which can be built. SSH'd into the BBB: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + yourrom.rom It should be **Verifying flash\... VERIFIED** at the end. If flashrom diff --git a/docs/install/x60_unbrick.md b/docs/install/x60_unbrick.md index 24b4cb63..2493e56a 100644 --- a/docs/install/x60_unbrick.md +++ b/docs/install/x60_unbrick.md @@ -129,6 +129,7 @@ source code which can be built. SSH'd into the BBB: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + yourrom.rom It should be **Verifying flash\... VERIFIED** at the end. If flashrom diff --git a/docs/install/x60tablet_unbrick.md b/docs/install/x60tablet_unbrick.md index d02a8ae6..f18e3629 100644 --- a/docs/install/x60tablet_unbrick.md +++ b/docs/install/x60tablet_unbrick.md @@ -108,6 +108,7 @@ source code which can be built. SSH'd into the BBB: # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + yourrom.rom It should be **Verifying flash\... VERIFIED** at the end. If flashrom -- cgit v1.2.3-70-g09d2 From 66a380d686f8a606e2c8b84354ff7e46d5d8db2a Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 13 May 2017 08:48:35 -0700 Subject: Typographically correct ellipses --- docs/bsd/freebsd.md | 2 +- docs/bsd/netbsd.md | 2 +- docs/bsd/openbsd.md | 2 +- docs/gnulinux/encrypted_parabola.md | 4 ++-- docs/gnulinux/grub_cbfs.md | 4 ++-- docs/gnulinux/grub_hardening.md | 4 ++-- docs/hardware/gm45_remove_me.md | 2 +- docs/install/bbb_setup.md | 2 +- docs/install/c201.md | 4 ++-- docs/install/index.md | 8 ++++---- docs/install/r400_external.md | 2 +- docs/install/t400_external.md | 2 +- docs/install/t500_external.md | 2 +- docs/install/t60_unbrick.md | 2 +- docs/install/x200_external.md | 2 +- docs/install/x60_unbrick.md | 2 +- docs/install/x60tablet_unbrick.md | 2 +- 17 files changed, 24 insertions(+), 24 deletions(-) (limited to 'docs/hardware/gm45_remove_me.md') diff --git a/docs/bsd/freebsd.md b/docs/bsd/freebsd.md index 9557ae45..0148cf2f 100644 --- a/docs/bsd/freebsd.md +++ b/docs/bsd/freebsd.md @@ -138,7 +138,7 @@ because it doesn't exist. In most cases, you should use the vesafb ROM images. Example filename: libreboot\_ukdvorak\_vesafb.rom. -won't boot\...something about file not found +won't boot...something about file not found --------------------------------------------- Your device names (i.e. usb0, usb1, sd0, sd1, wd0, ahci0, hd0, etc) and diff --git a/docs/bsd/netbsd.md b/docs/bsd/netbsd.md index 28b4d2df..226b3b96 100644 --- a/docs/bsd/netbsd.md +++ b/docs/bsd/netbsd.md @@ -154,7 +154,7 @@ because it doesn't exist. In most cases, you should use the vesafb ROM images. Example filename: libreboot\_ukdvorak\_vesafb.rom. -won't boot\...something about file not found +won't boot...something about file not found --------------------------------------------- Your device names (i.e. usb0, usb1, sd0, sd1, wd0, ahci0, hd0, etc) and diff --git a/docs/bsd/openbsd.md b/docs/bsd/openbsd.md index fb596161..8c33e5df 100644 --- a/docs/bsd/openbsd.md +++ b/docs/bsd/openbsd.md @@ -174,7 +174,7 @@ because it doesn't exist. In most cases, you should use the vesafb ROM images. Example filename: libreboot\_ukdvorak\_vesafb.rom. -Won't boot\...something about file not found +Won't boot...something about file not found --------------------------------------------- Your device names (i.e. usb0, usb1, sd0, sd1, wd0, ahci0, hd0, etc) and diff --git a/docs/gnulinux/encrypted_parabola.md b/docs/gnulinux/encrypted_parabola.md index 48dba39b..63c15c0f 100644 --- a/docs/gnulinux/encrypted_parabola.md +++ b/docs/gnulinux/encrypted_parabola.md @@ -645,7 +645,7 @@ correct ROM image, then run this alternative command: # ./flash forceupdate libreboot.rom -You should see "Verifying flash\... VERIFIED." written at the end of +You should see "Verifying flash... VERIFIED." written at the end of the flashrom output. With this new configuration, Parabola can boot automatically and you @@ -691,7 +691,7 @@ directory and update the flash chip contents: # ./flash update libreboot.rom -And wait for the "Verifying flash\... VERIFIED." Once you have done +And wait for the "Verifying flash... VERIFIED." Once you have done that, shut down and then boot up with your new configuration. When done, delete GRUB (remember, we only needed it for the diff --git a/docs/gnulinux/grub_cbfs.md b/docs/gnulinux/grub_cbfs.md index 09e2c288..d4038bfc 100644 --- a/docs/gnulinux/grub_cbfs.md +++ b/docs/gnulinux/grub_cbfs.md @@ -120,7 +120,7 @@ Extract grubtest.cfg from the ROM image {#extract_testconfig} You can check the contents of the ROM image, inside CBFS: - $ cd \.../libreboot\_util/cbfstool** $ ./cbfstool libreboot.rom + $ cd .../libreboot\_util/cbfstool** $ ./cbfstool libreboot.rom print** @@ -160,7 +160,7 @@ complains about a board mismatch, but you are sure that you chose the correct ROM image, then run this alternative command: # ./flash forceupdate libreboot.rom -You should see **"Verifying flash\... VERIFIED."** written at the end +You should see **"Verifying flash... VERIFIED."** written at the end of the flashrom output. Once you have done that, shut down and then boot up with your new test configuration.** diff --git a/docs/gnulinux/grub_hardening.md b/docs/gnulinux/grub_hardening.md index 780d2c03..918fd45b 100644 --- a/docs/gnulinux/grub_hardening.md +++ b/docs/gnulinux/grub_hardening.md @@ -139,7 +139,7 @@ First generate a GPG keypair to use for signing. Option RSA (sign only) is ok. **Warning:** GRUB does not read ASCII armored keys. When attempting to -trust \... a key filename it will print error: bad signature +trust ... a key filename it will print error: bad signature mkdir --mode 0700 keys gpg --homedir keys --gen-key @@ -177,7 +177,7 @@ What remains now is to include the modifications into the image (rom): cbfstool my.rom add -n grubtest.cfg -f my.grubtest.cfg -t raw cbfstool my.rom add -n grubtest.cfg.sig -f my.grubtest.cfg.sig -t raw -\... and flashing it. +... and flashing it. Copyright © 2017 Fedja Beader \ diff --git a/docs/hardware/gm45_remove_me.md b/docs/hardware/gm45_remove_me.md index d230c2a5..253b4b6e 100644 --- a/docs/hardware/gm45_remove_me.md +++ b/docs/hardware/gm45_remove_me.md @@ -439,7 +439,7 @@ actually be others on the X200. 0xBABA"* In honour of the song *Baba O'Reilly* by *The Who* apparently. We're -not making this stuff up\... +not making this stuff up... 0x3ABA, 0x34BA, 0x40BA and more have been observed in the main Gbe regions on the X200 factory.rom dumps. The checksums of the backup diff --git a/docs/install/bbb_setup.md b/docs/install/bbb_setup.md index 7c55319e..e9eacd77 100644 --- a/docs/install/bbb_setup.md +++ b/docs/install/bbb_setup.md @@ -28,7 +28,7 @@ flashing on the ThinkPad X200, but it should work for other targets. here is a photo of the setup for the teensy: -Onto the Beaglebone black\... +Onto the Beaglebone black... Hardware requirements ===================== diff --git a/docs/install/c201.md b/docs/install/c201.md index b8edc211..3e60711a 100644 --- a/docs/install/c201.md +++ b/docs/install/c201.md @@ -140,7 +140,7 @@ The resulting flash image can then be flashed back: # flashrom -p host -w flash.img You should also see within the output the following:\ -**"Verifying flash\... VERIFIED."** +**"Verifying flash... VERIFIED."** Shut down. The device will now boot to Libreboot. @@ -192,7 +192,7 @@ programmer): # flashrom -p *programmer* -w flash.img You should also see within the output the following:\ -**"Verifying flash\... VERIFIED."** +**"Verifying flash... VERIFIED."** The device will now boot to Libreboot. diff --git a/docs/install/index.md b/docs/install/index.md index 6a947da6..8c504365 100644 --- a/docs/install/index.md +++ b/docs/install/index.md @@ -254,7 +254,7 @@ Use this to find out: All good? --------- -Excellent! Moving on\... +Excellent! Moving on... Download the *libreboot\_util.tar.xz* archive, and extract it. Inside, you will find a directory called *flashrom*. This contains statically @@ -277,7 +277,7 @@ correct ROM image, then run this alternative command: $ sudo ./flash forceupdate [yourrom.rom](#rom) -You should see **"Verifying flash\... VERIFIED."** written at the end +You should see **"Verifying flash... VERIFIED."** written at the end of the flashrom output. **Shut down** after you see this, and then boot up again after a few seconds. @@ -340,7 +340,7 @@ You should see within the output the following:\ untranslated"** You should also see within the output the following:\ -**"Verifying flash\... VERIFIED."** +**"Verifying flash... VERIFIED."** MacBook2,1: Initial installation guide (if running the proprietary firmware) {#flashrom_macbook21} ============================================================================ @@ -370,7 +370,7 @@ Use this flashing script, to install libreboot: $ sudo ./flash i945apple\_firstflash [yourrom.rom](#rom) You should also see within the output the following:\ -**"Verifying flash\... VERIFIED."** +**"Verifying flash... VERIFIED."** Shut down. diff --git a/docs/install/r400_external.md b/docs/install/r400_external.md index 7c87b08d..83049200 100644 --- a/docs/install/r400_external.md +++ b/docs/install/r400_external.md @@ -270,7 +270,7 @@ path/to/libreboot/rom/image.rom -V ![](images/x200/disassembly/0015.jpg) -You might see errors, but if it says **Verifying flash\... VERIFIED** at +You might see errors, but if it says **Verifying flash... VERIFIED** at the end, then it's flashed and should boot. If you see errors, try again (and again, and again); the message **Chip content is identical to the requested image** is also an indication of a successful diff --git a/docs/install/t400_external.md b/docs/install/t400_external.md index bb3a93e2..11e98535 100644 --- a/docs/install/t400_external.md +++ b/docs/install/t400_external.md @@ -268,7 +268,7 @@ path/to/libreboot/rom/image.rom -V ![](images/x200/disassembly/0015.jpg) -You might see errors, but if it says **Verifying flash\... VERIFIED** at +You might see errors, but if it says **Verifying flash... VERIFIED** at the end, then it's flashed and should boot. If you see errors, try again (and again, and again); the message **Chip content is identical to the requested image** is also an indication of a successful diff --git a/docs/install/t500_external.md b/docs/install/t500_external.md index 05f418c8..4cee6b3e 100644 --- a/docs/install/t500_external.md +++ b/docs/install/t500_external.md @@ -285,7 +285,7 @@ path/to/libreboot/rom/image.rom -V ![](images/x200/disassembly/0015.jpg) -You might see errors, but if it says **Verifying flash\... VERIFIED** at +You might see errors, but if it says **Verifying flash... VERIFIED** at the end, then it's flashed and should boot. If you see errors, try again (and again, and again); the message **Chip content is identical to the requested image** is also an indication of a successful diff --git a/docs/install/t60_unbrick.md b/docs/install/t60_unbrick.md index 9fd49bbf..e3469074 100644 --- a/docs/install/t60_unbrick.md +++ b/docs/install/t60_unbrick.md @@ -147,7 +147,7 @@ SSH'd into the BBB: yourrom.rom -It should be **Verifying flash\... VERIFIED** at the end. If flashrom +It should be **Verifying flash... VERIFIED** at the end. If flashrom complains about multiple flash chip definitions detected, then choose one of them following the instructions in the output. diff --git a/docs/install/x200_external.md b/docs/install/x200_external.md index 2cce70ba..05ba3063 100644 --- a/docs/install/x200_external.md +++ b/docs/install/x200_external.md @@ -184,7 +184,7 @@ Now flash it: ![](images/x200/disassembly/0015.jpg) -You might see errors, but if it says **Verifying flash\... VERIFIED** at +You might see errors, but if it says **Verifying flash... VERIFIED** at the end, then it's flashed and should boot. If you see errors, try again (and again, and again); the message **Chip content is identical to the requested image** is also an indication of a successful diff --git a/docs/install/x60_unbrick.md b/docs/install/x60_unbrick.md index 2493e56a..233209c9 100644 --- a/docs/install/x60_unbrick.md +++ b/docs/install/x60_unbrick.md @@ -132,7 +132,7 @@ SSH'd into the BBB: yourrom.rom -It should be **Verifying flash\... VERIFIED** at the end. If flashrom +It should be **Verifying flash... VERIFIED** at the end. If flashrom complains about multiple flash chip definitions detected, then choose one of them following the instructions in the output. diff --git a/docs/install/x60tablet_unbrick.md b/docs/install/x60tablet_unbrick.md index f18e3629..0386cc1b 100644 --- a/docs/install/x60tablet_unbrick.md +++ b/docs/install/x60tablet_unbrick.md @@ -111,7 +111,7 @@ SSH'd into the BBB: yourrom.rom -It should be **Verifying flash\... VERIFIED** at the end. If flashrom +It should be **Verifying flash... VERIFIED** at the end. If flashrom complains about multiple flash chip definitions detected, then choose one of them following the instructions in the output. -- cgit v1.2.3-70-g09d2 From 5e2ee3b2a94f1ac3e6a716af8d60513ab064a678 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 13 May 2017 09:12:13 -0700 Subject: Fix underscores in code --- docs/depthcharge/index.md | 18 +++++++++--------- docs/gnulinux/encrypted_parabola.md | 8 ++++---- docs/hardware/gm45_remove_me.md | 10 +++++----- docs/install/bbb_setup.md | 6 +++--- docs/install/r400_external.md | 10 +++++----- docs/install/t400_external.md | 10 +++++----- docs/install/t500_external.md | 10 +++++----- docs/install/t60_unbrick.md | 2 +- docs/install/x60_unbrick.md | 2 +- docs/install/x60tablet_unbrick.md | 2 +- 10 files changed, 39 insertions(+), 39 deletions(-) (limited to 'docs/hardware/gm45_remove_me.md') diff --git a/docs/depthcharge/index.md b/docs/depthcharge/index.md index ebfbbefe..1c0c8d13 100644 --- a/docs/depthcharge/index.md +++ b/docs/depthcharge/index.md @@ -145,24 +145,24 @@ The following parameters can be configured: Kernels signature verification: - # crossystem dev\_boot\_signed\_only=1 # enable - # crossystem dev\_boot\_signed\_only=0 # disable + # crossystem dev_boot_signed_only=1 # enable + # crossystem dev_boot_signed_only=0 # disable External media boot: - # crossystem dev\_boot\_usb=1 # enable - # crossystem dev\_boot\_usb=0 # disable + # crossystem dev_boot_usb=1 # enable + # crossystem dev_boot_usb=0 # disable Legacy payload boot: - # crossystem dev\_boot\_legacy=1 # enable - # crossystem dev\_boot\_legacy=0 # disable + # crossystem dev_boot_legacy=1 # enable + # crossystem dev_boot_legacy=0 # disable Default boot medium: - # crossystem dev\_default\_boot=disk # internal storage - # crossystem dev\_default\_boot=usb # external media - # crossystem dev\_default\_boot=legacy # legacy payload + # crossystem dev_default_boot=disk # internal storage + # crossystem dev_default_boot=usb # external media + # crossystem dev_default_boot=legacy # legacy payload Copyright © 2015 Paul Kocialkowski \ diff --git a/docs/gnulinux/encrypted_parabola.md b/docs/gnulinux/encrypted_parabola.md index 62884ecd..deb0ba4e 100644 --- a/docs/gnulinux/encrypted_parabola.md +++ b/docs/gnulinux/encrypted_parabola.md @@ -336,7 +336,7 @@ I also like to install other packages (base-devel, compilers and so on) and wpa\_supplicant/dialog/iw/wpa\_actiond are needed for wireless after the install: - # pacstrap /mnt base base-devel wpa\_supplicant dialog iw + # pacstrap /mnt base base-devel wpa_supplicant dialog iw wpa\_actiond @@ -386,8 +386,8 @@ Uncomment your needed localisations. For example en\_GB.UTF-8 (UTF-8 is highly recommended over other options). # locale-gen - # echo LANG=en\_GB.UTF-8 > /etc/locale.conf - # export LANG=en\_GB.UTF-8 + # echo LANG=en_GB.UTF-8 > /etc/locale.conf + # export LANG=en_GB.UTF-8 Console font and keymap: @@ -501,7 +501,7 @@ file=/var/log/faillog*\ To unlock a user manually (if a password attempt is failed 3 times), do: - # pam\_tally --user *theusername* --reset What the above + # pam_tally --user *theusername* --reset What the above configuration does is lock the user out for 10 minutes, if they make 3 failed login attempts. diff --git a/docs/hardware/gm45_remove_me.md b/docs/hardware/gm45_remove_me.md index 253b4b6e..5d9bc312 100644 --- a/docs/hardware/gm45_remove_me.md +++ b/docs/hardware/gm45_remove_me.md @@ -90,19 +90,19 @@ file to where **libreboot.rom** is located and then insert the descriptor+gbe file into the ROM image.\ For 16MiB flash chips: - # dd if=ich9fdgbe\_16m.bin of=libreboot.rom bs=1 count=12k + # dd if=ich9fdgbe_16m.bin of=libreboot.rom bs=1 count=12k conv=notrunc For 8MiB flash chips: - # dd if=ich9fdgbe\_8m.bin of=libreboot.rom bs=1 count=12k + # dd if=ich9fdgbe_8m.bin of=libreboot.rom bs=1 count=12k conv=notrunc For 4MiB flash chips: - # dd if=ich9fdgbe\_4m.bin of=libreboot.rom bs=1 count=12k + # dd if=ich9fdgbe_4m.bin of=libreboot.rom bs=1 count=12k conv=notrunc @@ -206,7 +206,7 @@ Assuming that your libreboot image is named **libreboot.rom**, copy the **deblobbed\_descriptor.bin** file to where **libreboot.rom** is located and then run: - # dd if=deblobbed\_descriptor.bin of=libreboot.rom bs=1 count=12k + # dd if=deblobbed_descriptor.bin of=libreboot.rom bs=1 count=12k conv=notrunc @@ -251,7 +251,7 @@ It will generate a 4KiB descriptor file (only the descriptor, no GbE). Insert that into a factory.rom image (NOTE: do this on a copy of it. Keep the original factory.rom stored safely somewhere): - # dd if=demefactory\_4kdescriptor.bin of=factory\_nome.rom bs=1 + # dd if=demefactory_4kdescriptor.bin of=factory_nome.rom bs=1 count=4k conv=notrunc diff --git a/docs/install/bbb_setup.md b/docs/install/bbb_setup.md index 77f805fc..b80203b4 100644 --- a/docs/install/bbb_setup.md +++ b/docs/install/bbb_setup.md @@ -211,8 +211,8 @@ Output: Then: - # echo BB-SPI0-01 > /sys/devices/bone\_capemgr.\*/slots - # cat /sys/devices/bone\_capemgr.\*/slots + # echo BB-SPI0-01 > /sys/devices/bone_capemgr.\*/slots + # cat /sys/devices/bone_capemgr.\*/slots Output: @@ -251,7 +251,7 @@ your BBB. Now test flashrom: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 Output: diff --git a/docs/install/r400_external.md b/docs/install/r400_external.md index 6c044f58..80e1a676 100644 --- a/docs/install/r400_external.md +++ b/docs/install/r400_external.md @@ -216,7 +216,7 @@ Log in as root on your BBB, using the instructions in Test that flashrom works: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512\ + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512\ In this case, the output was: @@ -232,15 +232,15 @@ In this case, the output was: How to backup factory.rom (change the -c option as neeed, for your flash chip): - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory.rom - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory1.rom - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory2.rom @@ -266,7 +266,7 @@ address to one that is correct for your system.** Now flash it: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w path/to/libreboot/rom/image.rom -V diff --git a/docs/install/t400_external.md b/docs/install/t400_external.md index 414c1a5f..bbb7240f 100644 --- a/docs/install/t400_external.md +++ b/docs/install/t400_external.md @@ -214,7 +214,7 @@ Log in as root on your BBB, using the instructions in Test that flashrom works: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 In this case, the output was: @@ -230,15 +230,15 @@ In this case, the output was: How to backup factory.rom (change the -c option as neeed, for your flash chip): - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory.rom - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory1.rom - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory2.rom @@ -264,7 +264,7 @@ address to one that is correct for your system.** Now flash it: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w path/to/libreboot/rom/image.rom -V diff --git a/docs/install/t500_external.md b/docs/install/t500_external.md index 259d996e..749ef455 100644 --- a/docs/install/t500_external.md +++ b/docs/install/t500_external.md @@ -231,7 +231,7 @@ Log in as root on your BBB, using the instructions in Test that flashrom works: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 In this case, the output was: @@ -247,15 +247,15 @@ In this case, the output was: How to backup factory.rom (change the -c option as neeed, for your flash chip): - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory.rom - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory1.rom - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -r + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -r factory2.rom @@ -281,7 +281,7 @@ address to one that is correct for your system.** Now flash it: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w path/to/libreboot/rom/image.rom -V diff --git a/docs/install/t60_unbrick.md b/docs/install/t60_unbrick.md index e3469074..bc8d83e3 100644 --- a/docs/install/t60_unbrick.md +++ b/docs/install/t60_unbrick.md @@ -143,7 +143,7 @@ source code which can be built. SSH'd into the BBB: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom diff --git a/docs/install/x60_unbrick.md b/docs/install/x60_unbrick.md index 233209c9..9c558631 100644 --- a/docs/install/x60_unbrick.md +++ b/docs/install/x60_unbrick.md @@ -128,7 +128,7 @@ source code which can be built. SSH'd into the BBB: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom diff --git a/docs/install/x60tablet_unbrick.md b/docs/install/x60tablet_unbrick.md index 0386cc1b..3a04ad3f 100644 --- a/docs/install/x60tablet_unbrick.md +++ b/docs/install/x60tablet_unbrick.md @@ -107,7 +107,7 @@ source code which can be built. SSH'd into the BBB: - # ./flashrom -p linux\_spi:dev=/dev/spidev1.0,spispeed=512 -w + # ./flashrom -p linux_spi:dev=/dev/spidev1.0,spispeed=512 -w yourrom.rom -- cgit v1.2.3-70-g09d2