build/boot/*: unified main() function

The *same* main() function is now used on both scripts.

However, merging both scripts together would be less efficient
on sloccount, and would be error-prone. The purpose of having
roms_helper is that the variables get re-initialised the same
way each time, for each board, automatically.

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

1 files changed, 8 insertions, 25 deletions

diff --git a/script/build/boot/roms_helper b/script/build/boot/roms_helper
index 7c58c977..96b44940 100755
--- a/script/build/boot/roms_helper
+++ b/script/build/boot/roms_helper
@@ -10,6 +10,7 @@
 set -u -e
 
 . "include/err.sh"
+. "include/boot.sh"
 
 read projectname < projectname
 
@@ -17,12 +18,8 @@ cfgsdir="config/coreboot"
 
 blobs_required=""
 
-board=""
 ubdir=""
 kmapdir="config/grub/keymap"
-displaymodes=""
-payloads=""
-keyboard_layouts=""
 
 grub_timeout=""
 grub_scan_disk="undefined"
@@ -53,28 +50,11 @@ targetdir=""
 
 grubelf="elf/grub/grub.elf"
 
-main()
-{
-	while [ $# -gt 0 ]; do
-		case ${1} in
-		-d)
-			displaymodes="${displaymodes}${2}"
-			shift ;;
-		-p)
-			payloads="${payloads}${2}"
-			shift ;;
-		-k)
-			keyboard_layouts="${keyboard_layouts}${2}"
-			shift ;;
-		*)
-			board=${1} ;;
-		esac
-		shift
-	done
-
-	printf "\n\nboard %s, kb %s, displaymode %s, payloads %s\n" \
-	    "${board}" "${keyboard_layouts}" "${displaymodes}" "${payloads}"
+# main() is in include/boot.sh
 
+handle_targets()
+{
+	board="${boards%% *}"
 	configure_target
 	build_dependencies
 
@@ -83,6 +63,9 @@ main()
 
 configure_target()
 {
+	printf "\n\nboard %s, kb %s, displaymode %s, payloads %s\n" \
+	    "${board}" "${keyboard_layouts}" "${displaymodes}" "${payloads}"
+
 	targetdir="${cfgsdir}/${board}"
 
 	[ -d "${targetdir}" ] || \