libreboot

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit b967baa8118b34fb3fd36d4c3b8b1c21495f9aa4
parent 60926e9fc770fc1f310306447220cb3740382b00
Author: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date:   Fri, 17 Mar 2017 22:55:29 -0700

Cleanup some escaped symbols

Diffstat:
docs/archive_old.md | 40++++++++++++++++++++--------------------
docs/bsd/freebsd.md | 18+++++++++---------
docs/bsd/index.md | 2+-
docs/bsd/netbsd.md | 18+++++++++---------
docs/bsd/openbsd.md | 18+++++++++---------
docs/future/index.md | 4++--
docs/git/index.md | 74+++++++++++++++++++++++++++++++++++++-------------------------------------
docs/gnulinux/configuring_parabola.md | 8++++----
docs/gnulinux/encrypted_debian.md | 4++--
docs/gnulinux/encrypted_parabola.md | 20++++++++++----------
docs/gnulinux/grub_boot_installer.md | 18+++++++++---------
docs/gnulinux/grub_cbfs.md | 22+++++++++++-----------
docs/gnulinux/index.md | 2+-
docs/grub/index.md | 10+++++-----
docs/hardware/t60_security.md | 4++--
docs/hardware/x60_security.md | 4++--
docs/hcl/gm45_remove_me.md | 30+++++++++++++++---------------
docs/hcl/index.md | 4++--
docs/hcl/kgpe-d16.md | 6+++---
docs/hcl/t500.md | 4++--
docs/hcl/x200.md | 6+++---
docs/index.md | 2+-
docs/install/bbb_setup.md | 16++++++++--------
docs/install/index.md | 18+++++++++---------
docs/install/r400_external.md | 2+-
docs/install/rpi_setup.md | 12++++++------
docs/install/t400_external.md | 2+-
docs/install/t500_external.md | 2+-
docs/install/t60_unbrick.md | 10+++++-----
docs/install/x200_external.md | 2+-
docs/install/x60_unbrick.md | 10+++++-----
docs/install/x60tablet_unbrick.md | 10+++++-----
docs/misc/bbb_ehci.md | 24++++++++++++------------
docs/misc/index.md | 24++++++++++++------------
docs/misc/patch.md | 26+++++++++++++-------------
35 files changed, 238 insertions(+), 238 deletions(-)

diff --git a/docs/archive_old.md b/docs/archive_old.md @@ -7,7 +7,7 @@ Information for this release can be found at at [libreboot.org](http://libreboot.org/). -**This page is \*obsolete\*, provided for historical purposes.** +**This page is *obsolete*, provided for historical purposes.** @@ -102,7 +102,7 @@ Changes for this release, relative to r20150208 (earliest changes last, recent c again in the next release) - coreboot-libre: delete unused code (reduce size of src archive) - Flashing guides: make them more friendly to colourblind people -- docs/gnulinux/encrypted\_\*.html: Remove mention of password +- docs/gnulinux/encrypted\_*.html: Remove mention of password length - it was arbitrary and pointless. - docs/maintain/: Finish the guide - scripts/download/coreboot: use diffs included in libreboot, not @@ -125,7 +125,7 @@ Changes for this release, relative to r20150208 (earliest changes last, recent c - demefactory (new utility): create GM45 factory.rom without the ME - ich9deblob: re-factor descriptor.c functions - docs/hcl/t500.html: add hardware logs -- docs/gnulinux/encrypted\_\*.html: No password for default entry +- docs/gnulinux/encrypted\_*.html: No password for default entry - docs/git/: Add more details about BUC.TS - grub.cfg: Also scan for grub2/grub.cfg, not just grub/grub.cfg - docs/maintain/ (new section. WIP!): Maintaining libreboot @@ -133,7 +133,7 @@ Changes for this release, relative to r20150208 (earliest changes last, recent c - docs/tasks.html: Better categorization between intel/amd/arm - docs/install/bbb\_setup.html: notes about SPI flashing stability - docs/install/bbb\_setup.html: more names for the 0.1" cables -- docs/install/\*\_external.html: add disclaimer about thermal paste +- docs/install/*\_external.html: add disclaimer about thermal paste - docs/install/bbb\_setup.html: Fix broken links - docs/install/bbb\_setup.html: preliminary notes about EHCI debug - docs/hcl/gm45\_remove\_me.html: Link to websites talking about the @@ -164,7 +164,7 @@ Changes for this release, relative to r20150208 (earliest changes last, recent c included (merged upstream) - coreboot-libre: don't list vortex86ex kbd firmware as microcode (list it separately) -- coreboot-libre: don't rm \*/early\_setup\_ss.h (these are not +- coreboot-libre: don't rm */early\_setup\_ss.h (these are not blobs) - coreboot-libre: add GPLv3 license to the findblobs script - coreboot-libreboot: don't rm raminit\_tables (nahelem/sandybridge) @@ -374,7 +374,7 @@ Changes for this release (latest changes first, earliest changes last) completely. - Enabled cstates 1 and 2 on macbook21. This reduces idle heat / power consumption. -- buildrom-withgrub: disabled creation of \*txtmode\*.rom for X200 +- buildrom-withgrub: disabled creation of *txtmode*.rom for X200 (only framebuffer graphics work) - Updated SeaBIOS (again) - docs/install/\#flashrom\_x200: improve instructions @@ -613,11 +613,11 @@ Revisions for r20140911 (7th beta) (11th September 2014) Revisions for r20140903 (6th beta) (3rd September 2014) ------------------------------------------------------- -- Added modified builddeb\* scripts for Parabola GNU+Linux-libre: +- Added modified builddeb* scripts for Parabola GNU+Linux-libre: buildpac, buildpac-flashrom, buildpac-bucts (courtesy of Noah Vesely) - Documentation: updated all relevant areas to mention use of - buildpac\* scripts for Parabola users. + buildpac* scripts for Parabola users. - Documentation: added information showing how to enable or disable bluetooth on the X60 - MacBook1,1 tested! See **hcl/\#macbook11** @@ -657,7 +657,7 @@ Revisions for r20140903 (6th beta) (3rd September 2014) - Updated getcb script and DEBLOB script. - Updated configuration files under resources/libreboot/config/ to accomodate new coreboot version. -- Removed grub\_serial\*.cfg and libreboot\_serial\*.rom, all +- Removed grub\_serial*.cfg and libreboot\_serial*.rom, all configs/rom files are now unified (containing same configuration as serial rom files from before). - Documentation: updated \#rom to reflect the above. @@ -701,13 +701,13 @@ Revisions for r20140903 (6th beta) (3rd September 2014) - 'build' script: removed the parts that generated libreboot\_bin and added them to a new script: 'build-release' - Documentation: \#build updated to reflect the above. -- ~~Added all gcry\_\* modules to grub (luks/cryptomount): +- ~~Added all gcry\_* modules to grub (luks/cryptomount): gcry\_arcfour gcry\_camellia gcry\_crc gcry\_dsa gcry\_md4 gcry\_rfc2268 gcry\_rmd160 gcry\_seed gcry\_sha1 gcry\_sha512 gcry\_twofish gcry\_blowfish gcry\_cast5 gcry\_des gcry\_idea gcry\_md5 gcry\_rijndael gcry\_rsa gcry\_serpent gcry\_sha256 gcry\_tiger gcry\_whirlpool~~ -- Added GNUtoo's list of GRUB modules (includes all of the gcry\_\* +- Added GNUtoo's list of GRUB modules (includes all of the gcry\_* modules above), cryptomount should be working now. - Removed builddeb-bucts and builddeb-flashrom, merged them with builddeb ( updated accordingly) @@ -733,7 +733,7 @@ Revisions for r20140903 (6th beta) (3rd September 2014) for each system: one with text-mode, one with coreboot framebuffer. - Documentation: updated \#rom to reflect the above - Deleted unused README and COPYING file from main directory -- Removed some rm -Rf .git\* instructions from the get\* scripts and +- Removed some rm -Rf .git* instructions from the get* scripts and moved them to build-release script - Split up default grub.cfg into 6 parts: extra/{common.cfg,txtmode.cfg,vesafb.cfg} and @@ -828,7 +828,7 @@ Revisions for r20140729 (4th beta) (29th July 2014) needed. Removing it reduces the size of the archive. flashrom development should be upstream. - Added ROMs with Qwerty (Italian) layout in GRUB - (libreboot\*itqwerty.rom) + (libreboot*itqwerty.rom) - Added resources/utilities/i945gpu/intel-regs.py for debugging issues related to LCD panel compatibility on X60 Tablet and T60. (courtesy of [Michał Masłowski](http://mtjm.eu)) @@ -860,7 +860,7 @@ Revisions for r20140720 (3rd beta) (20th July 2014) coreboot\_usqwerty.rom and coreboot\_serial\_usqwerty.rom - coreboot\_dvorak and coreboot\_serial\_dvorak.rom renamed to coreboot\_usdvorak.rom and coreboot\_serial\_usdvorak.rom - - Renamed coreboot\*rom to libreboot\*rom + - Renamed coreboot*rom to libreboot*rom - Made flash, lenovobios\_firstflash and lenovobios\_secondflash scripts fail if the specified file does not exist. - Updated all relevant parts of the documentation to reflect the @@ -870,9 +870,9 @@ Revisions for r20140720 (3rd beta) (20th July 2014) - Updated buildrom-withgrub to use background.jpg instead of background.png - Updated buildrom-withgrub to use gnulove.jpg aswell -- Updated resources/grub/config/macbook21/grub\*cfg to use gnulove.jpg +- Updated resources/grub/config/macbook21/grub*cfg to use gnulove.jpg background. -- Updated resources/grub/config/{x60,t60,x60t}/grub\*cfg to use +- Updated resources/grub/config/{x60,t60,x60t}/grub*cfg to use background.jpg background. - Documentation: updated docs/\#grub\_custom\_keyboard to be more generally useful. @@ -925,10 +925,10 @@ Revisions for r20140711 (1st beta) (11th July 2014) macbook21 with Apple EFI firmware) and linked in in main index. - Documentation: added a copy of Mono's Coreboot page (for macbook21) and linked it in main index. -- T60: Copy CD option from the grub.cfg files for T60 \*serial\*.rom +- T60: Copy CD option from the grub.cfg files for T60 *serial*.rom images into the grub configs for non-serial images. (T60s have CD/DVD drive on main laptop) -- macbook21: remove options in build-macbook21 for \*serial\*.rom +- macbook21: remove options in build-macbook21 for *serial*.rom (there is no dock or serial port available for macbook21) - Added patches for backlight controls on X60 and T60 with help from Denis Carikli (see ./resources/libreboot/patch/gitdiff and ./getcb @@ -1069,7 +1069,7 @@ Revisions for r20140711 (1st beta) (11th July 2014) libreboot\_bin - Documentation: made docs/gnulinux/grub\_cbfs.html slightly easier to follow. -- Annotate the 'build\*' scripts with 'echo' commands, to help the +- Annotate the 'build*' scripts with 'echo' commands, to help the user understand what it actually happening during the build process. - Documentation: added information about how 'dmidecode' data was put in the coreboot configs @@ -1269,7 +1269,7 @@ Development notes The "Parse" options read ./isolinux/isolinux.cfg on a CD or USB, and automatically converts it to a grub config and switches to the boot menu -of that distro. This makes booting ISOs \*much\* easier than before. +of that distro. This makes booting ISOs *much* easier than before. [Back to top of page.](#pagetop) diff --git a/docs/bsd/freebsd.md b/docs/bsd/freebsd.md @@ -62,17 +62,17 @@ If you downloaded your ISO on a LibertyBSD or OpenBSD system, here is how to create the bootable FreeBSD USB drive: Connect the USB drive. Check dmesg:\ -**\$ dmesg | tail**\ +**$ dmesg | tail**\ Check to confirm which drive it is, for example, if you think its sd3:\ -**\$ disklabel sd3** +**$ disklabel sd3** Check that it wasn't automatically mounted. If it was, unmount it. For example:\ -**\$ doas umount /dev/sd3i**\ +**$ doas umount /dev/sd3i**\ dmesg told you what device it is. Overwrite the drive, writing the FreeBSD installer to it with dd. For example:\ -**\$ doas dd if=freebsd.img of=/dev/rsdXc bs=1M; sync**\ +**$ doas dd if=freebsd.img of=/dev/rsdXc bs=1M; sync**\ You should now be able to boot the installer from your USB drive. Continue reading, for information about how to do that. @@ -86,18 +86,18 @@ If you downloaded your ISO on a GNU+Linux system, here is how to create the bootable FreeBSD USB drive: Connect the USB drive. Check dmesg:\ -**\$ dmesg**\ +**$ dmesg**\ Check lsblk to confirm which drive it is:\ -**\$ lsblk** +**$ lsblk** Check that it wasn't automatically mounted. If it was, unmount it. For example:\ -**\$ sudo umount /dev/sdX\***\ -**\# umount /dev/sdX\*** +**$ sudo umount /dev/sdX***\ +**\# umount /dev/sdX*** dmesg told you what device it is. Overwrite the drive, writing your distro ISO to it with dd. For example:\ -**\$ sudo dd if=freebsd.img of=/dev/sdX bs=8M; sync**\ +**$ sudo dd if=freebsd.img of=/dev/sdX bs=8M; sync**\ **\# dd if=freebsd.img of=/dev/sdX bs=8M; sync** You should now be able to boot the installer from your USB drive. diff --git a/docs/bsd/index.md b/docs/bsd/index.md @@ -5,7 +5,7 @@ BSD projects This section relates to dealing with BSD projects: preparing bootable USB drives, changing the default GRUB menu and so on. -**This section is only for the \*GRUB\* payload. For depthcharge, +**This section is only for the *GRUB* payload. For depthcharge, instructions have yet to be written.** [Back to previous index](../). diff --git a/docs/bsd/netbsd.md b/docs/bsd/netbsd.md @@ -58,17 +58,17 @@ If you downloaded your ISO on a LibertyBSD or NetBSD system, here is how to create the bootable NetBSD USB drive: Connect the USB drive. Check dmesg:\ -**\$ dmesg | tail**\ +**$ dmesg | tail**\ Check to confirm which drive it is, for example, if you think its sd3:\ -**\$ disklabel sd3** +**$ disklabel sd3** Check that it wasn't automatically mounted. If it was, unmount it. For example:\ -**\$ doas umount /dev/sd3i**\ +**$ doas umount /dev/sd3i**\ dmesg told you what device it is. Overwrite the drive, writing the NetBSD installer to it with dd. For example:\ -**\$ doas netbsd.iso of=/dev/rsdXc bs=1M; sync**\ +**$ doas netbsd.iso of=/dev/rsdXc bs=1M; sync**\ You should now be able to boot the installer from your USB drive. Continue reading, for information about how to do that. @@ -82,18 +82,18 @@ If you downloaded your ISO on a GNU+Linux system, here is how to create the bootable NetBSD USB drive: Connect the USB drive. Check dmesg:\ -**\$ dmesg**\ +**$ dmesg**\ Check lsblk to confirm which drive it is:\ -**\$ lsblk** +**$ lsblk** Check that it wasn't automatically mounted. If it was, unmount it. For example:\ -**\$ sudo umount /dev/sdX\***\ -**\# umount /dev/sdX\*** +**$ sudo umount /dev/sdX***\ +**\# umount /dev/sdX*** dmesg told you what device it is. Overwrite the drive, writing your distro ISO to it with dd. For example:\ -**\$ sudo dd if=install60.fs of=/dev/sdX bs=8M; sync**\ +**$ sudo dd if=install60.fs of=/dev/sdX bs=8M; sync**\ **\# dd if=netbsd.iso of=/dev/sdX bs=8M; sync** You should now be able to boot the installer from your USB drive. diff --git a/docs/bsd/openbsd.md b/docs/bsd/openbsd.md @@ -40,17 +40,17 @@ If you downloaded your ISO on a LibertyBSD or OpenBSD system, here is how to create the bootable LibertyBSD/OpenBSD USB drive: Connect the USB drive. Check dmesg:\ -**\$ dmesg | tail**\ +**$ dmesg | tail**\ Check to confirm which drive it is, for example, if you think its sd3:\ -**\$ disklabel sd3** +**$ disklabel sd3** Check that it wasn't automatically mounted. If it was, unmount it. For example:\ -**\$ doas umount /dev/sd3i**\ +**$ doas umount /dev/sd3i**\ dmesg told you what device it is. Overwrite the drive, writing the OpenBSD installer to it with dd. For example:\ -**\$ doas dd if=install60.fs of=/dev/rsdXc bs=1M; sync**\ +**$ doas dd if=install60.fs of=/dev/rsdXc bs=1M; sync**\ You should now be able to boot the installer from your USB drive. Continue reading, for information about how to do that. @@ -81,18 +81,18 @@ If you downloaded your ISO on a GNU+Linux system, here is how to create the bootable OpenBSD USB drive: Connect the USB drive. Check dmesg:\ -**\$ dmesg**\ +**$ dmesg**\ Check lsblk to confirm which drive it is:\ -**\$ lsblk** +**$ lsblk** Check that it wasn't automatically mounted. If it was, unmount it. For example:\ -**\$ sudo umount /dev/sdX\***\ -**\# umount /dev/sdX\*** +**$ sudo umount /dev/sdX***\ +**\# umount /dev/sdX*** dmesg told you what device it is. Overwrite the drive, writing your distro ISO to it with dd. For example:\ -**\$ sudo dd if=install60.fs of=/dev/sdX bs=8M; sync**\ +**$ sudo dd if=install60.fs of=/dev/sdX bs=8M; sync**\ **\# dd if=install60.fs of=/dev/sdX bs=8M; sync** You should now be able to boot the installer from your USB drive. diff --git a/docs/future/index.md b/docs/future/index.md @@ -324,10 +324,10 @@ getting this output. Get intelvbttool here: <http://review.coreboot.org/#/c/5842> (util/intelvbttool). -Now dump a copy of the running VGA BIOS: **\$ sudo dd if=/dev/mem bs=64k +Now dump a copy of the running VGA BIOS: **$ sudo dd if=/dev/mem bs=64k of=runningvga.bin skip=12 count=1**\ Then do (and record the output):\ -**\$ ./intelvbttool runningvga.bin > intelvbttool\_out** +**$ ./intelvbttool runningvga.bin > intelvbttool\_out** Backup both files (runningvga.bin and intelvbttool\_out), renaming them to match the system and LCD panel used. diff --git a/docs/git/index.md b/docs/git/index.md @@ -33,11 +33,11 @@ statically compiled executables for the utilities are included.** For Debian Stretch (may also work on Debian Jessie), you can run the following command:\ -\$ **sudo ./oldbuild dependencies debian**\ +$ **sudo ./oldbuild dependencies debian**\ (this will also work in Devuan) For Parabola, you can run the following command:\ -\$ **sudo ./oldbuild dependencies parabola**\ +$ **sudo ./oldbuild dependencies parabola**\ or:\ \# **./oldbuild dependencies parabola** @@ -64,21 +64,21 @@ First, [install the build dependencies](#build_dependencies). Since libreboot makes extensive use of git, you need to configure git properly. If you have not yet configured git, then the minimum requirement is:\ -\$ **git config \--global user.name "Your Name"**\ -\$ **git config \--global user.email your@emailaddress.com**\ +$ **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 <http://git-scm.com/doc>. Another nice config for you (optional, but recommended):\ -\$ **git config \--global core.editor nano**\ -\$ **git config \--global color.status auto**\ -\$ **git config \--global color.branch auto**\ -\$ **git config \--global color.interactive auto**\ -\$ **git config \--global color.diff auto** +$ **git config \--global core.editor nano**\ +$ **git config \--global color.status auto**\ +$ **git config \--global color.branch auto**\ +$ **git config \--global color.interactive auto**\ +$ **git config \--global color.diff auto** After that, run the script:\ -\$ **./download all** +$ **./download all** What this did was download everything (grub, coreboot, memtest86+, bucts, flashrom) at the versions last tested for this release, and patch @@ -102,7 +102,7 @@ a register in the chipset on some Intel systems. Bucts is needed when flashing in software the X60/X60S/X60T/T60 ROM while Lenovo BIOS is running; external flashing will be safe regardless. Each ROM contains identical data inside the two final 64K region in the -file\*. This corresponds to the final two 64K regions in the flash chip. +file*. This corresponds to the final two 64K regions in the flash chip. Lenovo BIOS will prevent you from writing the final one, so running "**bucts 1**" will set the system to boot from the other block instead (which is writeable along with everything beneath it when using a @@ -112,7 +112,7 @@ final 64K block is writeable so you flash the ROM again with an unpatched flashrom and run "**bucts 0**" to make the system boot from the normal (highest) block again. -\*Libreboot ROM images have identical data in those two 64KiB regions +*Libreboot ROM images have identical data in those two 64KiB regions because dd is used to do that, by the build system. If you're building from upstream (coreboot), you have to do it manually. @@ -137,10 +137,10 @@ If you have the binary release archive, you'll find executables under First, [install the build dependencies](#build_dependencies). To build bucts, do this in the main directory:\ -\$ **./oldbuild module bucts** +$ **./oldbuild module bucts** To statically compile it, do this:\ -\$ **./oldbuild module bucts static** +$ **./oldbuild module bucts static** The "builddeps" script in libreboot\_src also makes use of builddeps-bucts. @@ -168,10 +168,10 @@ flashrom from source, continue reading. First, [install the build dependencies](#build_dependencies). To build it, do the following in the main directory:\ -\$ **./oldbuild module flashrom** +$ **./oldbuild module flashrom** To statically compile it, do the following in the main directory:\ -\$ **./oldbuild module flashrom static** +$ **./oldbuild module flashrom static** After you've done that, under ./flashrom/ you will find the following executables: @@ -215,24 +215,24 @@ If you downloaded libreboot from git, refer to [\#build\_meta](#build_meta). Build all of the components used in libreboot:\ -\$ **./oldbuild module all** +$ **./oldbuild module all** You can also build each modules separately, using *./oldbuild module modulename*. To see the possible values for *modulename*, use:\ -\$ **./oldbuild module list** +$ **./oldbuild module list** After that, build the ROM images (for all boards):\ -\$ **./oldbuild roms withgrub**\ +$ **./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**\ +$ **./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/**. To clean (reverse) everything, do the following:\ -\$ **./oldbuild clean all** +$ **./oldbuild clean all** The ROM images will be stored under **bin/*payload*/**, where *payload* could be *grub*, *seabios*, or whatever other payload those images were @@ -243,47 +243,47 @@ Preparing release archives (optional) ------------------------------------- **This is only confirmed to work (tested) in Debian Stretch. Parabola -\*fails\* at this stage (for now). For all other distros, YMMV. This +*fails* at this stage (for now). For all other distros, YMMV. This will also work in Devuan.** This is mainly intended for use with the git repository. These commands will work in the release archive (\_src), unless otherwise noted below. -The archives will appear under *release/oldbuildsystem/\${version}/*; -\${version} will either be set using *git describe* or, if a *version* +The archives will appear under *release/oldbuildsystem/${version}/*; +${version} will either be set using *git describe* or, if a *version* file already exists (\_src release archive), then it will simply re-use that. Tag the current commit, and that version will appear in both the -\${version} string on the directory under *release/oldbuildsystem/*, and +${version} string on the directory under *release/oldbuildsystem/*, and in the file names of the archives. Otherwise, whatever git uses for *git describe \--tags HEAD* will be used. Utilities (static executables):\ -\$ **./oldbuild release util** +$ **./oldbuild release util** Archive containing flashrom and bucts source code:\ -\$ **./oldbuild release tobuild** +$ **./oldbuild release tobuild** Documentation archive (**does not work on \_src release archive, only git**):\ -\$ **./oldbuild release docs** +$ **./oldbuild release docs** ROM image archives:\ -\$ **./oldbuild release roms** +$ **./oldbuild release roms** Source code archive:\ -\$ **./oldbuild release src** +$ **./oldbuild release src** SHA512 sums of all other release archives that have been generated:\ -\$ **./oldbuild release sha512sums** +$ **./oldbuild release sha512sums** If you are building on an i686 host, this will build statically linked 32-bit binaries in the binary release archive that you created, for: **nvramtool, cbfstool, ich9deblob, cbmem**. If you are building on an x86\_64 host, this will build statically -linked 32- \*and\* 64-bit binaries for **cbmem**, **ich9deblob**, +linked 32- *and* 64-bit binaries for **cbmem**, **ich9deblob**, **cbfstool** and **nvramtool**. **To include statically linked i686 and x86\_64 binaries for bucts and @@ -305,8 +305,8 @@ libreboot\_util, for: If you are building binaries on a live system or chroot (for flashrom/bucts), you can use the following to statically link them:\ -\$ **./oldbuild module flashrom static**\ -\$ **./oldbuild module bucts static** +$ **./oldbuild module flashrom static**\ +$ **./oldbuild module bucts static** The same conditions as above apply for ARM (except, building bucts on ARM is pointless, and for flashrom you only need the normal executable @@ -316,7 +316,7 @@ restrictions). The command that you used for generating the release archives will also run the following command:\ -\$ **./oldbuild release tobuild**\ +$ **./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 @@ -306,7 +306,7 @@ Restart journald:\ \# **systemctl restart systemd-journald** The wiki recommends that if the journal gets too large, you can also -simply delete (rm -Rf) everything inside /var/log/journald/\* but +simply delete (rm -Rf) everything inside /var/log/journald/* but recommends backing it up. This shouldn't be necessary, since you already set the size limit above and systemd will automatically start to delete older records when the journal size reaches it's limit @@ -591,7 +591,7 @@ I didn't want the following, so I removed them:\ \# **pacman -R lxmusic lxtask** I also lazily installed all fonts:\ -\# **pacman -S \$(pacman -Ssq ttf-)** +\# **pacman -S $(pacman -Ssq ttf-)** And a mail client:\ \# **pacman -S icedove** @@ -613,7 +613,7 @@ start lxde without lxdm. Read <https://wiki.archlinux.org/index.php/Xinitrc>. Open LXterminal:\ -\$ **cp /etc/skel/.xinitrc \~**\ +$ **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\ @@ -624,7 +624,7 @@ export LANG=en\_GB.UTF-8\ \# Start lxde desktop\ exec startlxde\ * Now make sure that it is executable:\ -\$ **chmod +x .xinitrc** +$ **chmod +x .xinitrc** [Back to top of page.](#pagetop) diff --git a/docs/gnulinux/encrypted_debian.md b/docs/gnulinux/encrypted_debian.md @@ -36,7 +36,7 @@ boot** [This guide](grub_boot_installer.html) shows how to create a boot USB drive with the Debian ISO image. -**This guide is \*only\* for the GRUB payload. If you use the +**This guide is *only* for the GRUB payload. If you use the depthcharge payload, ignore this section entirely.** Note: on some thinkpads, a faulty DVD drive can cause the cryptomount -a @@ -203,7 +203,7 @@ If you didn't encrypt your home directory, then you can safely ignore this section. Immediately after logging in, do that:\ -\$ **sudo ecryptfs-unwrap-passphrase** +$ **sudo ecryptfs-unwrap-passphrase** This will be needed in the future if you ever need to recover your home directory from another system, so write it down and keep the note diff --git a/docs/gnulinux/encrypted_parabola.md b/docs/gnulinux/encrypted_parabola.md @@ -17,7 +17,7 @@ volume. Not so with libreboot! Since GRUB is already included directly as a payload, even /boot can be encrypted. This protects /boot from tampering by someone with physical access to the system. -**This guide is \*only\* for the GRUB payload. If you use the +**This guide is *only* for the GRUB payload. If you use the depthcharge payload, ignore this section entirely.** This guide is intended for the Parabola distribution, but it should also @@ -526,11 +526,11 @@ 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* would be really nice):\ -\$ **./cbfstool libreboot.rom print**\ +$ **./cbfstool libreboot.rom print**\ Extract grubtest.cfg:\ -\$ **./cbfstool libreboot.rom extract -n grubtest.cfg -f grubtest.cfg**\ +$ **./cbfstool libreboot.rom extract -n grubtest.cfg -f grubtest.cfg**\ And modify:\ -\$ **vi grubtest.cfg** +$ **vi grubtest.cfg** In grubtest.cfg, inside the 'Load Operating System' menu entry, change the contents to: @@ -559,9 +559,9 @@ hardening your GRUB configuration, for security purposes. Save your changes in grubtest.cfg, then delete the unmodified config from the ROM image:\ -\$ **./cbfstool libreboot.rom remove -n grubtest.cfg**\ +$ **./cbfstool libreboot.rom remove -n grubtest.cfg**\ and insert the modified grubtest.cfg:\ -\$ **./cbfstool libreboot.rom add -n grubtest.cfg -f grubtest.cfg -t +$ **./cbfstool libreboot.rom add -n grubtest.cfg -f grubtest.cfg -t raw**\ Now refer to <http://libreboot.org/docs/install/#flashrom>. Cd (up) to @@ -584,7 +584,7 @@ LUKS passphrase and login as root/your user. All went well? Great! If it does not work like you want it to, if you are unsure or sceptical in any way, don't despair: you have been wise and did not brick your device! Reboot and login the default way, and then modify your -grubtest.cfg until you get it right! **Do \*not\* proceed past this +grubtest.cfg until you get it right! **Do *not* proceed past this point unless you are 100% sure that your new configuration is safe (or desirable) to use.** @@ -597,13 +597,13 @@ 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 +$ **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**\ Delete the grub.cfg that remained inside the ROM:\ -\$ **./cbfstool libreboot.rom remove -n grub.cfg**\ +$ **./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**\ +$ **./cbfstool libreboot.rom add -n grub.cfg -f grub.cfg -t raw**\ Now you have a modified ROM. Once more, refer to <http://libreboot.org/docs/install/#flashrom>. Cd to the libreboot\_util diff --git a/docs/gnulinux/grub_boot_installer.md b/docs/gnulinux/grub_boot_installer.md @@ -31,18 +31,18 @@ If you downloaded your ISO on an existing GNU+Linux system, here is how to create the bootable GNU+Linux USB drive: Connect the USB drive. Check dmesg:\ -**\$ dmesg**\ +**$ dmesg**\ Check lsblk to confirm which drive it is:\ -**\$ lsblk** +**$ lsblk** Check that it wasn't automatically mounted. If it was, unmount it. For example:\ -**\$ sudo umount /dev/sdX\***\ -**\# umount /dev/sdX\*** +**$ sudo umount /dev/sdX***\ +**\# umount /dev/sdX*** dmesg told you what device it is. Overwrite the drive, writing your distro ISO to it with dd. For example:\ -**\$ sudo dd if=gnulinux.iso of=/dev/sdX bs=8M; sync**\ +**$ sudo dd if=gnulinux.iso of=/dev/sdX bs=8M; sync**\ **\# dd if=gnulinux.iso of=/dev/sdX bs=8M; sync** You should now be able to boot the installer from your USB drive. @@ -74,17 +74,17 @@ If you downloaded your ISO on a LibertyBSD or OpenBSD system, here is how to create the bootable GNU+Linux USB drive: Connect the USB drive. Check dmesg:\ -**\$ dmesg | tail**\ +**$ dmesg | tail**\ Check to confirm which drive it is, for example, if you think its sd3:\ -**\$ disklabel sd3** +**$ disklabel sd3** Check that it wasn't automatically mounted. If it was, unmount it. For example:\ -**\$ doas umount /dev/sd3i**\ +**$ doas umount /dev/sd3i**\ dmesg told you what device it is. Overwrite the drive, writing the OpenBSD installer to it with dd. For example:\ -**\$ doas dd if=gnulinux.iso of=/dev/rsdXc bs=1M; sync**\ +**$ doas dd if=gnulinux.iso of=/dev/rsdXc bs=1M; sync**\ You should now be able to boot the installer from your USB drive. Continue reading, for information about how to do that. diff --git a/docs/gnulinux/grub_cbfs.md b/docs/gnulinux/grub_cbfs.md @@ -24,7 +24,7 @@ the libreboot GRUB payload will automatically search for. Here is an excellent writeup about CBFS (coreboot filesystem): <http://lennartb.home.xs4all.nl/coreboot/col5.html>. -**This guide is \*only\* for the GRUB payload. If you use the +**This guide is *only* for the GRUB payload. If you use the depthcharge payload, ignore this section entirely.** [Back to previous index](./) @@ -141,7 +141,7 @@ image file is named *libreboot.rom*, so please make sure to adapt. ROM images are included pre-compiled in libreboot. You can also dump your current firmware, using flashrom:\ -\$ **sudo flashrom -p internal -r libreboot.rom**\ +$ **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:\ @@ -155,7 +155,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** The files *grub.cfg* and *grubtest.cfg* should be present. grub.cfg is @@ -164,7 +164,7 @@ this tutorial, you will first modify and test *grubtest.cfg*. This is to reduce the possibility of bricking your device, so DO NOT SKIP THIS! Extract grubtest.cfg from the ROM image:\ -**\$ ./cbfstool libreboot.rom extract -n grubtest.cfg -f grubtest.cfg** +**$ ./cbfstool libreboot.rom extract -n grubtest.cfg -f grubtest.cfg** Modify the grubtest.cfg accordingly. @@ -177,10 +177,10 @@ Re-insert the modified grubtest.cfg into the ROM image {#reinsert_modified_testc Once your grubtest.cfg is modified and saved, delete the unmodified config from the ROM image:\ -**\$ ./cbfstool libreboot.rom remove -n grubtest.cfg** +**$ ./cbfstool libreboot.rom remove -n grubtest.cfg** Next, insert the modified version:\ -**\$ ./cbfstool libreboot.rom add -n grubtest.cfg -f grubtest.cfg -t +**$ ./cbfstool libreboot.rom add -n grubtest.cfg -f grubtest.cfg -t raw** [Back to top of page.](#pagetop) @@ -193,7 +193,7 @@ Testing **Now you have a modified ROM. Refer back to [../install/\#flashrom](../install/#flashrom) for information on how to flash it.\ -\$ **cd /libreboot\_util** \# **./flash update libreboot.rom**\ +$ **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:\ @@ -207,7 +207,7 @@ works, then your config is safe and you can continue below. **If it does not work like you want it to, if you are unsure or sceptical in any way, then re-do the steps above until you get it right! -Do \*not\* proceed past this point unless you are 100% sure that your +Do *not* proceed past this point unless you are 100% sure that your new configuration is safe (or desirable) to use.** [Back to top of page.](#pagetop) @@ -225,15 +225,15 @@ 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 +$ **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**\ Delete the grub.cfg that remained inside the ROM:\ -**\$ ./cbfstool libreboot.rom remove -n grub.cfg** +**$ ./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** +**$ ./cbfstool libreboot.rom add -n grub.cfg -f grub.cfg -t raw** **Now you have a modified ROM. Again, refer back to [../install/\#flashrom](../install/#flashrom) for information on how to diff --git a/docs/gnulinux/index.md b/docs/gnulinux/index.md @@ -5,7 +5,7 @@ GNU+Linux distributions This section relates to dealing with GNU+Linux distributions: preparing bootable USB drives, changing the default GRUB menu and so on. -**This section is only for the \*GRUB\* payload. For depthcharge, +**This section is only for the *GRUB* payload. For depthcharge, instructions have yet to be written.** [Back to previous index](../). diff --git a/docs/grub/index.md b/docs/grub/index.md @@ -47,14 +47,14 @@ one](http://sourceforge.net/projects/dejavu/files/dejavu/2.34/dejavu-fonts-ttf-2 This is a free font that is also contained in GNU+Linux distributions like Debian, Devuan or Parabola. -**\$ cd libreboot\_src/grub**\ +**$ cd libreboot\_src/grub**\ compile grub (the build scripts info on how to do this)\ come back out into libreboot\_src/resources/grub:\ -**\$ cd ../libreboot\_src/resources/grub/font** +**$ cd ../libreboot\_src/resources/grub/font** I took Dejavu Sans Mono from dejavu (included in this version of libreboot) and did:\ -**\$ ../../../grub/grub-mkfont -o dejavusansmono.pf2 +**$ ../../../grub/grub-mkfont -o dejavusansmono.pf2 dejavu-fonts-ttf-2.34/ttf/DejaVuSansMono.ttf** I then added the instructions to 'gen.sh' script in grub-assemble to @@ -78,7 +78,7 @@ Custom keyboard layout in GRUB (for reference) {#grub_custom_keyboard} Keymaps are stored in resources/utilities/grub-assemble/keymap/. Example (French Azerty):\ -**\$ ckbcomp fr > frazerty**\ +**$ ckbcomp fr > frazerty**\ \ Go in grub directory:\ **cat frazerty | ./grub/grub-mklayout -o frazerty.gkb** @@ -106,7 +106,7 @@ ukdvorak had to be created manually, based on usdvorak. diff them (under resources/utilities/grub-assemble/keymap/original) to see how ukdvorak file was created -**\$ cat ukdvorak | ./grub/grub-mklayout -o ukdvorak.gkb** +**$ cat ukdvorak | ./grub/grub-mklayout -o ukdvorak.gkb** [Back to top of page](#pagetop) diff --git a/docs/hardware/t60_security.md b/docs/hardware/t60_security.md @@ -322,8 +322,8 @@ Explain that black hats, TAO, and so on might use a 0day to get in, and explain that in this case it mitigates what the attacker can do. Also the TAO do some evaluation before launching an attack: they take the probability of beeing caught into account, along with the kind of -target. A 0day costs a lot of money, I heard that it was from 100000\$ -to 400000\$, some other websites had prices 10 times lower but that but +target. A 0day costs a lot of money, I heard that it was from 100000$ +to 400000$, some other websites had prices 10 times lower but that but it was probably a typo. So if people increase their security it makes it more risky and more costly to attack people. diff --git a/docs/hardware/x60_security.md b/docs/hardware/x60_security.md @@ -229,8 +229,8 @@ Explain that black hats, TAO, and so on might use a 0day to get in, and explain that in this case it mitigates what the attacker can do. Also the TAO do some evaluation before launching an attack: they take the probability of beeing caught into account, along with the kind of -target. A 0day costs a lot of money, I heard that it was from 100000\$ -to 400000\$, some other websites had prices 10 times lower but that but +target. A 0day costs a lot of money, I heard that it was from 100000$ +to 400000$, some other websites had prices 10 times lower but that but it was probably a typo. So if people increase their security it makes it more risky and more costly to attack people. diff --git a/docs/hcl/gm45_remove_me.md b/docs/hcl/gm45_remove_me.md @@ -41,11 +41,11 @@ 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**\ +$ **./oldbuild module ich9deblob**\ The executable will appear under resources/utilities/ich9deblob/ Run:\ -\$ **./ich9gen** +$ **./ich9gen** Running ich9gen this way (without any arguments) generates a default descriptor+gbe image with a generic MAC address. You probably don't @@ -71,7 +71,7 @@ On GM45 laptops that use flash descriptors, the MAC address or the onboard ethernet chipset is flashed (inside the ROM image). You should 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**\ +$ **./ich9gen \--macaddress XX:XX:XX:XX:XX:XX**\ (replace the XX chars with the hexadecimal chars in the MAC address that you want) @@ -88,13 +88,13 @@ 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 +$ **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**\ Your libreboot.rom image is now ready to be flashed on the system. Refer @@ -125,7 +125,7 @@ for the following lines: NOTE: When you write-protect the flash chip, re-flashing is no longer possible unless you use dedicated external equipment, which also means disassembling the laptop. The same equipment can also be used to remove -the write-protection later on, if you choose to do so. \*Only\* +the write-protection later on, if you choose to do so. *Only* write-protect the chip if you have the right equipment for external flashing later on; for example, see [../install/bbb\_setup.html](../install/bbb_setup.html). @@ -166,7 +166,7 @@ If you are working with libreboot\_src (or git), you can find the source under resources/utilities/ich9deblob/ and will already be compiled if you ran **./oldbuild module all** or **./oldbuild module ich9deblob** from the main directory (./), otherwise you can build it like so:\ -\$ **./oldbuild module ich9deblob**\ +$ **./oldbuild module ich9deblob**\ An executable file named **ich9deblob** will now appear under resources/utilities/ich9deblob/ @@ -178,7 +178,7 @@ Place the factory.rom from your system (can be obtained using the external flashing guides for GM45 targets linked [../install/](../install/)) in the directory where you have your ich9deblob executable, then run the tool:\ -\$ **./ich9deblob** +$ **./ich9deblob** A 12kiB file named **deblobbed\_descriptor.bin** will now appear. **Keep this and the factory.rom stored in a safe location!** The first 4KiB @@ -195,11 +195,11 @@ 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 +$ **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 +GbE defined), do this: $ **dd if=deblobbed\_4kdescriptor.bin of=libreboot.rom bs=1 count=4k conv=notrunc** The utility will also generate 4 additional files: @@ -234,12 +234,12 @@ descriptor locks some regions. The idea is that doing this will remove all of those restrictions. Simply run (with factory.rom in the same directory):\ -\$ **./demefactory** +$ **./demefactory** 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** TODO: test this.\ @@ -423,7 +423,7 @@ The first part is the MAC address set to all 0x1F. It's repeated haly way through the 8K area, and the rest is all 0xFF. This is all documented in the datasheet. -The GBe region starts at 0x20A000 bytes from the \*end\* of a factory +The GBe region starts at 0x20A000 bytes from the *end* of a factory image and is 0x2000 bytes long. In libreboot (deblobbed) the descriptor is set to put gbe directly after the initial 4K flash descriptor. So the first 4K of the ROM is the descriptor, and then the next 8K is the gbe @@ -449,7 +449,7 @@ regions match BABA, however. By default, the X200 (as shipped by Lenovo) actually has an invalid main gbe checksum. The backup gbe region is correct, and is what these systems default to. Basically, you should do what you need on the -\*backup\* gbe region, and then correct the main one by copying from the +*backup* gbe region, and then correct the main one by copying from the backup. Look at resources/utilities/ich9deblob/ich9deblob.c. diff --git a/docs/hcl/index.md b/docs/hcl/index.md @@ -439,8 +439,8 @@ the macbook2,1. They are included here in case the main site goes down 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 +**$ 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 restricts using robots.txt diff --git a/docs/hcl/kgpe-d16.md b/docs/hcl/kgpe-d16.md @@ -144,8 +144,8 @@ The information here is adapted, from the ASUS website. - **Total Slots:** 16 (4-channel per CPU, 8 DIMM per CPU), ECC - **Capacity:** Maximum up to 256GB RDIMM - **Memory Type that is compatible:** - - DDR3 1600/1333/1066/800 UDIMM\* - - DDR3 1600/1333/1066/800 RDIMM\* + - DDR3 1600/1333/1066/800 UDIMM* + - DDR3 1600/1333/1066/800 RDIMM* - **Compatible sizes per memory module:** - 16GB, 8GB, 4GB, 3GB, 2GB, 1GB RDIMM - 8GB, 4GB, 2GB, 1GB UDIMM @@ -223,7 +223,7 @@ The information here is adapted, from the ASUS website. ### Note: -- \* DDR3 1600 can only be supported with AMD Opteron 6300/6200 series +- * DDR3 1600 can only be supported with AMD Opteron 6300/6200 series processor diff --git a/docs/hcl/t500.md b/docs/hcl/t500.md @@ -82,8 +82,8 @@ The patches above are based on the output from ich9deblob on a factory.rom image dumped from the T500 with a SOIC-8 4MiB flash chip. The patch re-creates the X200 descriptor/gbe source, so the commands were something like:\ -\$ **diff -u t500gbe x200gbe**\ -\$ **diff -u t500descriptor x200descriptor** +$ **diff -u t500gbe x200gbe**\ +$ **diff -u t500descriptor x200descriptor** ME VSCC table is in a different place and a different size on the T500. Libreboot disables and removes the ME anyway, so it doesn't matter. diff --git a/docs/hcl/x200.md b/docs/hcl/x200.md @@ -5,7 +5,7 @@ ThinkPad X200 It is believed that all X200 laptops are compatible. X200S and X200 Tablet will also work, [depending on the configuration](#x200s). -It \*might\* be possible to put an X200 motherboard in an X201 chassis, +It *might* be possible to put an X200 motherboard in an X201 chassis, though this is currently untested by the libreboot project. The same may also apply between X200S and X201S; again, this is untested. **It's most likely true.** @@ -258,8 +258,8 @@ 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'** +$ **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/index.md b/docs/index.md @@ -177,7 +177,7 @@ If it exists, you can also extract this *lbversion* file by using the *cbfstool* utility which libreboot includes, from a ROM image that you either dumped or haven't flashed yet. In your distribution, run cbfstool on your ROM image (*libreboot.rom*, in this example):\ -\$ **./cbfstool libreboot.rom extract -n lbversion -f lbversion**\ +$ **./cbfstool libreboot.rom extract -n lbversion -f lbversion**\ You will now have a file, named *lbversion*, which you can read in whatever program it is that you use for reading/writing text files. diff --git a/docs/install/bbb_setup.md b/docs/install/bbb_setup.md @@ -119,10 +119,10 @@ Short PS\_ON\# / Power on (green wire; pin 16 on 24-pin ATX PSU, or pin it) using a wire/paperclip/jumper, then power on the PSU by grounding PS\_ON\# (this is also how an ATX motherboard turns on a PSU). -**DO \*\*NOT\*\* use pin 4, 6, do \*\*NOT\*\* use pin 19 or 20 (on a -20-pin ATX PSU), and DO \*\*NOT\*\* use pin 21, 22 or 23 (on a 24-pin -ATX PSU). Those wires (the red ones) are 5V, and they \*\*WILL\*\* kill -your flash chip. \*\*\*NEVER\*\*\* supply more than 3.3V to your flash +**DO **NOT** use pin 4, 6, do **NOT** use pin 19 or 20 (on a +20-pin ATX PSU), and DO **NOT** use pin 21, 22 or 23 (on a 24-pin +ATX PSU). Those wires (the red ones) are 5V, and they **WILL** kill +your flash chip. ***NEVER*** supply more than 3.3V to your flash chip (that is, if it's a 3.3V flash chip; 5V and 1.8V SPI flash chips do exist, but they are rare. Always check what voltage your chip takes. Most of them take 3.3V).** @@ -211,14 +211,14 @@ contents of this file with: Run **apt-get update** and **apt-get upgrade** then reboot the BBB, before continuing. Check that the firmware exists:\ -\# **ls /lib/firmware/BB-SPI0-01-00A0.\***\ +\# **ls /lib/firmware/BB-SPI0-01-00A0.***\ Output: /lib/firmware/BB-SPI0-01-00A0.dtbo 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: 0: 54:PF--- @@ -230,7 +230,7 @@ Output: 7: ff:P-O-L Override Board Name,00A0,Override Manuf,BB-SPI0-01 Verify that the spidev device now exists:\ -\# **ls -al /dev/spid\***\ +\# **ls -al /dev/spid***\ Output: crw-rw---T 1 root spi 153, 0 Nov 19 21:07 /dev/spidev1.0 diff --git a/docs/install/index.md b/docs/install/index.md @@ -86,9 +86,9 @@ Libreboot comes with ROM images built for QEMU, by default: Examples of how to use libreboot ROM images in QEMU: -- \$ **qemu-system-i386 -M q35 -m 512 -bios +- $ **qemu-system-i386 -M q35 -m 512 -bios qemu\_q35\_ich9\_keymap\_mode.rom** -- \$ **qemu-system-i386 -M pc -m 512 -bios +- $ **qemu-system-i386 -M pc -m 512 -bios qemu\_i440fx\_piix4\_keymap\_mode.rom** You can optionally specify the **-serial stdio** argument, so that QEMU @@ -274,14 +274,14 @@ executables from the libreboot source code archives. How to update the flash chip contents:\ -\$ **sudo ./flash update [yourrom.rom](#rom)** +$ **sudo ./flash update [yourrom.rom](#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:\ -\$ **sudo ./flash forceupdate [yourrom.rom](#rom)** +$ **sudo ./flash forceupdate [yourrom.rom](#rom)** @@ -321,7 +321,7 @@ https://notabug.org/vimuser/libreboot/raw/9d850543ad90b72e0e333c98075530b31e5d23 && chmod +x flash*** The first half of the procedure is as follows:\ -\$ **sudo ./flash i945lenovo\_firstflash [yourrom.rom](#rom).** +$ **sudo ./flash i945lenovo\_firstflash [yourrom.rom](#rom).** @@ -340,15 +340,15 @@ See this link for more details: If the above is what you see, then **SHUT DOWN**. Wait a few seconds, and then boot; libreboot is running, but there is a 2nd procedure -**\*needed\*** (see below). +***needed*** (see below). When you have booted up again, you must also do this:\ -\$ **sudo ./flash i945lenovo\_secondflash [yourrom.rom](#rom)** +$ **sudo ./flash i945lenovo\_secondflash [yourrom.rom](#rom)** If flashing fails at this stage, try the following:\ -\$ **sudo ./flashrom/i686/flashrom -p +$ **sudo ./flashrom/i686/flashrom -p internal:laptop=force\_I\_want\_a\_brick -w [yourrom.rom](#rom)** @@ -394,7 +394,7 @@ with your device. Use this flashing script, to install libreboot:\ -\$ **sudo ./flash i945apple\_firstflash [yourrom.rom](#rom)** +$ **sudo ./flash i945apple\_firstflash [yourrom.rom](#rom)** diff --git a/docs/install/r400_external.md b/docs/install/r400_external.md @@ -255,7 +255,7 @@ Note: the **-c** option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in *flashchips.c* have been removed.\ Now compare the 3 images:\ -\# **sha512sum factory\*.rom**\ +\# **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 diff --git a/docs/install/rpi_setup.md b/docs/install/rpi_setup.md @@ -18,7 +18,7 @@ SOIC-16). [](#raspberry-pi-thinkpad-x60t60-and-macbook-21){#user-content-raspberry-pi-thinkpad-x60t60-and-macbook-21 .anchor}Raspberry Pi (ThinkPad X60/T60 and Macbook 2,1) ------------------------------------------------------------------------------------------------------------------------------------------------------------------ -The Raspberry Pi (a multipurpose \$25 GNU+Linux computer) can be used as +The Raspberry Pi (a multipurpose $25 GNU+Linux computer) can be used as a BIOS flashing tool, thanks to its GPIO pins and SPI support. > **Note:** The Raspberry Pi Model A is not supported, since it has no @@ -351,13 +351,13 @@ for great good! [](#raspberry-pi-c720-chromebook){#user-content-raspberry-pi-c720-chromebook .anchor}Raspberry Pi (C720 Chromebook) ------------------------------------------------------------------------------------------------------------------- -The Raspberry Pi (a multipurpose \$25 GNU+Linux computer) can be used as +The Raspberry Pi (a multipurpose $25 GNU+Linux computer) can be used as a BIOS flashing tool, thanks to its GPIO pins and SPI support. ### [](#what-you-need){#user-content-what-you-need .anchor}What you need -- \$25 - Raspberry Pi Model B (Rev.2 or higher) -- \$10-20 - SOIC-8 Pomona Clip +- $25 - Raspberry Pi Model B (Rev.2 or higher) +- $10-20 - SOIC-8 Pomona Clip - Usually comes bundled with nice, color-colored *female to female* wires @@ -367,8 +367,8 @@ GPIO Pinouts: ![](images/rpi/0009.png) ![](images/rpi/0010.png) -> \*Diagram made by ["Pacman" from Win-Raid -> Forums\*](http://www.win-raid.com/t58f16-Guide-Recover-from-failed-BIOS-flash-using-Raspberry-PI.html) +> *Diagram made by ["Pacman" from Win-Raid +> Forums*](http://www.win-raid.com/t58f16-Guide-Recover-from-failed-BIOS-flash-using-Raspberry-PI.html) SOIC Pinouts: diff --git a/docs/install/t400_external.md b/docs/install/t400_external.md @@ -261,7 +261,7 @@ Note: the **-c** option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in *flashchips.c* have been removed.\ Now compare the 3 images:\ -\# **sha512sum factory\*.rom**\ +\# **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 diff --git a/docs/install/t500_external.md b/docs/install/t500_external.md @@ -266,7 +266,7 @@ Note: the **-c** option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in *flashchips.c* have been removed.\ Now compare the 3 images:\ -\# **sha512sum factory\*.rom**\ +\# **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 diff --git a/docs/install/t60_unbrick.md b/docs/install/t60_unbrick.md @@ -23,7 +23,7 @@ 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 +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 @@ -31,14 +31,14 @@ 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 +*Those dd commands should be applied to all newly compiled T60 ROM images (the ROM images in libreboot binary archives already have this applied!):\ -dd if=coreboot.rom of=top64k.bin bs=1 skip=\$\[\$(stat -c %s +dd if=coreboot.rom of=top64k.bin bs=1 skip=$\[$(stat -c %s coreboot.rom) - 0x10000\] count=64k\ -dd if=coreboot.rom bs=1 skip=\$\[\$(stat -c %s coreboot.rom) - 0x20000\] +dd if=coreboot.rom bs=1 skip=$\[$(stat -c %s coreboot.rom) - 0x20000\] count=64k | hexdump\ -dd if=top64k.bin of=coreboot.rom bs=1 seek=\$\[\$(stat -c %s +dd if=top64k.bin of=coreboot.rom bs=1 seek=$\[$(stat -c %s coreboot.rom) - 0x20000\] count=64k conv=notrunc\ (doing this makes the ROM suitable for use when flashing a system that still has Lenovo BIOS running, using those instructions: diff --git a/docs/install/x200_external.md b/docs/install/x200_external.md @@ -195,7 +195,7 @@ Note: the **-c** option is not required in libreboot's patched flashrom, because the redundant flash chip definitions in *flashchips.c* have been removed.\ Now compare the 3 images:\ -\# **sha512sum factory\*.rom**\ +\# **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 diff --git a/docs/install/x60_unbrick.md b/docs/install/x60_unbrick.md @@ -23,7 +23,7 @@ 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 +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 @@ -31,14 +31,14 @@ 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 +*Those dd commands should be applied to all newly compiled X60 ROM images (the ROM images in libreboot binary archives already have this applied!):\ -dd if=coreboot.rom of=top64k.bin bs=1 skip=\$\[\$(stat -c %s +dd if=coreboot.rom of=top64k.bin bs=1 skip=$\[$(stat -c %s coreboot.rom) - 0x10000\] count=64k\ -dd if=coreboot.rom bs=1 skip=\$\[\$(stat -c %s coreboot.rom) - 0x20000\] +dd if=coreboot.rom bs=1 skip=$\[$(stat -c %s coreboot.rom) - 0x20000\] count=64k | hexdump\ -dd if=top64k.bin of=coreboot.rom bs=1 seek=\$\[\$(stat -c %s +dd if=top64k.bin of=coreboot.rom bs=1 seek=$\[$(stat -c %s coreboot.rom) - 0x20000\] count=64k conv=notrunc\ (doing this makes the ROM suitable for use when flashing a system that still has Lenovo BIOS running, using those instructions: diff --git a/docs/install/x60tablet_unbrick.md b/docs/install/x60tablet_unbrick.md @@ -23,7 +23,7 @@ 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 +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 @@ -31,14 +31,14 @@ 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 +*Those dd commands should be applied to all newly compiled X60 ROM images (the ROM images in libreboot binary archives already have this applied!):\ -dd if=coreboot.rom of=top64k.bin bs=1 skip=\$\[\$(stat -c %s +dd if=coreboot.rom of=top64k.bin bs=1 skip=$\[$(stat -c %s coreboot.rom) - 0x10000\] count=64k\ -dd if=coreboot.rom bs=1 skip=\$\[\$(stat -c %s coreboot.rom) - 0x20000\] +dd if=coreboot.rom bs=1 skip=$\[$(stat -c %s coreboot.rom) - 0x20000\] count=64k | hexdump\ -dd if=top64k.bin of=coreboot.rom bs=1 seek=\$\[\$(stat -c %s +dd if=top64k.bin of=coreboot.rom bs=1 seek=$\[$(stat -c %s coreboot.rom) - 0x20000\] count=64k conv=notrunc\ (doing this makes the ROM suitable for use when flashing a system that still has Lenovo BIOS running, using those instructions: diff --git a/docs/misc/bbb_ehci.md b/docs/misc/bbb_ehci.md @@ -103,7 +103,7 @@ section): ls /lib/modules/3.8.13-bone70/kernel/drivers/usb/gadget/g_dbgp.ko -Unload all other g\_\* modules: +Unload all other g\_* modules: # lsmod # rmmod g_multi @@ -131,7 +131,7 @@ Make sure that you have cross compiling environment for arm-linux-gnueabihf setup on your *host*. - On BBB: uname -r - this will give you version number like - 3.8.13-bone70 (I will refer to this as: \$mav.\$miv-\$lv: where + 3.8.13-bone70 (I will refer to this as: $mav.$miv-$lv: where mav=3.8, miv=13, lv=bone70 - Get the BBB kernel ready on your host for cross-compiling: @@ -153,7 +153,7 @@ arm-linux-gnueabihf setup on your *host*. the two different version of the kernel (3.8 and 3.10). I will use 3.8. (If using kernel 3.12 patch\_1 is not needed) - cd kernel (note that this is one more level: you should be in - \$work\_dir/kernel/kernel) + $work\_dir/kernel/kernel) - Apply the patches: <!-- --> @@ -169,12 +169,12 @@ arm-linux-gnueabihf setup on your *host*. see [scripts](http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts/). - Get your current BBB kernel config (from: /boot/config-<ver>) - and copy it to your host as \$work\_dir/kernel/kernel/.config + and copy it to your host as $work\_dir/kernel/kernel/.config - Set proper version number: - - On your host, edit \$work\_dir/kernel/kernel/.config (the one + - On your host, edit $work\_dir/kernel/kernel/.config (the one you've just copied from BBB), find the line CONFIG\_LOCALVERSION="<something or empty>" and change - it to CONFIG\_LOCALVERSION="-\$lv", so it will look something + it to CONFIG\_LOCALVERSION="-$lv", so it will look something like: CONFIG\_LOCALVERSION="-bone70" - Also, make sure that: CONFIG\_USB\_G\_DBGP=m (If not, make menuconfig, and set @Device Drivers-> USB Support -> USB @@ -188,11 +188,11 @@ arm-linux-gnueabihf setup on your *host*. - on BBB, backup /lib/modules/3.8.13-bone70/kernel/drivers/usb/gadget (i.e. mv /lib/modules/3.8.13-bone70/kernel/drivers/usb/gadget - \$HOME) + $HOME) - copy the freshly compiled usb/gadget dir to /lib/modules/3.8.13-bone70/kernel/drivers/usb - restart BBB -- Remove all g\_\* modules (rmmod g\_<>) +- Remove all g\_* modules (rmmod g\_<>) - modprobpe g\_dbgp ### Configure libreboot with EHCI debug {#ConfigurelibrebootwithEHCIdebug} @@ -202,8 +202,8 @@ push debug messages to the EHCI debug port.\ If you've downloaded the binary distribution, you can check if it is properly configured in the following way: -- Go to the libreboot dist root directory cd \$libreboot\_bin -- Locate the rom image for your target (I will call it: \$img\_path) +- Go to the libreboot dist root directory cd $libreboot\_bin +- Locate the rom image for your target (I will call it: $img\_path) - Running the following command will extract the config in a file ./my\_config: @@ -282,7 +282,7 @@ libreboot (for now). - Plug the USB cable in the target's debug port (the one you found in step 1) and BBB's mini-B USB -- Make sure no other then g\_dbgp of the g\_\* modules is loaded on +- Make sure no other then g\_dbgp of the g\_* modules is loaded on your BBB - On the BBB: @@ -295,7 +295,7 @@ libreboot (for now). - You should see debug logs comming on your BBB console Note that this is not permanent on BBB, if you reboot it, you have to -rmmod g\_\* and modprobe g\_dbgp +rmmod g\_* and modprobe g\_dbgp ### Eneble EHCI Debug on the target's kernel (optional, recommended) {#EnebleEHCIDebugonthetargetskerneloptionalrecommended} diff --git a/docs/misc/index.md b/docs/misc/index.md @@ -30,7 +30,7 @@ Included with libreboot is a script called 'powertop.debian'. Run this as root and it will setup powertop to run with \--auto-tune at boot time. Load the file in your text editor to see how it does that. -\$ **sudo ./resources/scripts/misc/powertop.debian** +$ **sudo ./resources/scripts/misc/powertop.debian** Might want to run with \--calibrate first @@ -60,7 +60,7 @@ when idle. So far we have use processor.max\_cstate=2 or idle=halt in GRUB. These consume power. Stop using them! Be root\ -**\$ su -** +**$ su -** Installed powertop:\ **\# pacman -S powertop** @@ -110,7 +110,7 @@ port on the dock and connect the other end to a 2nd system using your USB Serial adapter. On the 2nd system, you can try this (using GNU Screen):\ -**\$ sudo screen /dev/ttyUSB0 115200** +**$ sudo screen /dev/ttyUSB0 115200** How to quit GNU Screen: Ctrl+A then release and press K, and then press Y. @@ -211,7 +211,7 @@ duty cycle. see <https://review.coreboot.org/#/c/10624/> on bit 16. The cause of this issue is that i945, in contrast with to GM45, is set to work in BLM Legacy Mode. This makes backlight more complicated since the duty cycle is derived from 3 instead of 2 registers using the following -formula: if(BPC\[7:0\] <> xFF) then BPCR\[15:0\] \* BPC\[7:0\] +formula: if(BPC\[7:0\] <> xFF) then BPCR\[15:0\] * BPC\[7:0\] Else BPCR\[15:0\] BPC is LBB - PCI Backlight Control Register, described on <http://www.mouser.com/pdfdocs/945gmedatasheet.pdf> on page 315. BPCR is BLC\_PWM\_CTL described in @@ -230,12 +230,12 @@ is included in libreboot, and can be used to enable or disable this behaviour. Disable or enable beeps when removing/adding the charger:\ -\$ **sudo ./nvramtool -w power\_management\_beeps=Enable**\ -\$ **sudo ./nvramtool -w power\_management\_beeps=Disable** +$ **sudo ./nvramtool -w power\_management\_beeps=Enable**\ +$ **sudo ./nvramtool -w power\_management\_beeps=Disable** Disable or enable beeps when battery is low:\ -\$ **sudo ./nvramtool -w low\_battery\_beep=Enable**\ -\$ **sudo ./nvramtool -w low\_battery\_beep=Disable** +$ **sudo ./nvramtool -w low\_battery\_beep=Enable**\ +$ **sudo ./nvramtool -w low\_battery\_beep=Disable** A reboot is required, for these changes to take effect. @@ -249,10 +249,10 @@ Or look in **/sys/class/drm/card0-LVDS-1/edid** Alternatively you can use i2cdump. In Debian and Devuan, this is in the package i2c-tools.\ -\$ **sudo modprobe i2c-dev**\ -\$ **sudo i2cdump -y 5 0x50** (you might have to change the value for +$ **sudo modprobe i2c-dev**\ +$ **sudo i2cdump -y 5 0x50** (you might have to change the value for -y)\ -\$ **sudo rmmod i2c-dev**\ +$ **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 @@ -280,7 +280,7 @@ laptop. If power usage is a concern, then you should not use this. To disable c-states, do this in GNU+Linux:\ **for i in /sys/devices/system/cpu/cpu/cpuidle/state/disable; do echo 1 -> \$i; done** +> $i; done** You can reproduce this issue more easily by sending lots of traffic across subnets on the same interface (NIC). diff --git a/docs/misc/patch.md b/docs/misc/patch.md @@ -12,11 +12,11 @@ Apply a patch ============= To apply a patch to a single file, do that in it's directory:\ -**\$ patch < foo.patch** +**$ patch < foo.patch** Assuming that the patch is distributed in unified format identifying the file the patch should be applied to, the above will work. Otherwise:\ -**\$ patch foo.txt < bar.patch** +**$ patch foo.txt < bar.patch** You can apply a patch to an entire directory, but note the "p level". What this means is that inside patch files will be the files that you @@ -25,7 +25,7 @@ the files ane located on your own computer instead of on the computer where the patch was created. 'p' level instructs the 'patch' utility to ignore parts of the path name to identify the files correctly. Usually a p level of 1 will work, so you would use:\ -**\$ patch -p1 < baz.patch** +**$ patch -p1 < baz.patch** Change to the top level directory before running this. If a patch level of 1 cannot identify the files to patch, then inspect the patch file for @@ -33,14 +33,14 @@ file names. For example:\ **/home/user/do/not/panic/yet.c** and you are working in a directory that contains panic/yet.c, use:\ -**\$ patch -p5 < baz.patch** +**$ patch -p5 < baz.patch** You usually count one up for each path separator (forward slash) removed from the beginning of the path, until you are left with a path that exists in the current working directory. The count is the p level. Removing a patch using the -R flag\ -**\$ patch -p5 -R < baz.patch** +**$ patch -p5 -R < baz.patch** [Back to top of page.](#pagetop) @@ -50,13 +50,13 @@ Create a patch with diff ======================== Diff can create a patch for a single file:\ -**\$ diff -u original.c new.c > original.patch** +**$ diff -u original.c new.c > original.patch** For diff'ing a source tree:\ -**\$ cp -R original new** +**$ cp -R original new** Do whatever you want in new/ and then diff it:\ -**\$ diff -rupN original/ new/ > original.patch** +**$ diff -rupN original/ new/ > original.patch** [Back to top of page.](#pagetop) @@ -70,13 +70,13 @@ git is something special. Note: this won't show new files created. Just make whatever changes you want to a git clone and then:\ -**\$ git diff > patch.git** +**$ git diff > patch.git** Note the git revision that you did this with:\ -**\$ git log** +**$ git log** Alternatively (better yet), commit your changes and then use:\ -\$ **git format-patch -N**\ +$ **git format-patch -N**\ Replace N with the number of commits that you want to show. [Back to top of page.](#pagetop) @@ -90,10 +90,10 @@ it really is. Now to apply that patch in the future, just git clone it again and do with the git revision you found from above:\ -**\$ git reset \--hard REVISIONNUMBER** +**$ git reset \--hard REVISIONNUMBER** Now put patch.git in the git clone directory and do:\ -**\$ git apply patch.git** +**$ git apply patch.git** If you use a patch from git format-patch, then use **git am patch.git** instead of **git apply patch.git**. git-am will re-create the commits