GRUB: only load xhci from grub.cfg

don't put it in the install modules.

this works around a hanging issue on haswell thinkpads.

when any usb device is inserted, GRUB will sometimes
hang if started from the SeaBIOS payload, *while* the
USB device is plugged in.

plugging in the USB device after GRUB starts worked.
it will have to be investigated more at a later date,
but this simply configuration change works.

the xhci module is already loaded explicitly, in grub.cfg

Signed-off-by: Leah Rowe <leah@libreboot.org>

.gitignore

@@ -1,8 +1,6 @@
 *~
 *.o
-/cache/
 /lbmk.err.log
-/repo/
 /docs/
 /pciroms/
 /util/dell-flash-unlock/dell_flash_unlock
@@ -33,4 +31,3 @@
 /CHANGELOG
 /todo.txt
 /lock
-/hash/

build

@@ -16,12 +16,15 @@ fi
 . "include/vendor.sh"
 . "include/mrc.sh"
 
-eval `setvars "" vdir src_dirname srcdir mode xp ser`
+eval "$(setvars "" vdir src_dirname srcdir _xm mode xp)"
 err="fail"
 
+linkpath="${0}"
+linkname="${linkpath##*/}"
+
 main()
 {
-	[ $# -lt 1 ] && $err "bad command"
+	[ $# -lt 1 ] && badcmd
 	spath="script/$1"
 
 	for g in "which git" "git config --global user.name" \
@@ -34,14 +37,8 @@ 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"
+		[ -f "$spath" ] || badcmd
 		shift 1; "$spath" $@ || $err "excmd: $spath $@" ;;
 	esac
 	set -u -e # some commands disable them. turn them on!
@@ -51,7 +48,7 @@ git_init()
 {
 	[ -L ".git" ] && return 1
 	[ -e ".git" ] && return 0
-	eval `setvars "$(date -Rud @$versiondate)" cdate _nogit`
+	eval "$(setvars "$(date -Rud @$versiondate)" cdate _nogit)"
 
 	git init || return 1
 	git add -A . || return 1
@@ -60,23 +57,17 @@ git_init()
 	git tag -a "$version" -m "$projectname $version" || return 1
 }
 
-git_err()
-{
-	printf "You need to set git name/email, like so:\n%s\n\n" "$1" 1>&2
-	$err "Git name/email not configured"
-}
-
 mkrelease()
 {
 	export XBMK_RELEASE="y"
 
 	vdir="release"
 	while getopts d:m: option; do
-		[ -z "$OPTARG" ] && $err "empty argument not allowed"
+		[ -z "$OPTARG" ] && badcmd "empty argument not allowed"
 		case "$option" in
 		d) vdir="$OPTARG" ;;
 		m) mode="$OPTARG" ;;
-		*) $err "invalid option '-$option'" ;;
+		*) badcmd "invalid option '-$option'" ;;
 		esac
 	done
 
@@ -96,11 +87,10 @@ mkrelease()
 
 build_release()
 {
+	_xm="build_release $vdir"
 	(
-	cd "$srcdir" || $err "$vdir: !cd \"$srcdir\""
-	./update trees -f
-	rmgit .
-	x_ rm -Rf tmp
+	cd "$srcdir" || $err "$_xm: !cd \"$srcdir\""
+	fetch_trees
 	x_ mv src/docs docs
 	) || $err "can't create release files"
 
@@ -109,36 +99,45 @@ build_release()
 	rm -f "$srcdir/lock" || $err "can't remove lock file in $srcdir"
 
 	(
-	cd "${srcdir%/*}" || $err "$vdir: mktarball \"$srcdir\""
-	mktarball "${srcdir##*/}" "${srcdir##*/}.tar.xz" || $err "$vdir: mksrc"
+	cd "${srcdir%/*}" || $err "$_xm: mktarball \"$srcdir\""
+	mktarball "${srcdir##*/}" "${srcdir##*/}.tar.xz" || $err "$_xm: mksrc"
 	) || $err "can't create src tarball"
 	[ "$mode" = "src" ] && return 0
 
 	touch "$srcdir/lock" || $err "can't make lock file in $srcdir/"
 
 	(
-	cd "$srcdir" || $err "$vdir: 2 !cd \"$srcdir\""
-	./update trees -b coreboot || $err "$vdir: roms-all"
-	./update trees -b pico-serprog || $err "$vdir: rp2040"
-	./update trees -b stm32-vserprog || $err "$vdir: stm32"
+	cd "$srcdir" || $err "$_xm: 2 !cd \"$srcdir\""
+	./build roms all || $err "$_xm: roms-all"
+	./build roms serprog rp2040 || $err "$_xm: rp2040"
+	./build roms serprog stm32 || $err "$_xm: stm32"
 	x_ mv bin ../roms
 	) || $err "can't build rom images"
 
 	rm -Rf "$srcdir" || $err "!rm -Rf $srcdir"
 }
 
+fetch_trees()
+{
+	for x in $(items config/git); do
+		./update trees -f "$x" || $err "$_xm: fetch $x"
+		singletree "$x" || x_ rm -Rf "src/$x/$x"
+	done
+	rmgit .
+}
+
 fail()
 {
-	tmp_cleanup || printf "WARNING: can't rm tmpfiles: %s\n" "$TMPDIR" 1>&2
+	tmp_cleanup || printf "WARNING: can't rm tmpfiles: %s\n" "$tmpdir" 1>&2
 	err_ "${1}"
 }
 
 tmp_cleanup()
 {
-	[ "$xbmk_parent" = "y" ] || return 0
-	[ "$TMPDIR" = "/tmp" ] || rm -Rf "$TMPDIR" || return 1
+	[ "$tmpdir_was_set" = "n" ] || return 0
+	rm -Rf "$tmpdir" || return 1
 	rm -f lock || return 1
 }
 
 main $@
-tmp_cleanup || err_ "can't rm TMPDIR upon non-zero exit: $TMPDIR"
+tmp_cleanup || err_ "can't rm tmpdir upon non-zero exit: $tmpdir"

config/coreboot/d510mo/target.cfg

@@ -3,4 +3,3 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
 release="n"
-build_depend="seabios/default memtest86plus"

config/coreboot/d510mo_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 release="n"

config/coreboot/d945gclf_512kb/target.cfg

@@ -2,4 +2,3 @@ tree="default"
 xarch="i386-elf"
 payload_seabios="y"
 release="n"
-build_depend="seabios/default"

config/coreboot/d945gclf_8mb/target.cfg

@@ -1,6 +1,5 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 release="n"
-build_depend="seabios/default grub/default"

config/coreboot/dell9020mt_nri_12mb/target.cfg

@@ -1,9 +1,7 @@
 tree="haswell"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"
-vcfg="haswell"
-build_depend="seabios/default grub/xhci memtest86plus"

config/coreboot/dell9020sff_nri_12mb/target.cfg

@@ -1,9 +1,7 @@
 tree="haswell"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"
-vcfg="haswell"
-build_depend="seabios/default grub/xhci memtest86plus"

config/coreboot/e5420_6mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="sandybridge"

config/coreboot/e5520_6mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="sandybridge"

config/coreboot/e5530_12mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="ivybridge"

config/coreboot/e6400_4mb/target.cfg

@@ -1,7 +1,6 @@
 tree="dell"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="e6400"

config/coreboot/e6400nvidia_4mb/target.cfg

@@ -1,7 +1,6 @@
 tree="dell"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="e6400"

config/coreboot/e6420_10mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="sandybridge"

config/coreboot/e6430_12mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="ivybridge"

config/coreboot/e6520_10mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="sandybridge"

config/coreboot/e6530_12mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="ivybridge"

config/coreboot/g43t_am3/target.cfg

@@ -2,5 +2,5 @@ tree="default"
 xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
+grub_timeout=10
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/g43t_am3_16mb/target.cfg

@@ -2,6 +2,6 @@ tree="default"
 xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
+grub_timeout=10
 release="n"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/ga_g41m_es2l/target.cfg

@@ -2,5 +2,5 @@ tree="default"
 xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
+grub_timeout=10
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/gru_bob/target.cfg

@@ -1,4 +1,3 @@
 tree="default"
 xarch="aarch64-elf arm-eabi"
 payload_uboot="y"
-build_depend="u-boot/gru_bob"

config/coreboot/gru_kevin/target.cfg

@@ -1,4 +1,3 @@
 tree="default"
 xarch="aarch64-elf arm-eabi"
 payload_uboot="y"
-build_depend="u-boot/gru_kevin"

config/coreboot/hp2170p_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
+grub_timeout=10
 grub_scan_disk="ahci"
-vcfg="hp2170p"

config/coreboot/hp2560p_8mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
+grub_timeout=10
 grub_scan_disk="ahci"
-vcfg="hp2560p"

config/coreboot/hp2570p_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
+grub_timeout=10
 grub_scan_disk="ahci"
-vcfg="hp2570p"

config/coreboot/hp8200sff_4mb/target.cfg

@@ -1,9 +1,8 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
+grub_timeout=10
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-vcfg="hp8200sff"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/hp8200sff_8mb/target.cfg

@@ -1,9 +1,8 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
+grub_timeout=10
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-vcfg="hp8200sff"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/hp820g2_12mb/target.cfg

@@ -1,10 +1,8 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"
-vcfg="hp820g2"
-build_depend="seabios/default grub/xhci memtest86plus"

config/coreboot/hp8300cmt_16mb/target.cfg

@@ -1,9 +1,8 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
+grub_timeout=10
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-vcfg="ivybridge"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/hp8300usdt_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
+grub_timeout=10
 grub_scan_disk="ahci"
-vcfg="ivybridge"

config/coreboot/hp8460pintel_8mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
+grub_timeout=10
 grub_scan_disk="ahci"
-vcfg="hp8460pintel"

config/coreboot/hp8470pintel_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
+grub_timeout=10
 grub_scan_disk="ahci"
-vcfg="hp8470pintel"

config/coreboot/hp8560w_8mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
+grub_timeout=10
 grub_scan_disk="ahci"
-vcfg="hp8560w"

config/coreboot/hp9470m_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
+grub_timeout=10
 grub_scan_disk="ahci"
-vcfg="hp9470m"

config/coreboot/kcma_d8-udimm_16mb/target.cfg

@@ -2,10 +2,9 @@ tree="fam15h_udimm"
 xtree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 xlang="c"
 grub_timout=10
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/kcma_d8_rdimm_16mb/target.cfg

@@ -1,9 +1,9 @@
 tree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 xlang="c"
+grub_timeout=10
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/kcma_d8_rdimm_2mb/target.cfg

@@ -1,9 +1,8 @@
 tree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 xlang="c"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/kcma_d8_udimm_2mb/target.cfg

@@ -2,9 +2,9 @@ tree="fam15h_udimm"
 xtree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 xlang="c"
+grub_timeout=10
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/kfsn4_dre_1mb/target.cfg

@@ -3,4 +3,4 @@ xarch="i386-elf"
 payload_seabios="y"
 payload_memtest="y"
 xlang="c"
-build_depend="seabios/default memtest86plus"
+grub_timeout=10

config/coreboot/kfsn4_dre_2mb/target.cfg

@@ -1,6 +1,7 @@
 tree="fam15h_udimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 xlang="c"
+grub_timeout=10

config/coreboot/kgpe_d16_rdimm_16mb/target.cfg

@@ -1,9 +1,9 @@
 tree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 xlang="c"
+grub_timeout=10
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/kgpe_d16_rdimm_2mb/target.cfg

@@ -1,9 +1,9 @@
 tree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 xlang="c"
+grub_timeout=10
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/kgpe_d16_udimm_16mb/target.cfg

@@ -2,9 +2,9 @@ tree="fam15h_udimm"
 xtree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 xlang="c"
+grub_timeout=10
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/kgpe_d16_udimm_2mb/target.cfg

@@ -2,9 +2,9 @@ tree="fam15h_udimm"
 xtree="fam15h_rdimm"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 xlang="c"
+grub_timeout=10
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/macbook11/target.cfg

@@ -1,6 +1,5 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default"

config/coreboot/macbook11_16mb/target.cfg

@@ -1,6 +1,5 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 scan_scan_disk="ahci"
-build_depend="seabios/default grub/default"

config/coreboot/macbook21/target.cfg

@@ -1,6 +1,6 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/macbook21_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/qemu_arm64_12mb/target.cfg

@@ -1,4 +1,3 @@
 tree="default"
 xarch="aarch64-elf arm-eabi"
 payload_uboot="y"
-build_depend="u-boot/qemu_arm64_12mb"

config/coreboot/qemu_x86_12mb/target.cfg

@@ -1,5 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_grub="y"
+payload_grub_withseabios="y"
 payload_seabios="y"
 payload_memtest="y"

config/coreboot/r400_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/r400_4mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/r400_8mb/target.cfg

@@ -1,5 +1,5 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"

config/coreboot/r500_4mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/t1650_12mb/target.cfg

@@ -1,9 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="nvme"
-vcfg="t1650"
-build_depend="seabios/default grub/nvme memtest86plus"

config/coreboot/t400_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/t400_4mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/t400_8mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/t420_8mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="sandybridge"

config/coreboot/t420s_8mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="sandybridge"

config/coreboot/t430_12mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="ivybridge"

config/coreboot/t440plibremrc_12mb/target.cfg

@@ -1,9 +1,7 @@
 tree="haswell"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"
-vcfg="haswell"
-build_depend="seabios/default grub/xhci memtest86plus"

config/coreboot/t500_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/t500_4mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/t500_8mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/t520_8mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="sandybridge"

config/coreboot/t530_12mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="ivybridge"

config/coreboot/t60_16mb_intelgpu/target.cfg

@@ -1,6 +1,6 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
+grub_background="background1024x768.png"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default"

config/coreboot/t60_intelgpu/target.cfg

@@ -1,6 +1,6 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
+grub_background="background1024x768.png"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default"

config/coreboot/w500_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/w500_4mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/w500_8mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/w530_12mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="ivybridge"

config/coreboot/w541_12mb/target.cfg

@@ -1,9 +1,7 @@
 tree="haswell"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="nvme ahci"
 grubtree="xhci"
-vcfg="haswell"
-build_depend="seabios/default grub/xhci memtest86plus"

config/coreboot/x200_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/x200_4mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/x200_8mb/target.cfg

@@ -1,6 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"

config/coreboot/x220_8mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="sandybridge"

config/coreboot/x230_12mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="ivybridge"

config/coreboot/x230_16mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="ivybridge"

config/coreboot/x230t_12mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="ivybridge"

config/coreboot/x230t_16mb/target.cfg

@@ -1,7 +1,6 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 grub_scan_disk="ahci"
-vcfg="ivybridge"

config/coreboot/x301_16mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"

config/coreboot/x301_4mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"

config/coreboot/x301_8mb/target.cfg

@@ -1,7 +1,7 @@
 tree="default"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
 payload_memtest="y"
 release="n"
 grub_scan_disk="ahci"

config/coreboot/x60/target.cfg

@@ -1,6 +1,6 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
+grub_background="background1024x768.png"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default"

config/coreboot/x60_16mb/target.cfg

@@ -1,6 +1,6 @@
 tree="i945"
 xarch="i386-elf"
 payload_seabios="y"
-payload_grub="y"
+payload_seabios_withgrub="y"
+grub_background="background1024x768.png"
 grub_scan_disk="ahci"
-build_depend="seabios/default grub/default"

config/data/coreboot/build.list

@@ -0,0 +1 @@
+build/coreboot.rom

config/data/coreboot/mkhelper.cfg

@@ -1,16 +0,0 @@
-. "include/rom.sh"
-
-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`
-
-premake="mkvendorfiles"
-mkhelper="mkcorebootbin"
-postmake="mkcoreboottar"

config/data/grub/mkhelper.cfg

@@ -1,7 +0,0 @@
-. "include/rom.sh"
-
-bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
-autoconfargs="--with-platform=coreboot --disable-werror"
-makeargs="FS_PAYLOAD_MODULES=\"\""
-btype="autohell"
-mkhelper="mkpayload_grub"

config/data/pico-serprog/mkhelper.cfg

@@ -1,7 +0,0 @@
-. "include/rom.sh"
-
-sersrc="src/pico-serprog"
-serx="$sersrc/build/pico_serprog.uf2"
-picosdk="src/pico-sdk"
-serdir="$picosdk/src/boards/include/boards"
-premake="mkserprog rp2040"

config/data/stm32-vserprog/mkhelper.cfg

@@ -1,6 +0,0 @@
-. "include/rom.sh"
-
-sersrc="src/stm32-vserprog"
-serx="$sersrc/stm32-vserprog.hex"
-serdir="$sersrc/boards"
-mkhelper="mkserprog stm32"

config/git/bios_extract

@@ -0,0 +1,6 @@
+{bios_extract}{
+	rev: 0a7bc1d71735ef97b00dfec0fd54a02fcc5d1bb0
+	loc: bios_extract
+	url: https://review.coreboot.org/bios_extract
+	bkup_url: https://github.com/coreboot/bios_extract/
+}

config/git/bios_extract/pkg.cfg

@@ -1,3 +0,0 @@
-rev="0a7bc1d71735ef97b00dfec0fd54a02fcc5d1bb0"
-url="https://review.coreboot.org/bios_extract"
-bkup_url="https://github.com/coreboot/bios_extract/"

config/git/biosutilities

@@ -0,0 +1,6 @@
+{biosutilities}{
+	rev: 03ae0cf0706ede5a2a15da0986c19c776d0e6b26
+	loc: biosutilities
+	url: https://codeberg.org/libreboot/BIOSUtilities
+	bkup_url: https://github.com/platomav/BIOSUtilities
+}

config/git/biosutilities/pkg.cfg

@@ -1,3 +0,0 @@
-rev="03ae0cf0706ede5a2a15da0986c19c776d0e6b26"
-url="https://codeberg.org/libreboot/BIOSUtilities"
-bkup_url="https://github.com/platomav/BIOSUtilities"

config/git/coreboot

@@ -0,0 +1,6 @@
+{coreboot}{
+	rev: HEAD
+	loc: coreboot/coreboot
+	url: https://review.coreboot.org/coreboot
+	bkup_url: https://github.com/coreboot/coreboot.git
+}

config/git/coreboot/pkg.cfg

@@ -1,3 +0,0 @@
-rev="HEAD"
-url="https://review.coreboot.org/coreboot"
-bkup_url="https://github.com/coreboot/coreboot.git"

config/git/docs

@@ -0,0 +1,6 @@
+{docs}{
+	rev: e72d055915c3a9ffe739982946e101b146b2483c
+	loc: docs
+	url: https://codeberg.org/vimuser/untitled
+	bkup_url: https://notabug.org/untitled/untitled
+}