diff options
Diffstat (limited to 'script')
| -rwxr-xr-x | script/roms | 319 | ||||
| -rwxr-xr-x | script/trees | 154 |
2 files changed, 181 insertions, 292 deletions
diff --git a/script/roms b/script/roms index ca38f04d..8a2cc796 100755 --- a/script/roms +++ b/script/roms @@ -10,83 +10,74 @@ set -u -e . "include/lib.sh" +tmprom="$TMPDIR/rom" + seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin" cfgsdir="config/coreboot" rp2040src="src/pico-serprog" rp2040x="$rp2040src/build/pico_serprog.uf2" picosdk="src/pico-sdk" +rp2040dir="$picosdk/src/boards/include/boards" stm32src="src/stm32-vserprog" stm32x="$stm32src/stm32-vserprog.hex" -tmpcfg="$tmpdir/tmpcfg" +stm32dir="$stm32src/boards" # Disable all payloads by default. # target.cfg files have to specifically enable [a] payload(s) -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 release ubootelf" -v="$v grub_timeout board grub_scan_disk uboot_config grubtree grubelf tmpmv" -eval "$(setvars "n" $pv)" -eval "$(setvars "" $v boards targets serprogdir ser)" +pv="payload_uboot payload_seabios payload_memtest payload_grub" +v="romdir initmode displaymode targetdir tree release ubootelf" +v="$v board grub_scan_disk uboot_config grubtree grubelf tmpmv" +eval `setvars "n" $pv` +eval `setvars "" $v boards targets serdir ser` main() { while [ $# -gt 0 ]; do - [ "$1" = "list" ] && eval "x_ ls -1 config/coreboot; return 0" - [ "$1" = "serprog" ] && shift && eval "mkserprog $@; return 0" - [ "$1" = "all" ] && shift && continue + if [ "$1" = "serprog" ]; then + [ $# -lt 2 ] && $err "serprog type not set" + [ "$2" != "rp2040" ] && [ "$2" != "stm32" ] && \ + $err "invalid serprog type" + eval "x_ ./update trees -f \"\${${2}src##*/}\"" + ser="$2" && shift 2 && continue + fi + [ "$1$ser" = "list" ] && x_ ls -1 config/coreboot && return 0 + [ "$1" = "all" ] && shift 1 && continue boards="$1 $boards"; shift 1 done - [ -n "$boards" ] || boards="$(ls -1 config/coreboot)" || \ - $err "Cannot generate list of boards for building" - for x in $boards; do - [ -d "config/coreboot/$x/config" ] && configure_target "$x" \ - && build_payloads && build_board && [ -d "bin/$board" ] \ - && targets="$targets, $x"; continue - done + [ -n "$boards" ] || [ -n "$ser" ] || boards="$(ls -1 \ + config/coreboot)" || $err "can't list coreboot boards" -# [ -z "$targets" ] && $err "No ROM images were compiled" - printf "Check these ROM directories in bin/: %s\n" "${targets#, }" - printf "DO NOT flash images from elf/ - use bin/ instead. ALSO:\n" - printf "%s\n" "$kbnotice" -} + [ -n "$ser" ] && \ + eval "serlist \"\$${ser}dir\" > \"\$TMPDIR/ser\" || $err \"!ser\"" + [ -n "$ser" ] && [ -z "$boards" ] && boards="$(cat "$TMPDIR/ser")" -mkserprog() -{ - [ -z "${1+x}" ] && badcmd - [ "$1" != "rp2040" ] && [ "$1" != "stm32" ] && $err "bad command" - if [ "$1" = "rp2040" ]; then - serprogdir="$picosdk/src/boards/include/boards" - [ -d "$rp2040src" ] || x_ ./update trees -f "pico-serprog" - elif [ "$1" = "stm32" ]; then - serprogdir="$stm32src/boards" - [ -d "$stm32src" ] || x_ ./update trees -f "stm32-vserprog" - fi - x_ mkdir -p "bin/serprog_$1" - - [ $# -gt 1 ] && [ "$2" = "list" ] && serlist "$serprogdir" && return 0 - ser="$1" && shift - - targets="$@" && [ -z "$targets" ] && targets="$(serlist "$serprogdir")" - for board in $targets; do - mkserprogfw "$ser" "$board" + for x in $boards; do + [ -n "$ser" ] && mkserprogfw "$ser" "$x" + [ -z "$ser" ] && [ -d "config/coreboot/$x/config" ] && \ + configure_target "$x" && build_roms && \ + [ -d "bin/$board" ] && targets="$targets, $x" && \ + [ "$XBMK_RELEASE" = "y" ] && mkrom_tarball "bin/$x" done - [ "$xbmk_release" = "y" ] && mkrom_tarball "bin/serprog_$1"; return 0 + [ -n "$ser" ] && [ "$XBMK_RELEASE" = "y" ] && \ + mkrom_tarball "bin/serprog_$ser" && return 0 + + [ -z "$ser" ] && [ -z "$targets" ] && $err "No images were compiled" + [ -z "$ser" ] && printf "ROMs built in bin/ for: %s\n" "${targets#, }" + [ -n "$ser" ] && printf "ROMs (serprog) built in bin/%s/\n" "$ser" + printf "Please flash from bin/, NOT elf/ - ALSO:\n%s\n" "$kbnotice" } mkserprogfw() { - if [ "$1" = "rp2040" ]; then - x_ cmake -DPICO_BOARD="$2" -DPICO_SDK_PATH="$picosdk" \ - -B "$rp2040src/build" "$rp2040src" - x_ cmake --build "$rp2040src/build" - else - x_ make -C "$stm32src" libopencm3-just-make BOARD=$2 - x_ make -C "$stm32src" BOARD=$2 - fi + x_ mkdir -p "bin/serprog_$1" + [ "$1" = "rp2040" ] && x_ cmake -DPICO_BOARD="$2" \ + -DPICO_SDK_PATH="$picosdk" -B "$rp2040src/build" "$rp2040src" && \ + x_ cmake --build "$rp2040src/build" + [ "$1" = "stm32" ] && x_ make -C "$stm32src" libopencm3-just-make \ + BOARD=$2 && x_ make -C "$stm32src" BOARD=$2 eval "x_ mv \"\$${1}x\" \"bin/serprog_$1/serprog_$2.\${${1}x##*.}\"" - printf "Look in bin/serprog_%s/ for images\n" "$1" } serlist() @@ -96,210 +87,108 @@ serlist() configure_target() { - eval "$(setvars "n" $pv) $(setvars "" $v)" - board="$1" + eval `setvars "n" $pv` + eval `setvars "" $v` - targetdir="$cfgsdir/$board" - [ -f "$targetdir/target.cfg" ] || $err "$board: target.cfg missing" + board="$1"; targetdir="$cfgsdir/$board"; romdir="bin/$board" # Override the above defaults using target.cfg - . "$targetdir/target.cfg" - - [ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata" - - [ -n "$grubtree" ] || grubtree="default" - grubelf="elf/grub/$grubtree/payload/grub.elf" + eval `setcfg "$targetdir/target.cfg"` [ -z "$tree" ] && $err "$board: tree not defined" + [ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && return 1 + [ "$board" = "$tree" ] && return 1 - [ "$payload_memtest" != "y" ] && payload_memtest="n" - [ "$(uname -m)" = "x86_64" ] || payload_memtest="n" - - [ "$payload_grub_withseabios" = "y" ] && eval "$(setvars "y" \ - payload_grub payload_seabios payload_seabios_withgrub)" - [ "$payload_seabios_withgrub" = "y" ] && payload_seabios="y" - [ "$payload_seabios_grubonly" = "y" ] && \ - eval "$(setvars "y" payload_seabios payload_seabios_withgrub)" - - # 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 "'$board' defines no payload" - - [ "$payload_uboot" != "n" ] && [ "$payload_uboot" != "y" ] && \ - payload_uboot="n" - [ -n "$uboot_config" ] || uboot_config="default" - - [ "$xbmk_release" = "y" ] && [ "$release" = "n" ] && return 1 - [ "$board" = "$tree" ] && return 1; return 0 -} + x_ ./update trees -b coreboot $board -build_payloads() -{ - romdir="bin/$board" - cbdir="src/coreboot/$board" - [ "$board" = "$tree" ] || cbdir="src/coreboot/$tree" cbfstool="elf/cbfstool/$tree/cbfstool" - cbrom="$cbdir/build/coreboot.rom" + x_ ./update trees -b coreboot utils $tree - [ -f "$cbfstool" ] || x_ ./update trees -b coreboot utils $tree + [ -n "$uboot_config" ] || uboot_config="default" + [ "$payload_uboot" = "y" ] || payload_seabios="y" + [ "$payload_grub" = "y" ] && payload_seabios="y" + [ "$payload_seabios" = "y" ] && [ "$payload_uboot" = "y" ] && \ + $err "$board: U-Boot and SeaBIOS/GRUB are both enabled." - mt86bin="elf/memtest86plus/memtest.bin" - [ "$payload_memtest" != "y" ] || [ -f "$mt86bin" ] || \ - x_ ./update trees -b memtest86plus + [ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata" - [ "$payload_seabios" = "y" ] && x_ ./update trees -b seabios - if [ "$payload_grub" = "y" ] || [ "$payload_seabios_withgrub" = "y" ] \ - || [ "$payload_seabios_grubonly" = "y" ]; then - [ -f "$grubelf" ] || x_ ./update trees -b grub $grubtree - fi - [ "$payload_uboot" = "y" ] && build_uboot_payload; return 0 -} + [ -n "$grubtree" ] || grubtree="default" + grubelf="elf/grub/$grubtree/payload/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" ] && \ - ubootelf="$ubdir/u-boot" - [ -f "$ubootelf" ] || $err "$board: Can't find u-boot"; return 0 + [ "$payload_memtest" = "y" ] || payload_memtest="n" + [ "$(uname -m)" = "x86_64" ] || payload_memtest="n"; return 0 } -build_board() +build_roms() { x_ rm -Rf "$romdir" - for it in "normal" "vgarom" "libgfxinit"; do - initmode="$it" - hmode="vesafb" - [ "$initmode" = "vgarom" ] || hmode="corebootfb" - modes="$hmode txtmode" - for y in $modes; do - displaymode="$y" - [ "$initmode" = "normal" ] && \ - [ "$displaymode" != "txtmode" ] && continue - cbcfg="$targetdir/config/${initmode}_$displaymode" - [ "$initmode" = "normal" ] && cbcfg="${cbcfg%_*}" - e "$cbcfg" f not || build_roms; x_ rm -f "$cbrom" - done - done + for cbcfg in "$targetdir/config/"*; do + [ -f "$cbcfg" ] || continue; cn="${cbcfg##*/}"; dt="${cn#*_}" \ + && [ "$dt" = "$cn" ] && dt="txtmode"; displaymode="$dt" + initmode="${cn%%_*}"; chkvars initmode displaymode + e "$cbcfg" f not || add_payloads + done; x_ rm -f "$tmprom" } -build_roms() +add_payloads() { - x_ ./update trees -b coreboot $board + cbuild="$cbelfdir/$board/${initmode}_$displaymode" + [ "$initmode" = "normal" ] && cbuild="${cbuild%"_$displaymode"}" + x_ cp "$cbuild/coreboot.rom" "$tmprom" - _cbrom="$cbelfdir/$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" ] || cbfs "$cbrom" "$mt86bin" img/memtest - [ "$payload_seabios" = "y" ] && build_seabios_roms - [ "$payload_grub" != "y" ] || build_grub_roms "$cbrom" "grub" + [ "$payload_seabios" = "y" ] && add_seabios_payload [ "$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" - build_grub_roms "$t" "seabios_withgrub" - 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" - cprom cp "$t" "$newrom.rom" - fi - x_ rm -f "$t" -} + # add u-boot payload + x_ ./update trees -b u-boot $board + ubdir="elf/u-boot/$board/$uboot_config"; ubootelf="$ubdir/u-boot.elf" \ + && [ ! -f "$ubootelf" ] && ubootelf="$ubdir/u-boot" + [ -f "$ubootelf" ] || $err "$board: Can't find u-boot" -# Make separate ROM images with GRUB payload -build_grub_roms() -{ - tmprom="$1" - payload1="$2" # allow values: grub, seabios, seabios_withgrub - - grub_cbfs="fallback/payload" - if [ "$payload1" = "grub" ] && [ "$payload_grub_withseabios" = "y" ] - then - tmpmv="$(mkSeabiosRom "$tmprom" "seabios.elf")" || \ - $err "build_grub_roms 1 $board: can't build tmprom" - elif [ "$payload1" != "grub" ] && [ "$payload_seabios_withgrub" = "y" ] - then - grub_cbfs="img/grub2" - tmpmv="$(mkSeabiosRom "$tmprom" fallback/payload)" || \ - $err "build_grub_roms 2 $board: can't build tmprom" - fi - [ -n "$tmpmv" ] && [ -f "$tmpmv" ] && x_ mv "$tmpmv" "$tmprom" - - # we only need insert grub.elf once, for each coreboot config: - cbfs "$tmprom" "$grubelf" "$grub_cbfs" - - printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" > "$tmpcfg" || \ - $err "set grub_scan_disk, $grub_scan_disk, $tmpcfg" - cbfs "$tmprom" "$tmpcfg" scan.cfg raw - - printf "set timeout=%s\n" "$grub_timeout" > "$tmpcfg" || $err "!time" - [ -z "$grub_timeout" ] || cbfs "$tmprom" "$tmpcfg" timeout.cfg raw - - newrom="$romdir/${payload1}_${board}_${initmode}_$displaymode.rom" - [ "$initmode" = "normal" ] && newrom="$romdir/${payload1}_" \ - && newrom="$newrom${board}_$initmode.rom" - cprom cp "$tmprom" "$newrom" - if [ "$payload_seabios_withgrub" = "y" ] && \ - [ "$payload1" != "grub" ]; then - cbfs "$tmprom" "$grubdata/bootorder" bootorder raw - cprom cp "$tmprom" "${newrom%.rom}_grubfirst.rom" - if [ "$payload_seabios_grubonly" = "y" ]; then - x_ "$cbfstool" "$tmprom" add-int -i 0 \ - -n etc/show-boot-menu - cprom cp "$tmprom" "${newrom%.rom}_grubonly.rom" - fi - fi + cbfs "$tmprom" "$ubootelf" "fallback/payload" + cprom "$romdir/uboot_payload_${board}_${initmode}_$displaymode.rom" } -# make a rom in /tmp/ and then print the path of that ROM -mkSeabiosRom() { - tmprom="$(mktemp -t coreboot_rom.XXXXXXXXXX)" # 1=cbrom, 2=cbfs path +add_seabios_payload() +{ _seabioself="elf/seabios/default/$initmode/bios.bin.elf" + x_ ./update trees -b seabios - x_ cp "$1" "$tmprom" - cbfs "$tmprom" "$_seabioself" "$2" + pstr="seabios" && [ "$payload_grub" = "y" ] && pstr="seabios_withgrub" + newrom="$romdir/${pstr}_${board}_$initmode.rom" + [ "$initmode" = "normal" ] || newrom="${newrom%.rom}_$displaymode.rom" + + cbfs "$tmprom" "$_seabioself" "fallback/payload" 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" ] || cbfs "$tmprom" "$seavgabiosrom" \ + [ "$initmode" = "libgfxinit" ] && cbfs "$tmprom" "$seavgabiosrom" \ vgaroms/seavgabios.bin raw - printf "%s\n" "$tmprom" -} + if [ "$payload_grub" = "y" ]; then + x_ ./update trees -b grub $grubtree + cbfs "$tmprom" "$grubelf" "img/grub2" + printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" \ + > "$TMPDIR/tmpcfg" || $err "$board: !insert scandisk" + cbfs "$tmprom" "$TMPDIR/tmpcfg" scan.cfg raw + fi -build_uboot_roms() -{ - tmprom="$(mktemp -t coreboot_rom.XXXXXXXXXX)" - newrom="$romdir/uboot_payload_${board}_${initmode}_$displaymode.rom" - x_ cp "$cbrom" "$tmprom" - cbfs "$tmprom" "$ubootelf" "fallback/payload" - cprom mv "$tmprom" "$newrom" + [ "$payload_memtest" = "y" ] && x_ ./update trees -b memtest86plus && \ + cbfs "$tmprom" "elf/memtest86plus/memtest.bin" img/memtest + + cprom "$newrom" && [ "$payload_grub" = "y" ] && \ + cbfs "$tmprom" "$grubdata/bootorder" bootorder raw && \ + cprom "${newrom%.rom}_grubfirst.rom"; return 0 } cprom() { - printf "Creating target image: %s\n" "$3" - - x_ mkdir -p "${3%/*}" - x_ $1 "$2" "$3" - [ "$xbmk_release" = "y" ] && mksha512sum "$3" "vendorhashes" && \ - x_ ./vendor inject -r "$3" -b "$board" -n nuke; return 0 + x_ mkdir -p "${1%/*}"; x_ cp "$tmprom" "$1" + [ "$XBMK_RELEASE" = "y" ] && mksha512sum "$1" "vendorhashes" && \ + x_ ./vendor inject -r "$1" -b "$board" -n nuke; return 0 } main $@ diff --git a/script/trees b/script/trees index 13f6d652..4ab0d406 100755 --- a/script/trees +++ b/script/trees @@ -9,17 +9,18 @@ set -u -e . "include/lib.sh" . "include/git.sh" -cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$threads" -eval "$(setvars "" xarch cdir config config_name xlang mode makeargs \ - listfile project target target_dir targets tree _f target1 bootstrapargs \ - autoconfargs cmakedir elfdir autogenargs xtree)" +cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" +eval `setvars "" xarch cdir defconfig cmakedir xlang mode makeargs elfdir cmd \ + project target target_dir targets xtree _f target1 bootstrapargs mkhelper \ + autoconfargs listfile autogenargs btype tree rev tree_depend` main() { while getopts f:b:m:u:c:x:s:l:n: option; do + [ -n "$_f" ] && $err "only one flag is permitted" _f="$1" case "$1" in - -b) : ;; + -b) mode="" ;; -u) mode="oldconfig" ;; -m) mode="menuconfig" ;; -c) mode="distclean" ;; @@ -28,14 +29,19 @@ main() -s) mode="savedefconfig" ;; -l) mode="olddefconfig" ;; -n) mode="nconfig" ;; - *) badcmd "invalid option '-$option'" ;; + *) $err "invalid option '-$option'" ;; esac - shift; project="${OPTARG#src/}"; shift + [ -z "${OPTARG+x}" ] && shift 1 && break + project="${OPTARG#src/}"; shift 2 done [ -z "$_f" ] && $err "missing flag (-m/-u/-b/-c/-x/-f/-s/-l/-n)" - [ -z "$project" ] && $err "project name not specified" + [ -z "$project" ] && for p in $(ls -1 config/git); do + ./update trees $_f "$p" || $err "!./update trees $_f $p" + [ "$XBMK_RELEASE" != "y" ] || singletree "$p" || \ + x_ rm -Rf "src/$p/$p"; continue + done && return 0 - [ -f "config/git/$project" ] || $err "project '$project' not defined" + [ -f "config/git/$project/pkg.cfg" ] || $err "'$project' not defined" elfdir="elf/$project" datadir="config/data/$project" @@ -44,31 +50,25 @@ main() remkdir "${tmpgit%/*}" - _cmd="build_projects" - singletree "$project" || _cmd="build_targets" - $_cmd $@ + cmd="build_targets" && singletree "$project" && cmd="build_project" + $cmd $@ [ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && return 0 [ -f "$listfile" ] || return 0 - [ -z "$mode" ] && printf "\n\nDone! Check %s/\n\n" "$elfdir"; return 0 + [ -z "$mode" ] && printf "\n\nOK! Check %s/\n\n" "$elfdir"; return 0 } -build_projects() +build_project() { - [ $# -gt 0 ] && x_ ./update trees $_f $@ - - [ "$mode" = "fetch" ] && [ ! -f "CHANGELOG" ] && \ - eval "fetch_project_repo; return 0;" - - load_project_config "$cfgsdir" + load_target_config "$cfgsdir" || return 0 [ -f "$listfile" ] || listfile="" # optional on single-tree dest_dir="$elfdir" [ ! -f "$listfile" ] || elfcheck || return 0 cdir="src/${project}" - [ -d "$cdir" ] || x_ ./update trees -f "$project" + x_ ./update trees -f "$project" [ "$mode" = "distclean" ] && mode="clean" run_make_command || return 0 @@ -112,47 +112,58 @@ handle_defconfig() for y in "$target_dir/config"/*; do [ -f "$y" ] || continue - config="$y" - config_name="${config#"$target_dir/config/"}" + defconfig="$y" - [ -n "$mode" ] || check_config || continue + [ -n "$mode" ] || check_defconfig || continue handle_makefile [ -n "$mode" ] || copy_elf - done + done; return 0 } handle_src_tree() { target_dir="$cfgsdir/$target" - [ "$mode" = "fetch" ] && [ ! -f "CHANGELOG" ] && \ - eval "fetch_project_trees; return 1;" - load_project_config "$target_dir" + [ -f "CHANGELOG" ] || fetch_project "$project" + load_target_config "$target_dir" || return 1 x_ mkdir -p "$elfdir/$target" chkvars tree cdir="src/$project/$tree" - if [ ! -d "$cdir" ]; then - if [ "$mode" = "distclean" ] || \ - [ "$mode" = "crossgcc-clean" ]; then - printf "Directory %s missing; skip\n" "$cdir" 1>&2 - return 1 - fi - x_ ./update trees -f "$project" "$target" + if [ "$mode" = "distclean" ] || [ "$mode" = "crossgcc-clean" ]; then + [ -d "$cdir" ] || return 1 fi + x_ ./update trees -f "$project" "$target" [ "$target1" = "utils" ] && [ "$project" = "coreboot" ] && return 0 [ -z "$mode" ] && check_cross_compiler; return 0 } -load_project_config() +load_target_config() { - eval "$(setvars "" xarch xlang tree bootstrapargs autoconfargs xtree \ - tree_depend makeargs)" + eval `setvars "" xarch xlang bootstrapargs autoconfargs xtree \ + tree_depend makeargs btype mkhelper` + [ -f "$1/target.cfg" ] || btype="auto" + [ -f "$datadir/mkhelper.cfg" ] && eval `setcfg "$datadir/mkhelper.cfg"` + + _tcfg="$1/target.cfg" + while [ -f "$_tcfg" ] || [ "$cmd" = "build_targets" ]; do + eval `setvars "" rev tree` + + printf "Loading %s config: %s\n" "$project" "$_tcfg" + eval `setcfg "$_tcfg"` + [ "$cmd" = "build_project" ] && break + [ "$mode" = "fetch" ] || break + + [ "${_tcfg%/*/target.cfg}" = "${_tcfg%"/$tree/target.cfg"}" ] \ + && break; _tcfg="${_tcfg%/*/target.cfg}/$tree/target.cfg" + done - [ -f "$1/target.cfg" ] || return 0 - . "$1/target.cfg" || $err "loadp $1: can't load target.cfg"; return 0 + [ -z "$btype" ] || [ "${mode%config}" = "$mode" ] || return 1 + + [ "$mode" = "fetch" ] || return 0 + [ -f "CHANGELOG" ] && return 1; fetch_${cmd#build_}; return 1 } check_cross_compiler() @@ -168,9 +179,11 @@ check_cross_compiler() export CROSS_COMPILE="${xarch% *}-" [ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang" - [ -d "$cbdir/util/crossgcc/xgcc/$_xarch/" ] && continue - x_ make -C "$cbdir" crossgcc-${_xarch%-*} $cbmakeargs - done + # sometimes buildgcc fails for like no reason. try twice. + make -C "$cbdir" crossgcc-${_xarch%-*} $cbmakeargs || \ + make -C "$cbdir" crossgcc-${_xarch%-*} $cbmakeargs || \ + $err "!mkxgcc $project/$xtree '${_xarch%-*}' '$cbmakeargs'" + done; return 0 } check_coreboot_utils() @@ -179,21 +192,20 @@ check_coreboot_utils() utilelfdir="elf/$util/$1" utilsrcdir="src/coreboot/$1/util/$util" - utilmode="" - [ -z "$mode" ] || utilmode="clean" - x_ make -C "$utilsrcdir" $utilmode -j$threads $cbmakeargs + utilmode="" && [ -n "$mode" ] && utilmode="clean" + x_ make -C "$utilsrcdir" $utilmode -j$XBMK_THREADS $cbmakeargs [ -z "$mode" ] && [ ! -f "$utilelfdir/$util" ] && \ x_ mkdir -p "$utilelfdir" && \ x_ cp "$utilsrcdir/$util" "elf/$util/$1" [ -z "$mode" ] || x_ rm -Rf "$utilelfdir" - done + done; return 0 } -check_config() +check_defconfig() { - [ -f "$config" ] || $err "check_config $project/$target: no config" + [ -f "$defconfig" ] || $err "$project/$target: missing defconfig" - dest_dir="$elfdir/$target/$config_name" + dest_dir="$elfdir/$target/${defconfig#"$target_dir/config/"}" elfcheck || return 1 # skip build if a previous one exists x_ mkdir -p "$dest_dir" @@ -203,25 +215,21 @@ elfcheck() { # TODO: very hacky check. do it properly (based on build.list) for elftest in "$dest_dir"/*; do - [ -e "$elftest" ] || continue - e "$elftest" f && return 1 - done + [ -e "$elftest" ] && e "$elftest" f && return 1 + done; return 0 } handle_makefile() { - [ "$project" = "grub" ] && [ "${mode%config}" != "$mode" ] && return 0 - check_makefile "$cdir" && x_ make clean -C "$cdir" - x_ cp "$config" "$cdir/.config" - [ -n "$mode" ] || [ "$project" = "grub" ] || make -C "$cdir" \ + x_ cp "$defconfig" "$cdir/.config" + [ -n "$mode" ] || [ -n "$btype" ] || make -C "$cdir" \ silentoldconfig || make -C "$cdir" oldconfig || : run_make_command || $err "handle_makefile $cdir: no makefile!" - _copy=".config" - [ "$mode" = "savedefconfig" ] && _copy="defconfig" - [ "${mode%config}" = "$mode" ] || x_ cp "$cdir/$_copy" "$config" + _copy=".config" && [ "$mode" = "savedefconfig" ] && _copy="defconfig" + [ "${mode%config}" = "$mode" ] || x_ cp "$cdir/$_copy" "$defconfig" [ -e "$cdir/.git" ] && [ "$project" = "u-boot" ] && \ [ "$mode" = "distclean" ] && x_ git -C "$cdir" clean -fdx; return 0 @@ -229,20 +237,17 @@ handle_makefile() run_make_command() { - check_cmake "$cdir" - [ -z "$mode" ] && check_autoconf "$cdir" + check_cmake "$cdir" && [ -z "$mode" ] && check_autoconf "$cdir" check_makefile "$cdir" || return 1 [ "$project" = "coreboot" ] && [ -z "$mode" ] && x_ \ printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" \ && makeargs="$makeargs $cbmakeargs" - make -C "$cdir" $mode -j$threads $makeargs || $err "!mk $cdir $mode" + make -C "$cdir" $mode -j$XBMK_THREADS $makeargs || $err "$cdir mk$mode" + [ -z "$mkhelper" ] || [ -n "$mode" ] || $mkhelper || $err "!$mkhelper" - [ "$project" = "grub" ] && [ -z "$mode" ] && mkpayload_grub - - [ "$mode" != "clean" ] && return 0 - make -C "$cdir" distclean 2>/dev/null || : + [ "$mode" = "clean" ] && make -C "$cdir" distclean || :; return 0 } check_cmake() @@ -271,14 +276,10 @@ check_makefile() mkpayload_grub() { - [ -f "$grubdata/module/$tree" ] || $err "$tree: grub modules missing" - x_ rm -f "$cdir/grub.elf" + eval `setvars "" grub_modules grub_install_modules` + eval `setcfg "$grubdata/module/$tree"` - eval "$(setvars "" grub_modules grub_install_modules)" - - . "$grubdata/module/$tree" || $err "$tree: !source grub modules" - - chkvars "grub_install_modules" "grub_modules" + x_ rm -f "$cdir/grub.elf" "${cdir}/grub-mkstandalone" --grub-mkimage="${cdir}/grub-mkimage" \ -O i386-coreboot -o "${cdir}/grub.elf" -d "${cdir}/grub-core/" \ @@ -287,15 +288,14 @@ mkpayload_grub() "/boot/grub/grub_default.cfg=${cdir}/.config" \ "/boot/grub/grub.cfg=$grubdata/memdisk.cfg" \ "/background.png=$grubdata/background/background1280x800.png" || \ - $err "$tree: cannot build grub.elf" + $err "$tree: cannot build grub.elf"; return 0 } copy_elf() { [ -f "$listfile" ] && x_ mkdir -p "$dest_dir" && while read -r f; do [ -f "$cdir/$f" ] && x_ cp "$cdir/$f" "$dest_dir" - done < "$listfile" - x_ make clean -C "$cdir" + done < "$listfile"; x_ make clean -C "$cdir" } main $@ |