diff options
| -rwxr-xr-x | build | 14 | ||||
| -rw-r--r-- | config/data/coreboot/build.list | 1 | ||||
| -rw-r--r-- | config/data/coreboot/mkhelper.cfg | 11 | ||||
| -rw-r--r-- | config/data/pico-serprog/mkhelper.cfg | 5 | ||||
| -rw-r--r-- | config/data/stm32-vserprog/mkhelper.cfg | 4 | ||||
| -rwxr-xr-x | include/lib.sh | 1 | ||||
| -rw-r--r-- | include/rom.sh | 122 | ||||
| -rwxr-xr-x | include/vendor.sh | 2 | ||||
| -rwxr-xr-x | script/roms | 190 | ||||
| -rwxr-xr-x | script/trees | 42 | 
10 files changed, 170 insertions, 222 deletions
| @@ -16,7 +16,7 @@ fi  . "include/vendor.sh"  . "include/mrc.sh" -eval `setvars "" vdir src_dirname srcdir mode xp` +eval `setvars "" vdir src_dirname srcdir mode xp ser`  err="fail"  main() @@ -34,6 +34,12 @@ main()  	release) shift 1; mkrelease $@ ;;  	inject) shift 1; vendor_inject $@ ;;  	download) shift 1; vendor_download $@ ;; +	roms) +		if [ $# -gt 1 ] && [ "$2" = "serprog" ]; then +			x_ ./update trees -b stm32-vserprog +			x_ ./update trees -b pico-serprog; return 0 +		fi; shift 1 +		x_ ./update trees -b coreboot $@ ;;  	*)  		[ -f "$spath" ] || $err "bad command"  		shift 1; "$spath" $@ || $err "excmd: $spath $@" ;; @@ -111,9 +117,9 @@ build_release()  	(  	cd "$srcdir" || $err "$vdir: 2 !cd \"$srcdir\"" -	./build roms all || $err "$vdir: roms-all" -	./build roms serprog rp2040 || $err "$vdir: rp2040" -	./build roms serprog stm32 || $err "$vdir: stm32" +	./update trees -b coreboot || $err "$vdir: roms-all" +	./update trees -b pico-serprog || $err "$vdir: rp2040" +	./update trees -b stm32-vserprog || $err "$vdir: stm32"  	x_ mv bin ../roms  	) || $err "can't build rom images" diff --git a/config/data/coreboot/build.list b/config/data/coreboot/build.list deleted file mode 100644 index f6535149..00000000 --- a/config/data/coreboot/build.list +++ /dev/null @@ -1 +0,0 @@ -build/coreboot.rom diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg index a6605672..c23ebdf4 100644 --- a/config/data/coreboot/mkhelper.cfg +++ b/config/data/coreboot/mkhelper.cfg @@ -1,2 +1,13 @@  makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"  build_depend="seabios/default grub/default memtest86plus" + +seavgabiosrom="elf/seabios/default/libgfxinit/vgabios.bin" + +pv="payload_uboot payload_seabios payload_memtest payload_grub" +v="initmode ubootelf grub_scan_disk uboot_config grubtree grubelf pname" +v="$v displaymode tmprom" +eval `setvars "n" $pv` +eval `setvars "" $v` + +mkhelper="mkcorebootbin" +postmake="mkcoreboottar" diff --git a/config/data/pico-serprog/mkhelper.cfg b/config/data/pico-serprog/mkhelper.cfg new file mode 100644 index 00000000..9f6e54cc --- /dev/null +++ b/config/data/pico-serprog/mkhelper.cfg @@ -0,0 +1,5 @@ +sersrc="src/pico-serprog" +serx="$sersrc/build/pico_serprog.uf2" +picosdk="src/pico-sdk" +serdir="$picosdk/src/boards/include/boards" +premake="mkserprog rp2040" diff --git a/config/data/stm32-vserprog/mkhelper.cfg b/config/data/stm32-vserprog/mkhelper.cfg new file mode 100644 index 00000000..9d02f799 --- /dev/null +++ b/config/data/stm32-vserprog/mkhelper.cfg @@ -0,0 +1,4 @@ +sersrc="src/stm32-vserprog" +serx="$sersrc/stm32-vserprog.hex" +serdir="$sersrc/boards" +mkhelper="mkserprog stm32" diff --git a/include/lib.sh b/include/lib.sh index e6a998d2..52187734 100755 --- a/include/lib.sh +++ b/include/lib.sh @@ -10,7 +10,6 @@ _ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"  kbnotice="Insert a .gkb file from config/data/grub/keymap/ as keymap.gkb \  if you want a custom keymap in GRUB; use cbfstool from elf/cbfstool." -cbelfdir="elf/.coreboot_nopayload_DO_NOT_FLASH"  ifdtool="elf/ifdtool/default/ifdtool"  cbfstool="elf/cbfstool/default/cbfstool"  tmpgit="$PWD/tmp/gitclone" diff --git a/include/rom.sh b/include/rom.sh new file mode 100644 index 00000000..7ffd685d --- /dev/null +++ b/include/rom.sh @@ -0,0 +1,122 @@ +#!/usr/bin/env sh +# SPDX-License-Identifier: GPL-3.0-or-later +# 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> + +mkserprog() +{ +	basename -as .h "$serdir/"*.h > "$TMPDIR/ser" || $err "!mk $1 $TMPDIR" + +	while read -r sertarget; do +		[ "$1" = "rp2040" ] && x_ cmake -DPICO_BOARD="$sertarget" \ +		    -DPICO_SDK_PATH="$picosdk" -B "$sersrc/build" "$sersrc" \ +		    && x_ cmake --build "$sersrc/build" +		[ "$1" = "stm32" ] && x_ make -C "$sersrc" \ +		    libopencm3-just-make BOARD=$sertarget && x_ make -C \ +		    "$sersrc" BOARD=$sertarget; x_ mkdir -p "bin/serprog_$1" +		x_ mv "$serx" "bin/serprog_$1/serprog_$sertarget.${serx##*.}" +	done < "$TMPDIR/ser" + +	[ "$XBMK_RELEASE" = "y" ] && mkrom_tarball "bin/serprog_$1"; return 0 +} + +mkpayload_grub() +{ +	eval `setvars "" grub_modules grub_install_modules` +	eval `setcfg "$grubdata/module/$tree"` + +	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/" \ +	    --fonts= --themes= --locales=  --modules="$grub_modules" \ +	    --install-modules="$grub_install_modules" \ +	    "/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"; return 0 +} + +mkcorebootbin() +{ +	[ "$target" = "$tree" ] && return 0 + +	tmprom="$cdir/build/coreboot.rom" +	initmode="${defconfig##*/}"; displaymode="${initmode##*_}" +	initmode="${initmode%%_*}" +	[ -n "$displaymode" ] && displaymode="_$displaymode" +	cbfstool="elf/cbfstool/$tree/cbfstool" + +	[ -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 "$target: U-Boot and SeaBIOS/GRUB are both enabled." + +	[ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata" + +	[ -n "$grubtree" ] || grubtree="default" +	grubelf="elf/grub/$grubtree/payload/grub.elf" + +	[ "$payload_memtest" = "y" ] || payload_memtest="n" +	[ "$(uname -m)" = "x86_64" ] || payload_memtest="n" + +	x_ ./update trees -b coreboot utils $tree + +	[ "$payload_seabios" = "y" ] && pname="seabios" && add_seabios +	[ "$payload_uboot" = "y" ] && pname="uboot" && add_uboot + +	newrom="bin/$target/${pname}_${target}_$initmode$displaymode.rom" +	x_ mkdir -p "${newrom%/*}"; x_ mv "$tmprom" "$newrom" + +	[ "$XBMK_RELEASE" = "y" ] || return 0 +	mksha512sum "$newrom" "vendorhashes" +	./vendor inject -r "$newrom" -b "$target" -n nuke || $err "!n $newrom" +} + +add_seabios() +{ +	_seabioself="elf/seabios/default/$initmode/bios.bin.elf" + +	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" vgaroms/seavgabios.bin raw + +	[ "$payload_memtest" = "y" ] && cbfs "$tmprom" \ +	    "elf/memtest86plus/memtest.bin" img/memtest + +	[ "$payload_grub" = "y" ] && pname="seagrub" && add_grub; return 0 +} + +add_grub() +{ +	cbfs "$tmprom" "$grubelf" "img/grub2" +	printf "set grub_scan_disk=\"%s\"\n" "$grub_scan_disk" \ +	    > "$TMPDIR/tmpcfg" || $err "$target: !insert scandisk" +	cbfs "$tmprom" "$TMPDIR/tmpcfg" scan.cfg raw +	cbfs "$tmprom" "$grubdata/bootorder" bootorder raw +} + +add_uboot() +{ +	ubdir="elf/u-boot/$target/$uboot_config" +	ubootelf="$ubdir/u-boot.elf" && [ ! -f "$ubootelf" ] && \ +	    ubootelf="$ubdir/u-boot" +	[ -f "$ubootelf" ] || $err "cb/$target: Can't find u-boot" + +	cbfs "$tmprom" "$ubootelf" "fallback/payload" +} + +mkcoreboottar() +{ +	[ "$target" = "$tree" ] && return 0 +	[ "$XBMK_RELEASE" = "y" ] && mkrom_tarball "bin/$target"; return 0 +} diff --git a/include/vendor.sh b/include/vendor.sh index e282eedd..75f7e051 100755 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -248,7 +248,7 @@ detect_board()  	path="$1"  	filename="$(basename "$path")"  	case "$filename" in -	grub_*) board="$(echo "$filename" | cut -d '_' -f2-3)" ;; +	grub_*|seagrub_*) board="$(echo "$filename" | cut -d '_' -f2-3)" ;;  	seabios_withgrub_*)  		board="$(echo "$filename" | cut -d '_' -f3-4)" ;;  	*.tar.xz) diff --git a/script/roms b/script/roms deleted file mode 100755 index 14822339..00000000 --- a/script/roms +++ /dev/null @@ -1,190 +0,0 @@ -#!/usr/bin/env sh -# SPDX-License-Identifier: GPL-3.0-or-later -# 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 - -. "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" -stm32dir="$stm32src/boards" - -# Disable all payloads by default. -# target.cfg files have to specifically enable [a] payload(s) -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 -		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" ] || [ -n "$ser" ] || boards="$(ls -1 \ -	    config/coreboot)" || $err "can't list coreboot boards" - -	[ -n "$ser" ] && \ -	    eval "serlist \"\$${ser}dir\" > \"\$TMPDIR/ser\" || $err \"!ser\"" -	[ -n "$ser" ] && [ -z "$boards" ] && boards="$(cat "$TMPDIR/ser")" - -	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 - -	[ -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() -{ -	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##*.}\"" -} - -serlist() -{ -	basename -a -s .h "$1/"*.h || $err "$1: can't list boards" -} - -configure_target() -{ -	eval `setvars "n" $pv` -	eval `setvars "" $v` - -	board="$1"; targetdir="$cfgsdir/$board"; romdir="bin/$board" - -	# Override the above defaults using target.cfg -	eval `setcfg "$targetdir/target.cfg"` - -	[ -z "$tree" ] && $err "$board: tree not defined" -	[ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && return 1 -	[ "$board" = "$tree" ] && return 1 - -	x_ ./update trees -b coreboot $board - -	cbfstool="elf/cbfstool/$tree/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." - -	[ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata" - -	[ -n "$grubtree" ] || grubtree="default" -	grubelf="elf/grub/$grubtree/payload/grub.elf" - -	[ "$payload_memtest" = "y" ] || payload_memtest="n" -	[ "$(uname -m)" = "x86_64" ] || payload_memtest="n"; return 0 -} - -build_roms() -{ -	x_ rm -Rf "$romdir" - -	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" -} - -add_payloads() -{ -	cbuild="$cbelfdir/$board/${initmode}_$displaymode" -	[ "$initmode" = "normal" ] && cbuild="${cbuild%"_$displaymode"}" -	x_ cp "$cbuild/coreboot.rom" "$tmprom" - -	[ "$payload_seabios" = "y" ] && add_seabios_payload -	[ "$payload_uboot" = "y" ] || return 0 - -	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" - -	cbfs "$tmprom" "$ubootelf" "fallback/payload" -	cprom "$romdir/uboot_payload_${board}_${initmode}_$displaymode.rom" -} - -add_seabios_payload() -{ -	_seabioself="elf/seabios/default/$initmode/bios.bin.elf" - -	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" \ -	    vgaroms/seavgabios.bin raw - -	if [ "$payload_grub" = "y" ]; then -		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 - -	[ "$payload_memtest" = "y" ] && \ -	    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() -{ -	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 ab321869..8bcd798c 100755 --- a/script/trees +++ b/script/trees @@ -8,10 +8,15 @@ set -u -e  . "include/lib.sh"  . "include/git.sh" +. "include/rom.sh" + +. "config/data/pico-serprog/mkhelper.cfg" +. "config/data/coreboot/mkhelper.cfg"  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 build_depend` +    autoconfargs listfile autogenargs btype tree rev tree_depend build_depend \ +    premake release postmake`  main()  { @@ -46,6 +51,7 @@ main()  	datadir="config/data/$project"  	cfgsdir="config/$project"  	listfile="$datadir/build.list" # needed on multi, optional on single +	[ -f "$listfile" ] || listfile="" # optional on all projects  	remkdir "${tmpgit%/*}" @@ -61,7 +67,6 @@ main()  build_project()  {  	configure_project "$cfgsdir" || return 0 -	[ -f "$listfile" ] || listfile="" # optional on single-tree  	dest_dir="$elfdir"  	[ ! -f "$listfile" ] || elfcheck || return 0 @@ -77,10 +82,7 @@ build_project()  build_targets()  { -	[ "$elfdir" = "elf/coreboot" ] && elfdir="$cbelfdir" -  	[ -d "$cfgsdir" ] || $err "directory, $cfgsdir, does not exist" -	[ -f "$listfile" ] || $err "list file, $listfile, does not exist"  	# Build for all targets if no argument is given  	[ $# -gt 0 ] && target1="$1" @@ -94,12 +96,16 @@ build_targets()  handle_targets()  {  	for x in $targets; do +		[ "$x" = "list" ] && x_ ls -1 "config/$project" && \ +		    listfile="" && break  		target="$x"  		printf "'make %s', '%s', '%s'\n" "$mode" "$project" "$target"  		[ "$project" != "coreboot" ] || [ -n "$mode" ] || \  		    [ "$target1" = "utils" ] || x_ ./vendor download $target  		x_ handle_defconfig -	done +		[ -n "$mode" ] || [ -z "$postmake" ] || $postmake || \ +		    $err "$project/$target: !postmake: $postmake"; continue +	done; return 0  }  handle_defconfig() @@ -141,8 +147,8 @@ handle_src_tree()  configure_project()  { -	eval `setvars "" xarch xlang bootstrapargs autoconfargs xtree \ -	    tree_depend makeargs btype mkhelper build_depend` +	eval `setvars "" xarch xlang build_depend autoconfargs xtree postmake \ +	    tree_depend makeargs btype mkhelper bootstrapargs premake release`  	[ -f "$1/target.cfg" ] || btype="auto"  	[ -f "$datadir/mkhelper.cfg" ] && eval `setcfg "$datadir/mkhelper.cfg"` @@ -159,6 +165,7 @@ configure_project()  		    && break; _tcfg="${_tcfg%/*/target.cfg}/$tree/target.cfg"  	done +	[ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && return 1  	[ -z "$btype" ] || [ "${mode%config}" = "$mode" ] || return 1  	[ -z "$mode" ] && for bd in $build_depend; do @@ -244,6 +251,8 @@ handle_makefile()  run_make_command()  { +	[ -z "$premake" ] || [ -n "$mode" ] || $premake || $err "!$premake" +  	check_cmake "$cdir" && [ -z "$mode" ] && check_autoconf "$cdir"  	check_makefile "$cdir" || return 1 @@ -280,23 +289,6 @@ check_makefile()  	    [ -f "$1/GNUmakefile" ] || return 1; return 0  } -mkpayload_grub() -{ -	eval `setvars "" grub_modules grub_install_modules` -	eval `setcfg "$grubdata/module/$tree"` - -	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/" \ -	    --fonts= --themes= --locales=  --modules="$grub_modules" \ -	    --install-modules="$grub_install_modules" \ -	    "/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"; return 0 -} -  copy_elf()  {  	[ -f "$listfile" ] && x_ mkdir -p "$dest_dir" && while read -r f; do | 
