diff --git a/site/docs/build/index.uk.md b/site/docs/build/index.uk.md index 5b3914a..e5ab1ba 100644 --- a/site/docs/build/index.uk.md +++ b/site/docs/build/index.uk.md @@ -148,10 +148,6 @@ Check: `config/dependencies/` for list of supported distros. Однак, вам потрібно буде написано свій власний сценарій для встановлення залежностей побудови. -Canoeboot Make (cbmk) автоматично виконує всі необхідні команди; наприклад, -`./build roms` автоматично виконає `./build grub`, -якщо затребувані утиліти для GRUB не збудовано, для виготовлення корисних навантажень. - В якості результату, ви тепер можете (після встановлення правильних залежностей побудови) виконати лише одну команду, з свіжого Git clone, для побудови образів ROM: diff --git a/site/docs/maintain/index.md b/site/docs/maintain/index.md index 09f8625..2ca8711 100644 --- a/site/docs/maintain/index.md +++ b/site/docs/maintain/index.md @@ -87,7 +87,7 @@ XBMK\_RELEASE If set to `y`, it signals to `script/roms` that a release is being built, and it will honour `release="n"` in target.cfg files. You could also set this -yourself, when doing regular builds, if you wanted to test how `./build roms` +yourself when doing regular builds, if you wanted to test how `./mk -b coreboot` behaves running it in release mode. Do this if you want to: export XBMK_RELEASE=y @@ -1166,16 +1166,9 @@ Scripts in root directory of cbmk build --------------- -This is the main script. Symlinks `vendor` and `update` also point to it, as -does `mk`. Direct use of this script is considered deprecate, because in a -future audit, it will be removed; the `./mk` commands will be used, -exclusively, so please use only `./mk` as directed here and elsewhere. +This is the main build script. -Take any given file under `script/` and you can do: - - ./build file # (THIS IS NOT A VALID COMMAND) - -For example: +Example commands: ./mk -b coreboot ./mk diff --git a/site/docs/misc/emulation.md b/site/docs/misc/emulation.md index 3439b56..7f4820f 100644 --- a/site/docs/misc/emulation.md +++ b/site/docs/misc/emulation.md @@ -17,7 +17,11 @@ Building and Testing Canoeboot can be built for qemu just like any other board. -`./build boot roms qemu_x86_12mb` + ./mk -b coreboot qemu_x86_12mb + +There is also a target that has 64-but U-Boot payload: + + ./mk -b coreboot qemu_x86_64_12mb In order to test the resulting roms, you must have qemu installed on the host machine. Test the roms by pointing qemu to the rom in bios mode. @@ -29,7 +33,7 @@ For example: There is basic support for an arm64 virtual machine as well, although the payloads are not as developed as the x86 one: - ./build boot roms qemu_arm64_12mb + ./mk -b coreboot qemu_arm64_12mb ``` qemu-system-aarch64 -bios bin/qemu_arm64_12mb/uboot_payload_qemu_arm64_12mb_libgfxinit_corebootfb.rom \ diff --git a/site/docs/uboot/index.md b/site/docs/uboot/index.md index 068862f..e438603 100644 --- a/site/docs/uboot/index.md +++ b/site/docs/uboot/index.md @@ -21,7 +21,7 @@ and the build dependencies are installed like so, from `cbmk/` as root: ./mk dependencies debian -This installs everything needed for `./build boot roms`, and part of the +This installs everything needed for `./mk -b coreboot`, and part of the build process makes use of coreboot's own cross-compile toolchain. [QEMU x86/ARM64 virtual machines](../misc/emulation.md) are also