From 5c20fc539e17254ea7a4c9d74a4dafed12ae7b61 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 19 Jan 2025 05:53:37 +0000 Subject: [PATCH] remove flashrom stragglers (flashrom migration) some old URIs and notes about flashrom persisted in the documentation. now they have been removed. Signed-off-by: Leah Rowe --- site/docs/install/index.md | 2 +- site/docs/install/spi.md | 19 +++++++++++-------- site/docs/install/spi.zh-cn.md | 12 +++++++----- site/docs/maintain/index.md | 2 +- site/faq.uk.md | 2 +- site/robots.txt | 1 + 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/site/docs/install/index.md b/site/docs/install/index.md index 294c229..487343f 100644 --- a/site/docs/install/index.md +++ b/site/docs/install/index.md @@ -460,7 +460,7 @@ How to erase and rewrite the chip contents: sudo flashprog -p internal:laptop=force_I_want_a_brick,boardmismatch=force -w canoeboot.rom NOTE: `force_I_want_a_brick` is not scary. Do not be scared! This merely disables -the safety checks in flashprog. Flashrom and coreboot change a lot, over the years, +the safety checks in flashprog. Flashprog and coreboot change a lot, over the years, and sometimes it's necessary to use this option. If you're scared, then just follow the above instructions, but remove that option. So, just use `-p internal`. If that doesn't work, next try `-p internal:boardmismatch=force`. If that doesn't diff --git a/site/docs/install/spi.md b/site/docs/install/spi.md index c6d768b..18e066e 100644 --- a/site/docs/install/spi.md +++ b/site/docs/install/spi.md @@ -14,7 +14,7 @@ which uses LPC flash in a PLCC32 socket, which you can simply hot-swap after booting the vendor firmware, and then flash internally. Simple! We will be using -the [flashprog](https://flashprog.org/Flashrom) software which is written to +the [flashprog](https://flashprog.org/) software which is written to dump, erase and rewrite these flash chips. Canoeboot currently documents how to use these SPI programmers: @@ -493,18 +493,21 @@ for use on x86-64 systems running Ubuntu 20.04, but it should work in Raspbian on the Raspberry Pi. Alternatively, you may download flashprog directly from upstream -at +at If you're flashing a Macronix flashchip on a ThinkPad X200, you will want to -use a special patched version of flashprog, which you can download here: - - patched source code is available, and a +use a special patched version of flashprog, which you can download like so +in lbmk: + + ./mk -b flashprog + +Patched source code is compiled, and a binary is also available that you can simply run. Pass the `--workaround-mx` argument in flashprog. This mitigates stability issues. -If you downloaded the flashprog source code directly, you can go into the -directory and simply type `make`. In the canoeboot build system, build -dependencies are documented in configuration files located -at `config/dependencies/` which you can install. +Example usage: + + ./elf/flashprog/flashprog -p PROGRAMMER --workaround-mx How to use flashprog =================== diff --git a/site/docs/install/spi.zh-cn.md b/site/docs/install/spi.zh-cn.md index 71c0fdc..a7ea943 100644 --- a/site/docs/install/spi.zh-cn.md +++ b/site/docs/install/spi.zh-cn.md @@ -5,7 +5,7 @@ x-toc-enable: true 本指南将教你怎样使用各种工具，通过 SPI 协议对 25xx NOR flash 进行外部再编程。这是 coreboot 所支持的计算机中，最常见的 flash IC 类型。目前 canoeboot 支持的每个系统，基本都使用这种类型的引导 flash；唯一的例外就是 ASUS KFSN4-DRE，它在 PLCC32 芯片座中使用了 LPC flash，你可以在供应商固件启动后，对其进行热切换，然后再内部刷入。十分简单！ -我们会用到 [flashprog](https://flashprog.org/Flashrom) 软件，这个软件可以读出、擦除及重写这些 flash 芯片。 +我们会用到 [flashprog](https://flashprog.org/) 软件，这个软件可以读出、擦除及重写这些 flash 芯片。 canoeboot 目前记录了这些 SPI 编程器的使用方法： @@ -79,7 +79,7 @@ will appear: [453876.669019] cdc_acm 2-1.2:1.0: ttyACMx: USB ACM device -Take note of the ttyACMx. Flashrom is now usable +Take note of the ttyACMx. Flashprog is now usable (substitute ttyACMx with what you observed earlier). flashprog -p serprog:dev=/dev/ttyACMx,spispeed=16M @@ -311,7 +311,7 @@ RPi 的自由固件 如果你在使用 BBB 或者 RPi，你需要在 SSH 进去之后再这么做。 -Flashrom 是用来读出、擦除、重写 NOR flash 内容的软件。 +Flashprog 是用来读出、擦除、重写 NOR flash 内容的软件。 使用 Git 仓库中的 canoeboot 构建系统，你可以下载并安装 flashprog。首先下载 [cbmk Git 仓库](https://codeberg.org/canoeboot/cbmk)，然后执行： @@ -326,9 +326,11 @@ Flashrom 是用来读出、擦除、重写 NOR flash 内容的软件。 接下来，会出现一个 `flashprog/` 目录，其中有一个 `flashprog` 可执行文件。如果你在运行上面的依赖命令的时候，出现了缺失包的错误，则修改 `config/dependencies/ubuntu2004`。那个脚本会在 apt-get 中下载并安装构建依赖，它是为运行 Ubuntu 的 x86-64 系统写的，但在树莓派上的 Raspbian 应该能用。 -或者，你可以直接从上游下载 flashprog，位于： +或者，你可以直接从上游下载 flashprog，位于： -如果你是在 ThinkPad X200 上刷写 Macronix flash 芯片，则要使用一个 flashprog 的特别修改版，下载地址在这里： —— 其中有修改版的源代码，也有可以直接运行的二进制文件。将 `--workaround-mx` 参数传给 flashprog。这会缓解稳定性问题。 +如果你是在 ThinkPad X200 上刷写 Macronix flash 芯片，则要使用一个 flashprog 的特别修改版，下载地址在这里：`./mk -b flashprog` —— 其中有修改版的源代码，也有可以直接运行的二进制文件。将 `--workaround-mx` 参数传给 flashprog。这会缓解稳定性问题。 + + ./elf/flashprog/flashprog -p PROGRAMMER --workaround-mx 如果你直接下载了 flashprog 源代码，你可以进入目录并直接运行 `make`。在 canoeboot 构建系统中，`config/dependencies/` 处的脚本写明了构建依赖，你可以直接使用 `apt-get` 软件安装。 diff --git a/site/docs/maintain/index.md b/site/docs/maintain/index.md index 843dfc5..a1f2391 100644 --- a/site/docs/maintain/index.md +++ b/site/docs/maintain/index.md @@ -346,7 +346,7 @@ src/flashprog/ Please also visit: Although currently unused by any part of cbmk, we provide flashprog for the -convenience of users, and this is copied to release archives. Flashrom is the +convenience of users, and this is copied to release archives. Flashprog is the program that you will use to read, erase and write the flash, containing coreboot firmware. diff --git a/site/faq.uk.md b/site/faq.uk.md index 7de4221..d9a0df7 100644 --- a/site/faq.uk.md +++ b/site/faq.uk.md @@ -27,7 +27,7 @@ x-toc-enable: true Прочитайте примітки щодо CH341A на [docs/install/spi.md](docs/install/spi.md), щоб вивчити більше. -Flashrom скаржиться на доступ DEVMEM +Flashprog скаржиться на доступ DEVMEM -------------------------------------- Якщо запущено `flashprog -p internal` для програмної перепрошивки та diff --git a/site/robots.txt b/site/robots.txt index eb05362..7ba9b6f 100644 --- a/site/robots.txt +++ b/site/robots.txt @@ -1,2 +1,3 @@ +Sitemap: https://canoeboot.org/sitemap.xml User-agent: * Disallow: