From 2f3cc5d379089d3def876fdc276c321236b0698f Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 6 Jul 2024 23:36:13 +0100
Subject: rom.sh: new file, to replace script/roms

stub it from the trees script. the way it works now,
there is less code in the build system.

./build roms

this is no longer a thing

./build roms serprog

this is also no longer a thing. instead, do:

./update trees -b coreboot targetnamehere

./update trees -b pico-serprog

./update trees -b stm32-vserprog

the old commands still works, which causes the new
commands to run

coreboot roms now appear in elf/, not bin/, as before,
but those images now contain payloads.

NOTE: to contradict the above: ./build roms is no
longer a thing, in that it's now deprecated, but
backward compatibility is present for now. it will
be removed in a future release.

./build roms list also still works! it will do:
./update trees -b coreboot list

also:
./update trees -b grub list
this is now possible too

if a target "list" is provided, for multi-tree sources,
the targets are shown.

there is another difference: seagrub roms are now seagrub_,
instead of seabios_withgrub.

seabios-only roms are no longer provided, where grub is also
enabled; only seagrub is used. the user can easily remove
the bootorder file, if they want seabios to not try grub first.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 build | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'build')

diff --git a/build b/build
index 91843d3f..d03960c6 100755
--- a/build
+++ b/build
@@ -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"
 
-- 
cgit v1.2.1