From 8d9aeef3de28bcb908e33b804517bdeacce7be38 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 20 Oct 2023 00:17:30 +0100 Subject: lbmk: use 2-level directory structure in script/ as opposed to the current 3-level structure. recent build system simplifications have enabled this change, thus: ./build fw coreboot -> ./build roms ./build fw grub -> ./build grub ./build fw serprog -> ./build serprog ./update project release -> ./update release ./update project trees -> ./update trees ./update vendor download -> ./vendor download ./update vendor inject -> ./vendor inject alper criticised that the commands were too long, so i made them shorter! Signed-off-by: Leah Rowe --- script/build/fw/coreboot | 416 ----------------------------------------------- script/build/fw/grub | 82 ---------- script/build/fw/serprog | 81 --------- 3 files changed, 579 deletions(-) delete mode 100755 script/build/fw/coreboot delete mode 100755 script/build/fw/grub delete mode 100755 script/build/fw/serprog (limited to 'script/build/fw') diff --git a/script/build/fw/coreboot b/script/build/fw/coreboot deleted file mode 100755 index 8853f749..00000000 --- a/script/build/fw/coreboot +++ /dev/null @@ -1,416 +0,0 @@ -#!/usr/bin/env sh -# SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: 2014-2016,2020,2021,2023 Leah Rowe -# SPDX-FileCopyrightText: 2021,2022 Ferass El Hafidi -# SPDX-FileCopyrightText: 2022 Caleb La Grange -# SPDX-FileCopyrightText: 2022-2023 Alper Nebi Yasak -# SPDX-FileCopyrightText: 2023 Riku Viitanen - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -. "include/err.sh" -. "include/option.sh" - -seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin" -grub_background="background1280x800.png" -grubelf="elf/grub/grub.elf" -cfgsdir="config/coreboot" -kmapdir="config/grub/keymap" - -# 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" -pv="${pv} payload_seabios_withgrub payload_uboot memtest_bin" -v="romdir cbrom initmode displaymode cbcfg targetdir tree arch" -v="${v} grub_timeout ubdir vendorfiles board grub_scan_disk uboot_config" -eval "$(setvars "n" ${pv})" -eval "$(setvars "" ${v} boards _displaymode _payload _keyboard all targets)" - -main() -{ - while [ $# -gt 0 ]; do - case ${1} in - help) usage && exit 0 ;; - list) items config/coreboot && exit 0 ;; - -d) _displaymode="${2}" ;; - -p) _payload="${2}" ;; - -k) _keyboard="${2}" ;; - *) - [ "${1}" = "all" ] && all="y" - boards="${1} ${boards}" - shift && continue ;; - esac - shift 2 - done - - [ "${all}" != "y" ] || boards=$(items config/coreboot) || \ - err "Cannot generate list of boards for building" - - for x in ${boards}; do - eval "$(setvars "n" ${pv})" - eval "$(setvars "" ${v})" - grub_background="background1280x800.png" - board="${x}" - check_target - prepare_target - [ -d "bin/${board}" ] || continue - targets="* bin/${board}\n${targets}" - done - - [ -z "${targets}" ] && err "No ROM images were compiled" - printf "\nROM images available in these directories:\n" - printf "${targets}^^ ROM images available in these directories.\n\n" - - printf "DO NOT flash ROM images from elf/ - please use bin/ instead.\n" -} - -check_target() -{ - targetdir="${cfgsdir}/${board}" - [ -f "${targetdir}/target.cfg" ] || \ - err "Missing target.cfg for target: ${board}" - - # Override the above defaults using 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 "${tree}" ] && \ - err "Target '${board}' defines no tree. Skipping build." - [ -z "${arch}" ] && \ - err "Target '${board}' defines no arch. Skipping build." - - [ "${payload_memtest}" != "y" ] && \ - payload_memtest="n" - [ "${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" - - # The reverse logic must not be applied. If SeaBIOS-with-GRUB works, - # that doesn't mean GRUB-withSeaBIOS will. For example, the board - # might have a graphics card whose vga rom coreboot doesn't execute - [ "${payload_grub}" != "y" ] && [ "${payload_seabios}" != "y" ] && \ - [ "${payload_uboot}" != "y" ] && \ - for configfile in "${targetdir}/config/"*; do - [ -e "${configfile}" ] || continue - err "target '${board}' defines no payload" - done - - [ "${payload_uboot}" != "n" ] && [ "${payload_uboot}" != "y" ] && \ - payload_uboot="n" - [ "${payload_uboot}" = "y" ] && [ -z "${uboot_config}" ] && \ - uboot_config="default" - [ "${vendorfiles}" != "n" ] && [ "${vendorfiles}" != "y" ] && \ - vendorfiles="y" - - # Override all payload directives with cmdline args - [ -z "${_payload}" ] && return 0 - printf "setting payload to: %s\n" "${_payload}" - eval "$(setvars "n" payload_grub payload_memtest payload_seabios \ - payload_seabios_withgrub payload_uboot payload_grub_withseabios)" - eval "payload_${_payload}=y" -} - -prepare_target() -{ - 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 project trees -b coreboot utils ${tree} - - build_dependency_seabios - - memtest_bin="memtest86plus/build64/memtest.bin" - [ "${payload_memtest}" != "y" ] || [ -f "src/${memtest_bin}" ] || \ - x_ ./update project trees -b memtest86plus - - x_ rm -f "${romdir}/"* - - build_dependency_grub - build_dependency_uboot - build_target -} - -build_dependency_seabios() -{ - [ "${payload_seabios}" = "y" ] || return 0 - [ -f "${seavgabiosrom}" ] && \ - [ -f elf/seabios/default/libgfxinit/bios.bin.elf ] && \ - [ -f elf/seabios/default/vgarom/bios.bin.elf ] && \ - [ -f elf/seabios/default/normal/bios.bin.elf ] && return 0 - - x_ ./update project trees -b seabios -} - -build_dependency_grub() -{ - [ "${payload_grub}" != "y" ] && \ - [ "${payload_seabios_withgrub}" != "y" ] && return 0 - - rebuild_grub="n" - [ -f "${grubelf}" ] || rebuild_grub="y" - for keymapfile in "${kmapdir}"/*.gkb; do - [ "${rebuild_grub}" = "y" ] || break - [ -f "${keymapfile}" ] || continue - - keymap="${keymapfile##*/}" - keymap="${keymap%.gkb}" - [ ! -f "elf/grub/keymap_${keymap}.cfg" ] && \ - rebuild_grub="y" && break - done - [ "${rebuild_grub}" = "y" ] || return 0 - x_ ./build fw grub -} - -build_dependency_uboot() -{ - [ "${payload_uboot}" = "y" ] || return 0 - - x_ ./update project 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}" ] && return 0 - err "Could not find u-boot build for board, ${board}" -} - -build_target() -{ - for x in "normal" "vgarom" "libgfxinit"; do - initmode="${x}" - hmode="vesafb" - [ "${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}" - done - done -} - -# Main ROM building function. This calls all other functions below -build_roms() -{ - cbcfg="${1}" - [ ! -f "${cbcfg}" ] && \ - printf "'%s' does not exist. Skipping build for %s %s %s\n" \ - "${cbcfg}" "${board}" "${displaymode}" "${initmode}" \ - 1>&2 && return 0 - - x_ ./update project trees -b coreboot ${board} - - _cbrom="elf/coreboot_nopayload_DO_NOT_FLASH/${board}/${initmode}_${displaymode}" - [ "${initmode}" = "normal" ] && \ - _cbrom="${_cbrom%_${displaymode}}" - _cbrom="${_cbrom}/coreboot.rom" - cbrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)" - 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_grub}" != "y" ] || \ - x_ build_grub_roms "${cbrom}" "grub" - [ "${payload_uboot}" = "y" ] || return 0 - build_uboot_roms -} - -build_seabios_roms() -{ - if [ "${payload_seabios_withgrub}" = "y" ]; then - tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX) - x_ cp "${cbrom}" "${tmprom}" - x_ build_grub_roms "${tmprom}" "seabios_withgrub" - x_ rm -f "${tmprom}" - else - 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_ moverom "${t}" "${newrom}.rom" - x_ rm -f "${t}" - fi -} - -# Make separate ROM images with GRUB payload, for each supported keymap -build_grub_roms() -{ - tmprom="${1}" - payload1="${2}" # allow values: grub, seabios, seabios_withgrub - - grub_cbfs="fallback/payload" - [ "${payload1}" = "grub" ] && [ "${payload_grub_withseabios}" = "y" ] \ - && x_ mv "$(mkSeabiosRom "${tmprom}" "seabios.elf")" "${tmprom}" - [ "${payload1}" != "grub" ] && [ "${payload_seabios_withgrub}" = "y" ] \ - && grub_cbfs="img/grub2" && \ - x_ mv "$(mkSeabiosRom "${tmprom}" fallback/payload)" "${tmprom}" - - # we only need insert grub.elf once, for each coreboot config: - 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}" - x_ "${cbfstool}" "${tmprom}" add -f ${backgroundfile} \ - -n background.png -t raw - fi - - tmpcfg=$(mktemp -t coreboot_rom.XXXXXXXXXX) - x_ printf "set grub_scan_disk=\"%s\"\n" "${grub_scan_disk}" >"${tmpcfg}" - [ "${grub_scan_disk}" = "both" ] || \ - x_ "${cbfstool}" "${tmprom}" add -f "${tmpcfg}" -n scan.cfg -t raw - x_ printf "set timeout=%s\n" "${grub_timeout}" > "${tmpcfg}" - [ -z "${grub_timeout}" ] || x_ "${cbfstool}" "${tmprom}" add \ - -f "${tmpcfg}" -n timeout.cfg -t raw - x_ rm -f "${tmpcfg}" - - keymaps="" - for kmapfile in "${kmapdir}"/*; do - keymaps="${keymaps} ${kmapfile}" - done - [ -z "${_keyboard}" ] || keymaps="${kmapdir}/${_keyboard}.gkb" - - for keymapfile in ${keymaps}; do - [ -f "${keymapfile}" ] || continue - keymap="${keymapfile##*/}" - keymap="${keymap%.gkb}" - tmpgrubrom="$(mkGrubRom "${keymap}" "${tmprom}")" - - newrom="${romdir}/${payload1}_${board}_${initmode}_" - newrom="${newrom}${displaymode}_${keymap}.rom" - [ "${initmode}" = "normal" ] && \ - newrom="${romdir}/${payload1}_${board}_" && \ - newrom="${newrom}${initmode}_${keymap}.rom" - x_ moverom "${tmpgrubrom}" "${newrom}" - x_ rm -f "${tmpgrubrom}" - done -} - -# make a rom in /tmp/ and then print the path of that ROM -mkGrubRom() { - _keymap="${1}" - _cbrom="${2}" - - keymapcfg="elf/grub/keymap_${_keymap}.cfg" - - tmprom=$(mktemp -t coreboot_rom.XXXXXXXXXX) - x_ cp "${_cbrom}" "${tmprom}" - x_ "${cbfstool}" "${tmprom}" add -f "${keymapcfg}" -n keymap.cfg -t raw - - printf "%s\n" "${tmprom}" -} - -# 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 - # (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) - - x_ cp "${_cbrom}" "${tmprom}" - x_ "${cbfstool}" "${tmprom}" add-payload -f "${_seabioself}" \ - -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 - - printf "%s\n" "${tmprom}" -} - -build_uboot_roms() -{ - tmprom="$(mkUbootRom "${cbrom}" "fallback/payload")" - newrom="${romdir}/uboot_payload_${board}_${initmode}_${displaymode}.rom" - [ "${initmode}" = "normal" ] && \ - newrom="${romdir}/uboot_payload_${board}_${initmode}.rom" - x_ moverom "${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}" - - _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) - - x_ cp "${_cbrom}" "${tmprom}" - x_ "${cbfstool}" "${tmprom}" add-payload -f "${_ubootelf}" \ - -n ${_uboot_cbfs_path} -c lzma - - printf "%s\n" "${tmprom}" -} - -# it is assumed that no other work will be done on the ROM -# after calling this function. therefore this function is "final" -moverom() { - rompath="${1}" - newrom="${2}" - - printf "Creating target image: %s\n" "${newrom}" - - [ -d "${newrom%/*}" ] || x_ mkdir -p "${newrom%/*}/" - [ "${vendorfiles}" = "n" ] && newrom="${newrom%.rom}_noblobs.rom" - x_ cp "${rompath}" "${newrom}" -} - -usage() -{ - cat <<- EOF - USAGE: ./build fw coreboot targetname - To build *all* boards, do this: ./build fw coreboot all - To list *all* boards, do this: ./build fw coreboot list - - Optional Flags: - -d: displaymode - -p: payload - -k: keyboard layout - - Example commands: - - ./build fw coreboot x60 - ./build fw coreboot x200_8mb x60 - ./build fw coreboot x60 -p grub -d corebootfb -k usqwerty - - possible values for 'target': - $(items "config/coreboot") - - Refer to the ${projectname} documentation for more information. - EOF -} - -main $@ diff --git a/script/build/fw/grub b/script/build/fw/grub deleted file mode 100755 index 66286732..00000000 --- a/script/build/fw/grub +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/env sh -# SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: 2014,2015,2020,2021,2023 Leah Rowe - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -. "include/err.sh" - -elfdir="elf/grub" -grubcfgsdir="config/grub" -layoutdir="/boot/grub/layouts" - -. "${grubcfgsdir}/modules.list" - -main() -{ - handle_dependencies - build_keymap_configs - build_grub_payload - printf "GRUB files now available under directory: %s\n" "${elfdir}" -} - -handle_dependencies() -{ - [ -d "src/grub" ] || x_ ./update project trees -f grub - [ -f "src/grub/grub-mkstandalone" ] || build_grub_utils - x_ mkdir -p "${elfdir}" - x_ rm -f "${elfdir}/"* -} - -build_grub_utils() -{ - ( - x_ cd "src/grub" - [ ! -d Makefile ] || x_ make distclean - x_ ./bootstrap --gnulib-srcdir=gnulib/ --no-git - x_ ./autogen.sh - x_ ./configure --with-platform=coreboot - x_ make -j$(nproc) FS_PAYLOAD_MODULES="" - ) -} - -build_keymap_configs() -{ - for keylayoutfile in "${grubcfgsdir}/keymap/"*.gkb; do - [ -f "${keylayoutfile}" ] || continue - keymap="${keylayoutfile##${grubcfgsdir}/keymap/}" - keymap="${keymap%.gkb}" - x_ printf "keymap %s\n" "${keymap}" > \ - "${elfdir}/keymap_${keymap}.cfg" - done -} - -build_grub_payload() -{ - ./src/grub/grub-mkstandalone \ - --grub-mkimage="src/grub/grub-mkimage" \ - -O i386-coreboot \ - -o "${elfdir}/grub.elf" \ - -d "src/grub/grub-core/" \ - --fonts= --themes= --locales= \ - --modules="${grub_modules}" \ - --install-modules="${grub_install_modules}" \ - "${layoutdir}/colemak.gkb=${grubcfgsdir}/keymap/colemak.gkb" \ - "${layoutdir}/deqwertz.gkb=${grubcfgsdir}/keymap/deqwertz.gkb" \ - "${layoutdir}/esqwerty.gkb=${grubcfgsdir}/keymap/esqwerty.gkb" \ - "${layoutdir}/frazerty.gkb=${grubcfgsdir}/keymap/frazerty.gkb" \ - "${layoutdir}/frdvbepo.gkb=${grubcfgsdir}/keymap/frdvbepo.gkb" \ - "${layoutdir}/itqwerty.gkb=${grubcfgsdir}/keymap/itqwerty.gkb" \ - "${layoutdir}/svenska.gkb=${grubcfgsdir}/keymap/svenska.gkb" \ - "${layoutdir}/trqwerty.gkb=${grubcfgsdir}/keymap/trqwerty.gkb" \ - "${layoutdir}/ukdvorak.gkb=${grubcfgsdir}/keymap/ukdvorak.gkb" \ - "${layoutdir}/ukqwerty.gkb=${grubcfgsdir}/keymap/ukqwerty.gkb" \ - "${layoutdir}/usdvorak.gkb=${grubcfgsdir}/keymap/usdvorak.gkb" \ - "${layoutdir}/usqwerty.gkb=${grubcfgsdir}/keymap/usqwerty.gkb" \ - "/boot/grub/grub.cfg=${grubcfgsdir}/config/grub_memdisk.cfg" \ - "/boot/grub/grub_default.cfg=${grubcfgsdir}/config/grub.cfg" || \ - err "build_grub_elf: cannot build grub payload (grub-mkstandalone)" -} - -main $@ diff --git a/script/build/fw/serprog b/script/build/fw/serprog deleted file mode 100755 index eb0e5ede..00000000 --- a/script/build/fw/serprog +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/env sh -# SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: 2023 Riku Viitanen - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -. "include/err.sh" - -eval "$(setvars "" platform pico_sdk_dir pico_src_dir stm32_src_dir boards_dir)" - -pico_src_dir=src/pico-serprog -pico_sdk_dir=src/pico-sdk -stm32_src_dir=src/stm32-vserprog - -usage="usage: ./build firmware serprog [board]" - -main() -{ - [ -z "${1+x}" ] && err "${usage}" - if [ "${1}" = "rp2040" ]; then - platform="rp2040" - boards_dir=${pico_sdk_dir}/src/boards/include/boards - [ -d "${pico_src_dir}/" ] || \ - x_ ./update project trees -f "rpi-pico-serprog" - elif [ "${1}" = "stm32" ]; then - platform="stm32" - boards_dir=${stm32_src_dir}/boards - [ -d "${stm32_src_dir}/" ] || \ - x_ ./update project trees -f "stm32-vserprog" - else - err "${usage}" - fi - x_ mkdir -p "bin/serprog_${platform}" - - if [ $# -gt 1 ] ; then - [ "${2}" = "list" ] && print_boards ${boards_dir} && return 0 - build_${platform}_rom "${2}" - else - printf "Building all serprog targets\n" - list_boards "${boards_dir}" | while read board; do - build_${platform}_rom "${board}" - done - fi -} - -build_rp2040_rom() -{ - board=${1} - printf "Building pico-serprog for ${board}\n" - 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 - printf "output to bin/serprog_rp2040/serprog_${board}.uf2\n" -} - -build_stm32_rom() -{ - board=${1} - printf "Building stm32-vserprog for ${board}\n" - 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 - printf "output to bin/serprog_stm32/serprog_${board}.hex\n" -} - -print_boards() -{ - printf "Available boards:\n" - list_boards "${1}" -} - -list_boards() -{ - basename -a -s .h ${1}/*.h -} - -main $@ -- cgit v1.2.1