summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
Diffstat (limited to 'script')
-rwxr-xr-xscript/roms393
-rwxr-xr-xscript/trees148
2 files changed, 246 insertions, 295 deletions
diff --git a/script/roms b/script/roms
index c1a1b8bc..c4b95302 100755
--- a/script/roms
+++ b/script/roms
@@ -1,10 +1,10 @@
#!/usr/bin/env sh
# SPDX-License-Identifier: GPL-3.0-or-later
-# SPDX-FileCopyrightText: 2014-2016,2020,2021,2023,2024 Leah Rowe <leah@libreboot.org>
-# SPDX-FileCopyrightText: 2021,2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
-# SPDX-FileCopyrightText: 2022 Caleb La Grange <thonkpeasant@protonmail.com>
-# SPDX-FileCopyrightText: 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com>
-# SPDX-FileCopyrightText: 2023 Riku Viitanen <riku.viitanen@protonmail.com>
+# Copyright (c) 2014-2016,2020-2021,2023-2024 Leah Rowe <leah@libreboot.org>
+# Copyright (c) 2021-2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
+# Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
+# Copyright (c) 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com>
+# Copyright (c) 2023 Riku Viitanen <riku.viitanen@protonmail.com>
set -u -e
@@ -14,64 +14,56 @@ seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin"
grub_background="background1280x800.png"
grubelf="elf/grub/grub.elf"
cfgsdir="config/coreboot"
-pico_src_dir="src/pico-serprog"
-pico_sdk_dir="src/pico-sdk"
-stm32_src_dir="src/stm32-vserprog"
+picosrc="src/pico-serprog"
+picosdk="src/pico-sdk"
+stm32src="src/stm32-vserprog"
# Disable all payloads by default.
# target.cfg files have to specifically enable [a] payload(s)
-pv="payload_grub payload_grub_withseabios payload_seabios payload_memtest t"
-pv="${pv} payload_seabios_withgrub payload_seabios_grubonly payload_uboot memtest_bin"
+pv="payload_uboot payload_grub_withseabios payload_seabios payload_memtest t"
+pv="$pv payload_seabios_withgrub payload_seabios_grubonly payload_grub mt86bin"
v="romdir cbrom initmode displaymode cbcfg targetdir tree keymaps release"
-v="${v} grub_timeout ubdir board grub_scan_disk uboot_config"
-eval "$(setvars "n" ${pv} serprog)"
-eval "$(setvars "" ${v} boards _displaymode _payload _keyboard all targets \
+v="$v grub_timeout ubdir board grub_scan_disk uboot_config"
+eval "$(setvars "n" $pv serprog)"
+eval "$(setvars "" $v boards _displaymode _payload _keyboard all targets \
serprog_boards_dir)"
main()
{
while [ $# -gt 0 ]; do
- case ${1} in
- list)
- x_ items config/coreboot
- return 0 ;;
- serprog)
- serprog="y"
- shift 1; break ;;
- -d) _displaymode="${2}" ;;
- -p) _payload="${2}" ;;
- -k) _keyboard="${2}" ;;
+ case "$1" in
+ list) x_ items config/coreboot; return 0 ;;
+ serprog) serprog="y"; shift 1; break ;;
+ -d) _displaymode="$2" ;;
+ -p) _payload="$2" ;;
+ -k) _keyboard="$2" ;;
*)
- [ "${1}" = "all" ] && all="y"
- boards="${1} ${boards}"
+ [ "$1" = "all" ] && all="y"
+ boards="$1 $boards"
shift && continue ;;
esac
shift 2
done
if [ "$serprog" = "y" ]; then
- handle_serprog $@
- return 0
+ handle_serprog $@; return 0
else
- [ "${all}" != "y" ] || boards=$(items config/coreboot) || \
+ [ "$all" != "y" ] || boards="$(items config/coreboot)" || \
$err "Cannot generate list of boards for building"
- for x in ${boards}; do
+ for x in $boards; do
[ -d "config/coreboot/$x/config" ] && \
- handle_coreboot_target "$x" && continue
- printf "No configs for %s; skipping\n" "$x"
+ handle_coreboot_target "$x"; continue
done
fi
- bstr="directories"
- [ "$xbmk_release" = "y" ] && bstr="tarballs"
+ x="directories"
+ [ "$xbmk_release" = "y" ] && x="archives (remember the inject command)"
- [ -z "${targets}" ] && $err "No ROM images were compiled"
+ [ -z "$targets" ] && $err "No ROM images were compiled"
printf "\nROM images available in these %s:\n" "$bstr"
- eval "printf \"${targets}\""
+ eval "printf \"$targets\""
printf "^^ ROM images available in these %s.\n\n" "$bstr"
- [ "$xbmk_release" = "y" ] && \
- printf "Always run the inject command on release images!\n"
printf "DO NOT flash images from elf/ - please use bin/ instead.\n"
}
@@ -79,25 +71,24 @@ handle_serprog()
{
[ -z "${1+x}" ] && $err "bad command. Check $projectname docs."
[ "$1" != "rp2040" ] && [ "$1" != "stm32" ] && $err "bad command"
- if [ "${1}" = "rp2040" ]; then
- serprog_boards_dir=${pico_sdk_dir}/src/boards/include/boards
- [ -d "$pico_src_dir" ] || x_ ./update trees -f "pico-serprog"
- elif [ "${1}" = "stm32" ]; then
- serprog_boards_dir=${stm32_src_dir}/boards
- [ -d "$stm32_src_dir" ] || x_ ./update trees -f "stm32-vserprog"
+ if [ "$1" = "rp2040" ]; then
+ serprog_boards_dir="$picosdk/src/boards/include/boards"
+ [ -d "$picosrc" ] || x_ ./update trees -f "pico-serprog"
+ elif [ "$1" = "stm32" ]; then
+ serprog_boards_dir="$stm32src/boards"
+ [ -d "$stm32src" ] || x_ ./update trees -f "stm32-vserprog"
fi
- x_ mkdir -p "bin/serprog_${1}"
+ x_ mkdir -p "bin/serprog_$1"
- if [ $# -gt 1 ] && [ "${2}" = "list" ]; then
- list_serprog_boards ${serprog_boards_dir}
+ if [ $# -gt 1 ] && [ "$2" = "list" ]; then
+ list_serprog_boards "$serprog_boards_dir"
return 0
elif [ $# -gt 1 ]; then
- build_${1}_rom "${2}"
+ build_${1}_rom "$2"
else
- printf "Building all serprog targets\n"
- list_serprog_boards "${serprog_boards_dir}" | \
+ list_serprog_boards "$serprog_boards_dir" | \
while read -r board; do
- build_${1}_rom "${board}"
+ build_${1}_rom "$board"
done
fi
@@ -106,75 +97,70 @@ handle_serprog()
build_rp2040_rom()
{
- board=${1}
- printf "Building pico-serprog for %s\n" "${board}"
- x_ cmake -DPICO_BOARD="$board" -DPICO_SDK_PATH="$pico_sdk_dir" \
- -B "${pico_src_dir}/build" "${pico_src_dir}"
- x_ cmake --build "${pico_src_dir}/build"
- x_ mv ${pico_src_dir}/build/pico_serprog.uf2 \
- bin/serprog_rp2040/serprog_${board}.uf2
+ board="$1"
+ printf "Building pico-serprog for %s\n" "$board"
+ x_ cmake -DPICO_BOARD="$board" -DPICO_SDK_PATH="$picosdk" \
+ -B "$picosrc/build" "$picosrc"
+ x_ cmake --build "$picosrc/build"
+ x_ mv "$picosrc/build/pico_serprog.uf2" \
+ "bin/serprog_rp2040/serprog_$board.uf2"
printf "output to bin/serprog_rp2040/serprog_%s.uf2\n" "$board"
}
build_stm32_rom()
{
- board=${1}
- printf "Building stm32-vserprog for %s\n" "${board}"
- x_ make -C $stm32_src_dir libopencm3-just-make BOARD=$board
- x_ make -C ${stm32_src_dir} BOARD=${board}
- x_ mv ${stm32_src_dir}/stm32-vserprog.hex \
- bin/serprog_stm32/serprog_${board}.hex
+ board="$1"
+ printf "Building stm32-vserprog for %s\n" "$board"
+ x_ make -C "$stm32src" libopencm3-just-make BOARD=$board
+ x_ make -C "$stm32src" BOARD=$board
+ x_ mv "$stm32src/stm32-vserprog.hex" \
+ "bin/serprog_stm32/serprog_$board.hex"
printf "output to bin/serprog_stm32/serprog_%s.hex\n" "$board"
}
list_serprog_boards()
{
- basename -a -s .h "${1}/"*.h || $err "list_boards $1: can't list boards"
+ basename -a -s .h "$1/"*.h || $err "$1: can't list boards"
}
handle_coreboot_target()
{
- eval "$(setvars "n" ${pv}) $(setvars "" ${v})"
+ eval "$(setvars "n" $pv) $(setvars "" $v)"
grub_background="background1280x800.png"
board="$1"
configure_target
[ "$board" = "$tree" ] && return 0
- if [ "$xbmk_release" = "y" ] && [ "$release" = "n" ]; then
- printf "Target '%s' disabled for release.\n" "$board"
- return 0
- fi
+ [ "$xbmk_release" = "y" ] && [ "$release" = "n" ] && return 0
build_payloads
build_target_mainboard
- [ -d "bin/${board}" ] || return 0
- [ "$xbmk_release" = "y" ] || targets="* bin/${board}\n${targets}"
+ [ -d "bin/$board" ] || return 0
+ [ "$xbmk_release" = "y" ] || targets="* bin/$board\n$targets"
[ "$xbmk_release" = "y" ] && mkrom_tarball "bin/$board" && \
- targets="* bin/${relname}_$board.tar.xz\n$targets"; return 0
+ targets="* bin/${relname}_$board.tar.xz\n$targets"; return 0
}
configure_target()
{
- targetdir="${cfgsdir}/${board}"
- [ -f "${targetdir}/target.cfg" ] || \
- $err "Missing target.cfg for target: ${board}"
+ targetdir="$cfgsdir/$board"
+ [ -f "$targetdir/target.cfg" ] || $err "$board: target.cfg missing"
# Override the above defaults using target.cfg
- . "${targetdir}/target.cfg"
+ . "$targetdir/target.cfg"
- [ -z "${grub_scan_disk}" ] && grub_scan_disk="both"
- [ "$grub_scan_disk" != "both" ] && [ "$grub_scan_disk" != "ata" ] \
- && [ "${grub_scan_disk}" != "ahci" ] && \
- grub_scan_disk="both"
+ [ -z "$grub_scan_disk" ] && grub_scan_disk="both"
+ [ "$grub_scan_disk" != "both" ] && [ "$grub_scan_disk" != "ata" ] && \
+ [ "$grub_scan_disk" != "ahci" ] && grub_scan_disk="both"
[ -z "$tree" ] && $err "$board: tree not defined"
- [ "${payload_memtest}" != "y" ] && payload_memtest="n"
+ [ "$payload_memtest" != "y" ] && payload_memtest="n"
[ "$(uname -m)" = "x86_64" ] || payload_memtest="n"
- [ "${payload_grub_withseabios}" = "y" ] && payload_grub="y"
- [ "${payload_grub_withseabios}" = "y" ] && \
+ [ "$payload_grub_withseabios" = "y" ] && payload_grub="y"
+ [ "$payload_grub_withseabios" = "y" ] && \
eval "$(setvars "y" payload_seabios payload_seabios_withgrub)"
[ "$payload_seabios_withgrub" = "y" ] && payload_seabios="y"
[ "$payload_seabios_grubonly" = "y" ] && payload_seabios="y"
@@ -183,8 +169,7 @@ configure_target()
# The reverse logic must not be applied. If SeaBIOS-with-GRUB works,
# that doesn't mean GRUB-with-SeaBIOS will, e.g. VGA ROM execution
[ "$payload_grub" != "y" ] && [ "$payload_seabios" != "y" ] && \
- [ "${payload_uboot}" != "y" ] && \
- $err "target '$board' defines no payload"
+ [ "$payload_uboot" != "y" ] && $err "'$board' defines no payload"
[ "$payload_uboot" != "n" ] && [ "$payload_uboot" != "y" ] && \
payload_uboot="n"
@@ -192,32 +177,32 @@ configure_target()
uboot_config="default"
# Override all payload directives with cmdline args
- [ -z "${_payload}" ] && return 0
+ [ -z "$_payload" ] && return 0
eval "$(setvars "n" payload_grub payload_memtest payload_seabios \
payload_seabios_withgrub payload_uboot payload_grub_withseabios \
payload_seabios_grubonly)"
- eval "payload_${_payload}=y"
+ eval "payload_$_payload=y"
}
build_payloads()
{
- romdir="bin/${board}"
- cbdir="src/coreboot/${board}"
- [ "${board}" = "${tree}" ] || cbdir="src/coreboot/${tree}"
- cbfstool="cbutils/${tree}/cbfstool"
- cbrom="${cbdir}/build/coreboot.rom"
+ romdir="bin/$board"
+ cbdir="src/coreboot/$board"
+ [ "$board" = "$tree" ] || cbdir="src/coreboot/$tree"
+ cbfstool="cbutils/$tree/cbfstool"
+ cbrom="$cbdir/build/coreboot.rom"
[ -f "$cbfstool" ] || x_ ./update trees -b coreboot utils $tree
- memtest_bin="memtest86plus/build64/memtest.bin"
- [ "${payload_memtest}" != "y" ] || [ -f "src/${memtest_bin}" ] || \
+ mt86bin="memtest86plus/build64/memtest.bin"
+ [ "$payload_memtest" != "y" ] || [ -f "src/$mt86bin" ] || \
x_ ./update trees -b memtest86plus
[ "$payload_seabios" = "y" ] && x_ ./update trees -b seabios
if [ "$payload_grub" = "y" ] || [ "$payload_seabios_withgrub" = "y" ] \
|| [ "$payload_seabios_grubonly" = "y" ]; then build_grub_payload
fi
- [ "${payload_uboot}" = "y" ] && build_uboot_payload; return 0
+ [ "$payload_uboot" = "y" ] && build_uboot_payload; return 0
}
build_grub_payload()
@@ -225,234 +210,222 @@ build_grub_payload()
x_ mkdir -p elf/grub
for keymapfile in config/grub/keymap/*.gkb; do
- [ -f "${keymapfile}" ] || continue
-
- keymaps="${keymaps} ${keymapfile}"
+ [ -f "$keymapfile" ] && keymaps="$keymaps $keymapfile"
done
[ -z "$_keyboard" ] || [ -f "$grubcfgsdir/keymap/$_keyboard.gkb" ] || \
$err "build_grub_payload: $_keyboard layout not defined"
- [ -n "$_keyboard" ] && keymaps="${grubcfgsdir}/keymap/${_keyboard}.gkb"
+ [ -n "$_keyboard" ] && keymaps="$grubcfgsdir/keymap/$_keyboard.gkb"
[ -f "$grubelf" ] && return 0
[ -f "src/grub/grub-mkstandalone" ] || x_ ./update trees -b grub
./src/grub/grub-mkstandalone --grub-mkimage="src/grub/grub-mkimage" \
-O i386-coreboot -o "elf/grub/grub.elf" -d "src/grub/grub-core/" \
- --fonts= --themes= --locales= --modules="${grub_modules}" \
- --install-modules="${grub_install_modules}" \
- "/boot/grub/grub.cfg=${grubcfgsdir}/config/grub_memdisk.cfg" \
- "/boot/grub/grub_default.cfg=${grubcfgsdir}/config/grub.cfg" || \
+ --fonts= --themes= --locales= --modules="$grub_modules" \
+ --install-modules="$grub_install_modules" \
+ "/boot/grub/grub.cfg=$grubcfgsdir/config/grub_memdisk.cfg" \
+ "/boot/grub/grub_default.cfg=$grubcfgsdir/config/grub.cfg" || \
$err "could not generate grub.elf"
}
build_uboot_payload()
{
- x_ ./update trees -b u-boot ${board}
- ubdir="elf/u-boot/${board}/${uboot_config}"
- ubootelf="${ubdir}/u-boot.elf"
- [ ! -f "${ubootelf}" ] && [ -f "${ubdir}/u-boot" ] && \
- ubootelf="${ubdir}/u-boot"
- [ -f "${ubootelf}" ] || $err "$board: Can't find u-boot"; return 0
+ x_ ./update trees -b u-boot $board
+ ubdir="elf/u-boot/$board/$uboot_config"
+ ubootelf="$ubdir/u-boot.elf"
+ [ ! -f "$ubootelf" ] && [ -f "$ubdir/u-boot" ] && \
+ ubootelf="$ubdir/u-boot"
+ [ -f "$ubootelf" ] || $err "$board: Can't find u-boot"; return 0
}
build_target_mainboard()
{
- x_ rm -Rf "${romdir}"
+ x_ rm -Rf "$romdir"
for x in "normal" "vgarom" "libgfxinit"; do
- initmode="${x}"
+ initmode="$x"
hmode="vesafb"
- [ "${initmode}" = "vgarom" ] || hmode="corebootfb"
- modes="${hmode} txtmode"
- [ -z "${_displaymode}" ] || modes="${_displaymode}"
- for y in ${modes}; do
- displaymode="${y}"
- [ "${initmode}" = "normal" ] && \
+ [ "$initmode" = "vgarom" ] || hmode="corebootfb"
+ modes="$hmode txtmode"
+ [ -z "$_displaymode" ] || modes="$_displaymode"
+ for y in $modes; do
+ displaymode="$y"
+ [ "$initmode" = "normal" ] && \
[ "$displaymode" != "txtmode" ] && continue
- cbcfg="${targetdir}/config/${initmode}_${displaymode}"
- [ "${initmode}" = "normal" ] && cbcfg="${cbcfg%_*}"
- build_roms "${cbcfg}"
- x_ rm -f "$cbrom"
+ cbcfg="$targetdir/config/${initmode}_$displaymode"
+ [ "$initmode" = "normal" ] && cbcfg="${cbcfg%_*}"
+ build_roms "$cbcfg"; x_ rm -f "$cbrom"
done
done
}
build_roms()
{
- cbcfg="${1}"
- if [ ! -f "${cbcfg}" ]; then
- printf "'%s' does not exist. Skipping build for %s %s %s\n" \
- "$cbcfg" "$board" "$displaymode" "$initmode" 1>&2
- return 0
- fi
+ cbcfg="$1"
+ e "$cbcfg" f not && return 0
- x_ ./update trees -b coreboot ${board}
+ x_ ./update trees -b coreboot $board
_cbrom="elf/coreboot_nopayload_DO_NOT_FLASH"
- _cbrom="${_cbrom}/${board}/${initmode}_${displaymode}"
- [ "${initmode}" = "normal" ] && \
- _cbrom="${_cbrom%"_${displaymode}"}"
- _cbrom="${_cbrom}/coreboot.rom"
+ _cbrom="$_cbrom/$board/${initmode}_$displaymode"
+ [ "$initmode" = "normal" ] && _cbrom="${_cbrom%"_$displaymode"}"
+ _cbrom="$_cbrom/coreboot.rom"
cbrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
- x_ cp "${_cbrom}" "${cbrom}"
+ x_ cp "$_cbrom" "$cbrom"
- [ "${payload_memtest}" != "y" ] || \
- x_ "${cbfstool}" "${cbrom}" add-payload \
- -f "src/${memtest_bin}" -n img/memtest -c lzma
- [ "${payload_seabios}" = "y" ] && build_seabios_roms
+ [ "$payload_memtest" != "y" ] || x_ "$cbfstool" "$cbrom" add-payload \
+ -f "src/$mt86bin" -n img/memtest -c lzma
+ [ "$payload_seabios" = "y" ] && build_seabios_roms
[ "$payload_grub" != "y" ] || x_ build_grub_roms "$cbrom" "grub"
- [ "${payload_uboot}" = "y" ] || return 0
- x_ cp "${_cbrom}" "${cbrom}"
+ [ "$payload_uboot" = "y" ] || return 0
+ x_ cp "$_cbrom" "$cbrom"
build_uboot_roms
}
build_seabios_roms()
{
- if [ "${payload_seabios_withgrub}" = "y" ]; then
- t=$(mktemp -t coreboot_rom.XXXXXXXXXX)
- x_ cp "${cbrom}" "${t}"
- x_ build_grub_roms "${t}" "seabios_withgrub"
+ if [ "$payload_seabios_withgrub" = "y" ]; then
+ t="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
+ x_ cp "$cbrom" "$t"
+ x_ build_grub_roms "$t" "seabios_withgrub"
else
- t=$(mkSeabiosRom "${cbrom}" "fallback/payload") || \
+ t="$(mkSeabiosRom "$cbrom" "fallback/payload")" || \
$err "build_seabios_roms: cannot build tmprom"
- newrom="${romdir}/seabios_${board}_${initmode}_${displaymode}"
- [ "${initmode}" = "normal" ] && newrom="${romdir}/seabios" \
- && newrom="${newrom}_${board}_${initmode}"
- x_ copyrom "${t}" "${newrom}.rom"
+ newrom="$romdir/seabios_${board}_${initmode}_$displaymode"
+ [ "$initmode" = "normal" ] && newrom="$romdir/seabios" \
+ && newrom="${newrom}_${board}_$initmode"
+ x_ cprom "$t" "$newrom.rom"
fi
- x_ rm -f "${t}"
+ x_ rm -f "$t"
}
# Make separate ROM images with GRUB payload, for each supported keymap
build_grub_roms()
{
- tmprom="${1}"
- payload1="${2}" # allow values: grub, seabios, seabios_withgrub
+ tmprom="$1"
+ payload1="$2" # allow values: grub, seabios, seabios_withgrub
grub_cbfs="fallback/payload"
if [ "$payload1" = "grub" ] && [ "$payload_grub_withseabios" = "y" ]
then
- _tmpmvrom=$(mkSeabiosRom "$tmprom" "seabios.elf") || \
+ _tmpmvrom="$(mkSeabiosRom "$tmprom" "seabios.elf")" || \
$err "build_grub_roms 1 $board: can't build tmprom"
x_ mv "$_tmpmvrom" "$tmprom"
elif [ "$payload1" != "grub" ] && [ "$payload_seabios_withgrub" = "y" ]
then
grub_cbfs="img/grub2"
- _tmpmvrom=$(mkSeabiosRom "$tmprom" fallback/payload) || \
+ _tmpmvrom="$(mkSeabiosRom "$tmprom" fallback/payload)" || \
$err "build_grub_roms 2 $board: can't build tmprom"
x_ mv "$_tmpmvrom" "$tmprom"
fi
# we only need insert grub.elf once, for each coreboot config:
- x_ "${cbfstool}" "${tmprom}" add-payload -f "${grubelf}" \
- -n ${grub_cbfs} -c lzma
+ x_ "$cbfstool" "$tmprom" add-payload -f "$grubelf" \
+ -n "$grub_cbfs" -c lzma
# we only need insert background.png once, for each coreboot config:
- if [ "${displaymode}" = "vesafb" ] || \
- [ "${displaymode}" = "corebootfb" ]; then
- backgroundfile="config/grub/background/${grub_background}"
- "${cbfstool}" "${tmprom}" add -f ${backgroundfile} \
- -n background.png -t raw || \
- $err "insert background, ${backgroundfile}"
+ if [ "$displaymode" = "vesafb" ] || \
+ [ "$displaymode" = "corebootfb" ]; then
+ backgroundfile="config/grub/background/$grub_background"
+ "$cbfstool" "$tmprom" add -f "$backgroundfile" -n \
+ background.png -t raw || $err "!bg, $backgroundfile"
fi
- tmpcfg=$(mktemp -t coreboot_rom.XXXXXXXXXX)
- printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" >"$tmpcfg" \
- || $err "set grub_scandisk, $grub_scan_disk, $tmpcfg"
- [ "${grub_scan_disk}" = "both" ] || \
+ tmpcfg="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
+ printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" > "$tmpcfg" || \
+ $err "set grub_scandisk, $grub_scan_disk, $tmpcfg"
+ [ "$grub_scan_disk" = "both" ] || \
x_ "$cbfstool" "$tmprom" add -f "$tmpcfg" -n scan.cfg -t raw
- printf "set timeout=%s\n" "${grub_timeout}" > "${tmpcfg}" || \
- $err "set timeout, ${grub_timeout}, ${tmpcfg}"
- [ -z "${grub_timeout}" ] || x_ "${cbfstool}" "${tmprom}" add \
- -f "${tmpcfg}" -n timeout.cfg -t raw
- x_ rm -f "${tmpcfg}"
-
- for keymapfile in ${keymaps}; do
- [ -f "${keymapfile}" ] || continue
+ printf "set timeout=%s\n" "$grub_timeout" > "$tmpcfg" || \
+ $err "set timeout, $grub_timeout, $tmpcfg"
+ [ -z "$grub_timeout" ] || x_ "$cbfstool" "$tmprom" add \
+ -f "$tmpcfg" -n timeout.cfg -t raw
+ x_ rm -f "$tmpcfg"
+
+ for keymapfile in $keymaps; do
+ [ -f "$keymapfile" ] || continue
keymap="${keymapfile##*/}"
keymap="${keymap%.gkb}"
tmpgrubrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
- x_ cp "${tmprom}" "${tmpgrubrom}"
+ x_ cp "$tmprom" "$tmpgrubrom"
x_ "$cbfstool" "$tmpgrubrom" add -f "$keymapfile" \
-n keymap.gkb -t raw
- newrom="${romdir}/${payload1}_${board}_${initmode}_"
- newrom="${newrom}${displaymode}_${keymap}.rom"
- [ "${initmode}" = "normal" ] && \
- newrom="${romdir}/${payload1}_${board}_" && \
- newrom="${newrom}${initmode}_${keymap}.rom"
- x_ copyrom "${tmpgrubrom}" "${newrom}"
- if [ "${payload_seabios_grubonly}" = "y" ]; then
+ newrom="$romdir/${payload1}_${board}_${initmode}_"
+ newrom="$newrom${displaymode}_$keymap.rom"
+ [ "$initmode" = "normal" ] && newrom="$romdir/${payload1}_" \
+ && newrom="$newrom${board}_${initmode}_$keymap.rom"
+ x_ cprom "$tmpgrubrom" "$newrom"
+ if [ "$payload_seabios_grubonly" = "y" ]; then
x_ "$cbfstool" "$tmpgrubrom" add \
-f "config/grub/bootorder" -n bootorder -t raw
- x_ copyrom "$tmpgrubrom" "${newrom%.rom}_grubfirst.rom"
+ x_ cprom "$tmpgrubrom" "${newrom%.rom}_grubfirst.rom"
x_ "$cbfstool" "$tmpgrubrom" add-int -i 0 \
-n etc/show-boot-menu
- x_ copyrom "$tmpgrubrom" "${newrom%.rom}_grubonly.rom"
+ x_ cprom "$tmpgrubrom" "${newrom%.rom}_grubonly.rom"
fi
- x_ rm -f "${tmpgrubrom}"
+ x_ rm -f "$tmpgrubrom"
done
}
# make a rom in /tmp/ and then print the path of that ROM
mkSeabiosRom() {
- _cbrom="${1}" # rom to insert seabios in. will not be touched
+ _cbrom="$1" # rom to insert seabios in. will not be touched
# (a tmpfile will be made instead)
- _seabios_cbfs_path="${2}" # e.g. fallback/payload
- _seabioself="elf/seabios/default/${initmode}/bios.bin.elf"
- tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
+ _seabios_cbfs_path="$2" # e.g. fallback/payload
+ _seabioself="elf/seabios/default/$initmode/bios.bin.elf"
+ tmprom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
- x_ cp "${_cbrom}" "${tmprom}"
+ x_ cp "$_cbrom" "$tmprom"
x_ "$cbfstool" "$tmprom" add-payload -f "$_seabioself" \
- -n "${_seabios_cbfs_path}" -c lzma
+ -n "$_seabios_cbfs_path" -c lzma
x_ "$cbfstool" "$tmprom" add-int -i 3000 -n etc/ps2-keyboard-spinup
z="2"; [ "$initmode" = "vgarom" ] && z="0"
x_ "$cbfstool" "$tmprom" add-int -i $z -n etc/pci-optionrom-exec
x_ "$cbfstool" "$tmprom" add-int -i 0 -n etc/optionroms-checksum
- [ "$initmode" != "libgfxinit" ] || \
- x_ "$cbfstool" "$tmprom" add -f "$seavgabiosrom" \
- -n vgaroms/seavgabios.bin -t raw
+ [ "$initmode" != "libgfxinit" ] || x_ "$cbfstool" "$tmprom" add -f \
+ "$seavgabiosrom" -n vgaroms/seavgabios.bin -t raw
- printf "%s\n" "${tmprom}"
+ printf "%s\n" "$tmprom"
}
build_uboot_roms()
{
- tmprom=$(mkUbootRom "${cbrom}" "fallback/payload") || \
+ tmprom="$(mkUbootRom "$cbrom" "fallback/payload")" || \
$err "build_uboot_roms $board: could not create tmprom"
- newrom="${romdir}/uboot_payload_${board}_${initmode}_${displaymode}.rom"
- x_ copyrom "${tmprom}" "${newrom}"
- x_ rm -f "${tmprom}"
+ newrom="$romdir/uboot_payload_${board}_${initmode}_$displaymode.rom"
+ x_ cprom "$tmprom" "$newrom"
+ x_ rm -f "$tmprom"
}
# make a rom in /tmp/ and then print the path of that ROM
mkUbootRom() {
- _cbrom="${1}"
- _uboot_cbfs_path="${2}"
+ _cbrom="$1"
+ _uboot_cbfs_path="$2"
- _ubdir="elf/u-boot/${board}/${uboot_config}"
- _ubootelf="${_ubdir}/u-boot.elf"
- [ -f "${_ubootelf}" ] || _ubootelf="${_ubdir}/u-boot"
+ _ubdir="elf/u-boot/$board/$uboot_config"
+ _ubootelf="$_ubdir/u-boot.elf"
+ [ -f "$_ubootelf" ] || _ubootelf="$_ubdir/u-boot"
[ -f "$_ubootelf" ] || $err "mkUbootRom: $board: cant find u-boot"
- tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX)
+ tmprom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
- x_ cp "${_cbrom}" "${tmprom}"
+ x_ cp "$_cbrom" "$tmprom"
x_ "$cbfstool" "$tmprom" add-payload -f "$_ubootelf" \
- -n "${_uboot_cbfs_path}" -c lzma
+ -n "$_uboot_cbfs_path" -c lzma
- printf "%s\n" "${tmprom}"
+ printf "%s\n" "$tmprom"
}
-copyrom()
+cprom()
{
printf "Creating target image: %s\n" "$2"
x_ mkdir -p "${2%/*}"
x_ cp "$1" "$2"
- [ "$xbmk_release" = "y" ] && mksha512sum "${2}" "vendorhashes" && \
- x_ ./vendor inject -r "${2}" -b "$board" -n nuke; return 0
+ [ "$xbmk_release" = "y" ] && mksha512sum "$2" "vendorhashes" && \
+ x_ ./vendor inject -r "$2" -b "$board" -n nuke; return 0
}
main $@
diff --git a/script/trees b/script/trees
index 7da762e8..1c2a3843 100755
--- a/script/trees
+++ b/script/trees
@@ -1,23 +1,23 @@
#!/usr/bin/env sh
# SPDX-License-Identifier: GPL-3.0-or-later
-# SPDX-FileCopyrightText: 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com>
-# SPDX-FileCopyrightText: 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
-# SPDX-FileCopyrightText: 2023-2024 Leah Rowe <leah@libreboot.org>
+# Copyright (c) 2022-2023 Alper Nebi Yasak <alpernebiyasak@gmail.com>
+# Copyright (c) 2022 Ferass El Hafidi <vitali64pmemail@protonmail.com>
+# Copyright (c) 2023-2024 Leah Rowe <leah@libreboot.org>
set -u -e
. "include/option.sh"
. "include/git.sh"
-eval "$(setvars "" xarch cfgsdir codedir config config_name xlang mode \
- elfdir listfile project target target_dir targets tree _f target1 \
- bootstrapargs autoconfargs cmakedir makeargs autogenargs xtree)"
+eval "$(setvars "" xarch cfgsdir cdir config config_name xlang mode makeargs \
+ listfile project target target_dir targets tree _f target1 bootstrapargs \
+ autoconfargs cmakedir elfdir autogenargs xtree)"
main()
{
while getopts f:b:m:u:c:x:s:l:n: option; do
- _f="${1}"
- case "${1}" in
+ _f="$1"
+ case "$1" in
-b) : ;;
-u) mode="oldconfig" ;;
-m) mode="menuconfig" ;;
@@ -33,13 +33,13 @@ main()
done
[ -z "$_f" ] && $err "missing flag (-m/-u/-b/-c/-x/-f/-s/-l/-n)"
[ -z "$project" ] && $err "project name not specified"
- elfdir="elf/${project}"
- cfgsdir="config/${project}"
+ elfdir="elf/$project"
+ cfgsdir="config/$project"
remkdir "${tmpgit%/*}"
_cmd="build_projects"
- [ -f "config/${project}/build.list" ] && _cmd="build_targets"
+ [ -f "config/$project/build.list" ] && _cmd="build_targets"
$_cmd $@
}
@@ -52,8 +52,8 @@ build_projects()
load_project_config "$cfgsdir"
- codedir="src/${project}"
- [ -d "$codedir" ] || x_ ./update trees -f "$project"
+ cdir="src/${project}"
+ [ -d "$cdir" ] || x_ ./update trees -f "$project"
[ "$mode" = "distclean" ] && mode="clean"
run_make_command || return 0
@@ -66,15 +66,13 @@ build_targets()
[ -d "$cfgsdir" ] || $err "directory, $cfgsdir, does not exist"
- listfile="${cfgsdir}/build.list"
+ listfile="$cfgsdir/build.list"
[ -f "$listfile" ] || $err "list file, $listfile, does not exist"
# Build for all targets if no argument is given
[ $# -gt 0 ] && target1="$1"
- [ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && \
- shift 1
- targets=$(items "$cfgsdir") || \
- $err "Cannot get options for $cfgsdir"
+ [ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && shift 1
+ targets="$(items "$cfgsdir")" || $err "Can't get options for $cfgsdir"
[ $# -gt 0 ] && targets=$@
[ -z "$mode" ] && x_ mkdir -p "$elfdir"
@@ -84,17 +82,15 @@ build_targets()
handle_targets()
{
for x in $targets; do
- target="${x}"
- printf "Running 'make %s' for project '%s, target '%s''\n" \
- "$mode" "$project" "$target"
+ target="$x"
+ printf "'make %s', '%s', '%s'\n" "$mode" "$project" "$target"
[ "$project" != "coreboot" ] || [ -n "$mode" ] || \
- [ "$target1" = "utils" ] || \
- x_ ./vendor download $target
+ [ "$target1" = "utils" ] || x_ ./vendor download $target
x_ handle_defconfig
done
[ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && return 0
- [ -z "${mode}" ] && printf "Done! Check %s/\n\n" "$elfdir"; return 0
+ [ -z "$mode" ] && printf "Done! Check %s/\n\n" "$elfdir"; return 0
}
handle_defconfig()
@@ -104,13 +100,10 @@ handle_defconfig()
[ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && \
eval "handle_coreboot_utils \"$tree\"; return 0"
- for y in "${target_dir}/config"/*; do
+ for y in "$target_dir/config"/*; do
[ -f "$y" ] || continue
config="$y"
- config_name="${config#"${target_dir}/config/"}"
-
- printf "handle/make/config %s %s: handling config %s\n" \
- "$project" "$target" "$config_name"
+ config_name="${config#"$target_dir/config/"}"
[ -n "$mode" ] || check_config || continue
handle_makefile
@@ -120,23 +113,20 @@ handle_defconfig()
handle_src_tree()
{
- target_dir="${cfgsdir}/${target}"
+ target_dir="$cfgsdir/$target"
[ "$mode" = "fetch" ] && [ ! -f "CHANGELOG" ] && \
eval "fetch_project_trees; return 1;"
load_project_config "$target_dir"
-
- x_ mkdir -p "${elfdir}/${target}"
+ x_ mkdir -p "$elfdir/$target"
[ -z "$tree" ] && $err "handle_src_tree $project/$tree: tree unset"
+ cdir="src/$project/$tree"
- codedir="src/${project}/${tree}"
-
- if [ ! -d "$codedir" ]; then
+ if [ ! -d "$cdir" ]; then
if [ "$mode" = "distclean" ] || \
[ "$mode" = "crossgcc-clean" ]; then
- printf "Directory %s missing; skipping clean\n" \
- "$codedir" 1>&2
+ printf "Directory %s missing; skip\n" "$cdir" 1>&2
return 1
fi
x_ ./update trees -f "$project" "$target"
@@ -148,28 +138,27 @@ handle_src_tree()
load_project_config()
{
- eval "$(setvars "" xarch xlang tree bootstrapargs autoconfargs \
- xtree tree_depend makeargs)"
+ eval "$(setvars "" xarch xlang tree bootstrapargs autoconfargs xtree \
+ tree_depend makeargs)"
- [ -f "${1}/target.cfg" ] || return 0
- . "${1}/target.cfg" || \
- $err "load_project_config ${1}: cannot load target.cfg"; return 0
+ [ -f "$1/target.cfg" ] || return 0
+ . "$1/target.cfg" || $err "loadp $1: can't load target.cfg"; return 0
}
check_cross_compiler()
{
for _xarch in $xarch; do
- cbdir="src/coreboot/${tree}"
+ cbdir="src/coreboot/$tree"
[ "$project" != "coreboot" ] && cbdir="src/coreboot/default"
[ -n "$xtree" ] && cbdir="src/coreboot/$xtree"
x_ ./update trees -f coreboot ${cbdir#src/coreboot/}
- export PATH="${PWD}/${cbdir}/util/crossgcc/xgcc/bin:$PATH"
+ export PATH="$PWD/$cbdir/util/crossgcc/xgcc/bin:$PATH"
export CROSS_COMPILE="${xarch% *}-"
- [ -n "${xlang}" ] && export BUILD_LANGUAGES="$xlang"
+ [ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang"
- [ -d "${cbdir}/util/crossgcc/xgcc/${_xarch}/" ] && continue
+ [ -d "$cbdir/util/crossgcc/xgcc/$_xarch/" ] && continue
x_ make -C "$cbdir" crossgcc-${_xarch%-*} CPUS=$threads \
UPDATED_SUBMODULES=1
done
@@ -177,89 +166,78 @@ check_cross_compiler()
check_config()
{
- [ -f "$config" ] || $err "check_config: ${project}/${target}: no config"
+ [ -f "$config" ] || $err "check_config $project/$target: no config"
- dest_dir="${elfdir}/${target}/${config_name}"
+ dest_dir="$elfdir/$target/$config_name"
# TODO: very hacky check. do it properly (based on build.list)
- for elftest in "${dest_dir}"/*; do
- [ -f "$elftest" ] || continue
- printf "Build already exists, so skipping build\n" 1>&2
- return 1
+ for elftest in "$dest_dir"/*; do
+ e "$elftest" f && return 1
done
x_ mkdir -p "$dest_dir"
}
handle_makefile()
{
- x_ make clean -C "$codedir"
- x_ cp "$config" "${codedir}/.config"
- [ -n "$mode" ] || make -C "$codedir" silentoldconfig || \
- make -C "$codedir" oldconfig || :
+ x_ make clean -C "$cdir" && x_ cp "$config" "$cdir/.config"
+ [ -n "$mode" ] || make -C "$cdir" silentoldconfig || \
+ make -C "$cdir" oldconfig || :
- run_make_command || $err "handle_makefile $codedir: no makefile!"
+ run_make_command || $err "handle_makefile $cdir: no makefile!"
_copy=".config"
[ "$mode" = "savedefconfig" ] && _copy="defconfig"
- [ "${mode%config}" = "$mode" ] || x_ cp "$codedir/$_copy" "$config"
+ [ "${mode%config}" = "$mode" ] || x_ cp "$cdir/$_copy" "$config"
- [ -e "${codedir}/.git" ] && [ "$project" = "u-boot" ] && \
- [ "$mode" = "distclean" ] && \
- x_ git -C "$codedir" clean -fdx; return 0
+ [ -e "$cdir/.git" ] && [ "$project" = "u-boot" ] && \
+ [ "$mode" = "distclean" ] && x_ git -C "$cdir" clean -fdx; return 0
}
run_make_command()
{
- check_cmake "$codedir"
- [ -z "$mode" ] && check_autoconf "$codedir"
- check_makefile "$codedir" || return 1
+ check_cmake "$cdir"
+ [ -z "$mode" ] && check_autoconf "$cdir"
+ check_makefile "$cdir" || return 1
[ "$project" = "coreboot" ] && [ -z "$mode" ] && x_ \
- printf "%s\n" "${version%%-*}" > "$codedir/.coreboot-version"
-
- [ "$project" = "coreboot" ] && \
- makeargs="$makeargs UPDATED_SUBMODULES=1"
+ printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" \
+ && makeargs="$makeargs UPDATED_SUBMODULES=1"
- make -C "$codedir" $mode -j$threads $makeargs || \
- $err "run_make $codedir: !make $mode"
+ make -C "$cdir" $mode -j$threads $makeargs || $err "!mk $cdir $mode"
[ "$mode" != "clean" ] && return 0
- make -C "$codedir" distclean 2>/dev/null || :
+ make -C "$cdir" distclean 2>/dev/null || :
}
check_cmake()
{
- [ -z "${cmakedir}" ] || \
- check_makefile "${1}" || \
- cmake -B "${1}" "${1}/${cmakedir}" || \
- check_makefile "${1}" || \
- $err "check_cmake ${1}: can't cmake ${cmakedir}"
- [ -z "${cmakedir}" ] || check_makefile "${1}" || \
- $err "check_cmake ${1}: can't generate Makefile"; return 0
+ [ -z "$cmakedir" ] || check_makefile "$1" || cmake -B "$1" \
+ "$1/$cmakedir" || check_makefile "$1" || $err "$1: !cmk $cmakedir"
+ [ -z "$cmakedir" ] || check_makefile "$1" || \
+ $err "check_cmake $1: can't generate Makefile"; return 0
}
check_autoconf()
{
(
- cd "${1}" || $err "!cd $1"
+ cd "$1" || $err "!cd $1"
[ -f "bootstrap" ] && x_ ./bootstrap $bootstrapargs
- [ -f "autogen.sh" ] && x_ ./autogen.sh ${autogenargs}
+ [ -f "autogen.sh" ] && x_ ./autogen.sh $autogenargs
[ -f "configure" ] && x_ ./configure $autoconfargs; return 0
) || $err "can't bootstrap project: $1"
}
check_makefile()
{
- [ -f "${1}/Makefile" ] || [ -f "${1}/makefile" ] || \
- [ -f "${1}/GNUmakefile" ] || return 1; return 0
+ [ -f "$1/Makefile" ] || [ -f "$1/makefile" ] || \
+ [ -f "$1/GNUmakefile" ] || return 1; return 0
}
copy_elf()
{
while read -r f; do
- [ ! -f "${codedir}/$f" ] || \
- x_ cp "${codedir}/${f}" "$dest_dir"
+ [ -f "$cdir/$f" ] && x_ cp "$cdir/$f" "$dest_dir"
done < "$listfile"
- x_ make clean -C "$codedir"
+ x_ make clean -C "$cdir"
}
main $@
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 06:41:14 +0000