From f679fbd359c584cf5da52724ff7884605520c8ef Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Thu, 25 Aug 2022 15:00:51 +0300 Subject: u-boot-libre: Fix reproducability issue due to timezone The checksums in tests/u-boot-libre.sha512 do not match the tarballs generated by this script when ran on a different timezone, e.g. UTC+3. Explicitly specify a timezone for the tar command that makes the tarballs match the checksums. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/release/u-boot-libre | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'resources/scripts/build') diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre index a871aab7..dc4f0c68 100755 --- a/resources/scripts/build/release/u-boot-libre +++ b/resources/scripts/build/release/u-boot-libre @@ -5,6 +5,7 @@ # # Copyright (C) 2020,2021 Leah Rowe # Copyright (C) 2022 Denis 'GNUtoo' Carikli +# Copyright (C) 2022 Alper Nebi Yasak # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -112,7 +113,7 @@ release_deblobbed_uboot() --format=gnu \ --sort=name \ --owner=0 --group=0 --numeric-owner \ - --mtime="1970-01-01" \ + --mtime="1970-01-01 UTC+01:00" \ lzip -9 --keep -vv "${tarball}" xz -9 --keep -vv "${tarball}" -- cgit v1.2.1 From 89a4c2c61f00034ee031b62811c8a8cf4ba009b9 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Wed, 27 Jul 2022 18:35:02 +0200 Subject: u-boot-libre: remove nonfree firmware in drivers/dma/MCD_tasks.c This firmware lack corresponding source code. Signed-off-by: Denis 'GNUtoo' Carikli --- resources/scripts/build/release/u-boot-libre | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources/scripts/build') diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre index dc4f0c68..6f724178 100755 --- a/resources/scripts/build/release/u-boot-libre +++ b/resources/scripts/build/release/u-boot-libre @@ -24,7 +24,7 @@ [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e -revision="r1" +revision="r2" supported_uboot_versions=" \ 2021.07 \ -- cgit v1.2.1 From 01f61263f8933caa26a8f8e44900fb0f00fb5164 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Thu, 25 Aug 2022 19:21:12 +0300 Subject: u-boot-libre: Fix releasing blob list as deblob script The u-boot-libre release script copies the blobs list into the release as the deblob script, presumably due to a copy-paste error. Fix it to correctly copy the generated deblob script. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/release/u-boot-libre | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources/scripts/build') diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre index 6f724178..63940dc2 100755 --- a/resources/scripts/build/release/u-boot-libre +++ b/resources/scripts/build/release/u-boot-libre @@ -171,7 +171,7 @@ release_uboot_deblob_script() "${destination}.xz" install -m 755 -d "${release_version_dir}" - install -m 644 -T "${blobs_list}" "${destination}" + install -m 644 -T "${deblob_script}" "${destination}" lzip -9 --keep -vv "${destination}" xz -9 --keep -vv "${destination}" -- cgit v1.2.1 From 22b1db6980a7398dbd257265891944ecd4a4c8da Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Thu, 25 Aug 2022 21:38:05 +0300 Subject: u-boot-libre: Set tar mtime to SOURCE_DATE_EPOCH or @0 The u-boot-libre tarball contents' mtimes are an unconventional value due to timezone confusion. For reproducibility, timestamps like these are usually set by a SOURCE_DATE_EPOCH which is respected by both coreboot and U-Boot. Use it in the u-boot-libre release script as well, and properly set the mtimes to the Unix epoch when it's not defined. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/release/u-boot-libre | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources/scripts/build') diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre index 63940dc2..3a6aaca6 100755 --- a/resources/scripts/build/release/u-boot-libre +++ b/resources/scripts/build/release/u-boot-libre @@ -113,7 +113,7 @@ release_deblobbed_uboot() --format=gnu \ --sort=name \ --owner=0 --group=0 --numeric-owner \ - --mtime="1970-01-01 UTC+01:00" \ + --mtime="@${SOURCE_DATE_EPOCH:-0}" \ lzip -9 --keep -vv "${tarball}" xz -9 --keep -vv "${tarball}" -- cgit v1.2.1 From 8dd1a24504ac438e9a8a0826b531976d9bc72067 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Thu, 25 Aug 2022 18:33:23 +0300 Subject: download/u-boot: Prepare files per board instead of per revision The U-Boot download script is designed to help with releasing u-boot-libre and it can only prepare a generic U-Boot v2021.07 tree. However, we will need to build board-specific versions of U-Boot to be able to use it as a coreboot payload effectively. As a first step toward that, make the download script prepare per-board copies of U-Boot v2021.07. Then, add a 'v2021.07' pseudo-board for the u-boot-libre release script to work on. The u-boot-libre deblob script hash ends up chaning due to copying my author attribution from the download script, update its hash. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/release/u-boot-libre | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources/scripts/build') diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre index 3a6aaca6..39767bc5 100755 --- a/resources/scripts/build/release/u-boot-libre +++ b/resources/scripts/build/release/u-boot-libre @@ -102,7 +102,7 @@ release_deblobbed_uboot() "${tarball}.xz" mkdir -p "$(dirname ${tmpdir})" - cp -R "u-boot/u-boot/" "${tmpdir}" + cp -R "u-boot/v${version}/" "${tmpdir}" rm -rf ${tmpdir}/.git ${tmpdir}/.gitignore make -C ${tmpdir} distclean -- cgit v1.2.1 From 764a439a8cbad7d55455494f025f3e77c9fa52c0 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Thu, 25 Aug 2022 21:59:16 +0300 Subject: u-boot-libre: Add support for deblobbing U-Boot v2022.07 Add a 'v2022.07' pseudo-board for the U-Boot download script with the default blobs list, and mark the version as supported in u-boot-libre release script. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/release/u-boot-libre | 1 + 1 file changed, 1 insertion(+) (limited to 'resources/scripts/build') diff --git a/resources/scripts/build/release/u-boot-libre b/resources/scripts/build/release/u-boot-libre index 39767bc5..8e0ce17c 100755 --- a/resources/scripts/build/release/u-boot-libre +++ b/resources/scripts/build/release/u-boot-libre @@ -28,6 +28,7 @@ revision="r2" supported_uboot_versions=" \ 2021.07 \ + 2022.07 \ " topdir="$(realpath $(dirname $(realpath $0))/../../../../)" -- cgit v1.2.1 From 1dc05e4066c4984df4a16e17177cb0e4b26bab7b Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Fri, 26 Aug 2022 13:27:23 +0300 Subject: build/payload: Add helper script to build U-Boot as payload This enables building U-Boot for boards which have config files in resources/u-boot, and copying built files that could be usable to make coreboot payloads. Right now, there is no such board in this repo. The most important file here is "u-boot.elf", which is a combination of the U-Boot binary and the appropriate device-tree file for the board. Building this needs CONFIG_REMAKE_ELF=y on the U-Boot part, and using this with CONFIG_PAYLOAD_ELF=y on the coreboot build works fine. Note that this isn't enough to make U-Boot-only releases, since low-level prerequisites like arm-trusted-firmware aren't passed in to the U-Boot build system. Coreboot builds its own copy of TF-A and sets it up on the board, so using these U-Boot builds as payloads should still work. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/payload/u-boot | 146 +++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100755 resources/scripts/build/payload/u-boot (limited to 'resources/scripts/build') diff --git a/resources/scripts/build/payload/u-boot b/resources/scripts/build/payload/u-boot new file mode 100755 index 00000000..6c94a441 --- /dev/null +++ b/resources/scripts/build/payload/u-boot @@ -0,0 +1,146 @@ +#!/usr/bin/env bash + +# helper script: builds U-Boot source code +# +# Copyright (C) 2020, 2021 Leah Rowe +# Copyright (C) 2021 Vitali64 +# Copyright (C) 2022 Alper Nebi Yasak +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e + +RET=0 + +# Build U-Boot +# --------------------------------------------------------------------- + +printf "Building U-Boot payloads\n" + +# Build for all boards if no argument is given +if [ "$#" -eq 0 ]; then + for board_dir in resources/u-boot/*; do + if [ -d "${board_dir}/config/" ]; then + set -- "$@" "${board_dir#resources/u-boot/}" + fi + done +fi + +[ ! -d "payload/" ] && mkdir -p payload/ +[ ! -d "payload/u-boot" ] && mkdir -p payload/u-boot/ + +# Appends additional version info to U-Boot +our_version="$(cat version)" +projectname="$(cat projectname)" +export LOCALVERSION="-${projectname}-${our_version}" + +for board in "$@"; do + board_dir="resources/u-boot/${board}" + rm -rf "payload/u-boot/${board}" + mkdir -p "payload/u-boot/${board}" + + ubtree="undefined" + arch="undefined" + + if [ ! -f "${board_dir}/board.cfg" ]; then + printf "%s: Target %s does not have a board.cfg. Skipping build.\n" \ + "build/payload/u-boot" "${board}" + RET=1 + continue + fi + + # Override the above defaults using board.cfg + source "${board_dir}/board.cfg" + + if [ "${ubtree}" = "undefined" ]; then + printf "%s: Target %s does not define a U-Boot tree. Skipping build.\n" \ + "build/payload/u-boot" "${board}" + RET=1 + continue + fi + if [ "${arch}" = "undefined" ]; then + printf "%s: Target %s does not define a CPU type. Skipping build.\n" \ + "build/payload/u-boot" "${board}" + RET=1 + continue + fi + + ubdir="u-boot/${board}" + if [ "${board}" != "${ubtree}" ]; then + ubdir="u-boot/${ubtree}" + fi + + if [ ! -d "${ubdir}" ]; then + ./download u-boot "$board" + fi + + if [ ! -d "${ubdir}" ]; then + printf "%s: Failed to download U-Boot for target %s. Skipping build.\n" \ + "build/payload/u-boot" "${board}" + RET=1 + continue + fi + + if [ "${arch}" = "x86_32" ] || [ "${arch}" = "x86_64" ]; then + export CROSS_COMPILE=x86_64-linux- + elif [ "${arch}" = "ARMv7" ]; then + export CROSS_COMPILE=arm-linux-gnueabi- + elif [ "${arch}" = "AArch64" ]; then + export CROSS_COMPILE=aarch64-linux-gnu- + fi + + for config in "${board_dir}/config"/*; do + if [ ! -f "${config}" ]; then + printf "%s: Target %s has no configs to build for. Skipping build.\n" \ + "build/payload/u-boot" "${board}" + RET=1 + continue + fi + + config_name="${config#$board_dir/config/}" + if [ "$config_name" = "default" ]; then + dest_dir="payload/u-boot/${board}" + else + dest_dir="payload/u-boot/${board}/${config_name}" + fi + mkdir -p "${dest_dir}" + + printf "%s: Building for target %s (config %s).\n" \ + "build/payload/u-boot" "${board}" "${config_name}" + + make -C "${ubdir}" distclean + + cp "${config}" "${ubdir}/.config" + make -C "${ubdir}" olddefconfig + make -C "${ubdir}" -j"$(nproc)" all + + for f in "${ubdir}"/u-boot{,.bin,.dtb,.img,.itb,.elf}; do + if [ -f "$f" ]; then + mv "$f" "${dest_dir}/" + fi + done + + make -C "${ubdir}" distclean + + printf "%s: Built for target %s (config %s).\n" \ + "build/payload/u-boot" "${board}" "${config_name}" + done +done + +printf "Done! U-Boot files are in payload/u-boot/\n\n" +exit $RET + +# ------------------- DONE ---------------------- -- cgit v1.2.1 From 769f18f2f601dbf666d0f52f67f79b82e582909a Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Fri, 26 Aug 2022 15:06:45 +0300 Subject: build/roms: Fix building for ARMv7 and AArch64 boards The code that compiles coreboot crossgcc changes the working directory to the coreboot directory, and the following code cannot find the lbmk scripts that it needs to run. Compile ARMv7 and AArch64 cross compilers in a subshell like in the x86 case so the rest of the script can work. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/boot/roms_helper | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'resources/scripts/build') diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper index a6b64316..28053367 100755 --- a/resources/scripts/build/boot/roms_helper +++ b/resources/scripts/build/boot/roms_helper @@ -4,6 +4,7 @@ # # Copyright (C) 2020,2021 Leah Rowe # Copyright (C) 2021 Vitali64 +# Copyright (C) 2022 Alper Nebi Yasak # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -150,13 +151,17 @@ if [ "${arch}" = "x86_32" ] || [ "${arch}" = "x86_64" ]; then ) fi elif [ "${arch}" = "ARMv7" ]; then - cat version > "${cbdir}/.coreboot-version" - cd "${cbdir}" - make crossgcc-arm CPUS=$(nproc) # This is for armv7, doesn't apply to aarch64 + ( + cat version > "${cbdir}/.coreboot-version" + cd "${cbdir}" + make crossgcc-arm CPUS=$(nproc) # This is for armv7, doesn't apply to aarch64 + ) elif [ "${arch}" = "AArch64" ]; then - cat version > "${cbdir}/.coreboot-version" - cd "${cbdir}" - make crossgcc-aarch64 CPUS=$(nproc) # This is for aarch64, doesn't apply to armv7 + ( + cat version > "${cbdir}/.coreboot-version" + cd "${cbdir}" + make crossgcc-aarch64 CPUS=$(nproc) # This is for aarch64, doesn't apply to armv7 + ) fi if [ ! -f "${cbfstool}" ]; then -- cgit v1.2.1 From a69855f7e448b2f3f8947982ddd793d64914a011 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Fri, 26 Aug 2022 16:16:56 +0300 Subject: build/roms: Build 32-bit crossgcc for AArch64 as well The 32-bit ARM cross compiler toolchain is used to build parts of arm-trusted-firmware needed by AArch64 boards, compile the toolchain for those boards as well. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/boot/roms_helper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources/scripts/build') diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper index 28053367..8b9ca358 100755 --- a/resources/scripts/build/boot/roms_helper +++ b/resources/scripts/build/boot/roms_helper @@ -160,7 +160,7 @@ elif [ "${arch}" = "AArch64" ]; then ( cat version > "${cbdir}/.coreboot-version" cd "${cbdir}" - make crossgcc-aarch64 CPUS=$(nproc) # This is for aarch64, doesn't apply to armv7 + make crossgcc-arm crossgcc-aarch64 CPUS=$(nproc) # This is for aarch64, doesn't apply to armv7 ) fi -- cgit v1.2.1 From 61ede99832424718200bddd2826eae4bda2c3c7a Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Fri, 26 Aug 2022 17:14:57 +0300 Subject: build/roms: Support using U-Boot as a coreboot payload This enables embedding U-Boot into the coreboot roms as the payload. For now, the ELF file generated by enabling CONFIG_REMAKE_ELF is used, which includes the U-Boot binary and the board-specific device-tree file. It might be better to use the FIT payload support for U-Boot, but that was reportedly broken and is not tested yet. Coreboot boards can specify payload_uboot="y" in their board.cfg to enable building a rom with U-Boot as the payload, which is built from the U-Boot board with the same name. Boards can further specify a uboot_config option, to choose which board-specific config file U-Boot should be built with. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/boot/roms_helper | 62 +++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) (limited to 'resources/scripts/build') diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper index 8b9ca358..deb40d57 100755 --- a/resources/scripts/build/boot/roms_helper +++ b/resources/scripts/build/boot/roms_helper @@ -64,6 +64,8 @@ payload_seabios="n" payload_seabios_withgrub="n" # i386-coreboot grub accessible from SeaBIOS boot menu seabios_opromloadonly="0" payload_memtest="n" +payload_uboot="n" +uboot_config="undefined" # Override the above defaults using board.cfg source "resources/coreboot/${board}/board.cfg" @@ -110,7 +112,7 @@ fi # NOTE: reverse logic must not be applied. If SeaBIOS-with-GRUB works, that doesn't # necessarily mean GRUB-with-SeaBIOS will work nicely. for example, the board might # only have an add-on GPU available, where it's recommended to boot SeaBIOS first -if [ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ]; then +if [ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ] && [ "${payload_uboot}" != "y" ]; then while true; do for configfile in "resources/coreboot/${board}/config/"*; do if [ -f "${configfile}" ]; then @@ -122,6 +124,16 @@ if [ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ]; then done fi +if [ "${payload_uboot}" != "n" ] && \ + [ "${payload_uboot}" != "y" ]; then + payload_uboot="n" +fi + +if [ "${payload_uboot}" = "y" ] && \ + [ "${uboot_config}" = "undefined" ]; then + uboot_config="default" +fi + if [ "${payload_memtest}" = "y" ]; then if [ ! -f "memtest86plus/memtest" ]; then ./build module memtest86plus @@ -216,6 +228,21 @@ if [ "${payload_grub}" = "y" ] || [ "${payload_seabios_withgrub}" = "y" ]; then done fi +if [ "${payload_uboot}" = "y" ]; then + if [ "${uboot_config}" = "default" ] && \ + [ -f "payload/u-boot/${board}/u-boot.elf" ]; then + ubootelf="payload/u-boot/${board}/u-boot.elf" + else + ubootelf="payload/u-boot/${board}/${uboot_config}/u-boot.elf" + fi + + if [ ! -f "${ubootelf}" ]; then + printf "Required U-Boot payloads not yet built. Building now:\n" + rm -Rf "payload/u-boot/${board}" # just in case + ./build payload u-boot "${board}" + fi +fi + # it is assumed that no other work will be done on the ROM # after calling this function. therefore this function is "final" moverom() { @@ -325,6 +352,28 @@ make_seabios_rom() { printf "%s\n" "${tmprom}" } +# make a rom in /tmp/ and then print the path of that ROM +make_uboot_payload_rom() { + target_cbrom="${1}" # rom to insert u-boot in. this rom won't be touched + # a tmpfile will be made instead + target_uboot_cbfs_path="${2}" # e.g. fallback/payload + target_uboot_config="${3}" + cbfstool_path="${4}" + + if [ "${target_uboot_config}" = "default" ]; then + target_ubootelf="payload/u-boot/${board}/u-boot.elf" + else + target_ubootelf="payload/u-boot/${board}/${target_uboot_config}/u-boot.elf" + fi + + tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX) + + cp "${target_cbrom}" "${tmprom}" + "${cbfstool}" "${tmprom}" add-payload -f "${target_ubootelf}" -n ${target_uboot_cbfs_path} -c lzma + + printf "%s\n" "${tmprom}" +} + # make a rom in /tmp/ and then print the path of that ROM make_grubrom_from_keymap() { target_keymap="${1}" @@ -455,6 +504,17 @@ mkRoms() { if [ "${payload_grub}" = "y" ]; then mkRomsWithGrub "${corebootrom}" "${initmode}" "${displaymode}" "grub" fi + + if [ "${payload_uboot}" = "y" ]; then + tmpubootrom="$(make_uboot_payload_rom "${corebootrom}" "fallback/payload" "${uboot_config}" "${cbfstool}")" + if [ "${initmode}" = "normal" ]; then + newrompath="${romdir}/uboot_payload_${board}_${initmode}.rom" + else + newrompath="${romdir}/uboot_payload_${board}_${initmode}_${displaymode}.rom" + fi + moverom "${tmpubootrom}" "${newrompath}" "${romtype}" + rm -f "${tmpubootrom}" + fi } initmode="libgfxinit" -- cgit v1.2.1 From 6d6bd5eee0cdb626fb5e054db08c8e6136cfe579 Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Sat, 27 Aug 2022 21:25:43 +0300 Subject: build/roms: Rebuild cbutils module before starting coreboot build In recent coreboot versions, running distclean started to erase the cbfstool binary we built earlier in the util/cbfstool dir via the cbutils build script call. The coreboot build puts it in a different directory, and the roms build script can't find it when trying to add payloads to the roms. This doesn't make the script fail (because set -e is stupid like that), and the build appears to succeed if you don't look close enough to see the "cbfsutil not found" error. Build the coreboot utils we want at the places we want them after calling distclean, so that we can actually use cbfsutil and avoid silently-broken roms with newer coreboot versions. Signed-off-by: Alper Nebi Yasak --- resources/scripts/build/boot/roms_helper | 1 + 1 file changed, 1 insertion(+) (limited to 'resources/scripts/build') diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper index deb40d57..951e19ba 100755 --- a/resources/scripts/build/boot/roms_helper +++ b/resources/scripts/build/boot/roms_helper @@ -307,6 +307,7 @@ mkCoreboot() { make distclean ) cp "${cbcfgpath}" "${cbdir}"/.config + ./build module cbutils ${cbdir#coreboot/} ( cd "${cbdir}" make -j$(nproc) -- cgit v1.2.1