From 8b58c1eac6cad89b202527e0486a12680a6ba520 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sun, 16 Jun 2024 17:42:34 +0100
Subject: roms: merge mkUbootRom() into build_uboot_roms()

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 script/roms | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/script/roms b/script/roms
index c8c2ae64..815eeb99 100755
--- a/script/roms
+++ b/script/roms
@@ -290,21 +290,14 @@ mkSeabiosRom() {
 
 build_uboot_roms()
 {
-	tmprom="$(mkUbootRom "$cbrom" "fallback/payload")" || \
-	    $err "build_uboot_roms $board: could not create tmprom"
+	tmprom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
 	newrom="$romdir/uboot_payload_${board}_${initmode}_$displaymode.rom"
+	x_ cp "$cbrom" "$tmprom"
+	cbfs "$tmprom" "$ubootelf" "fallback/payload"
 	x_ cprom "$tmprom" "$newrom"
 	x_ rm -f "$tmprom"
 }
 
-# make a rom in /tmp/ and then print the path of that ROM
-mkUbootRom() {
-	tmprom="$(mktemp -t coreboot_rom.XXXXXXXXXX)" # 1=cbrom, 2=cbfs path
-	x_ cp "$1" "$tmprom"
-	cbfs "$tmprom" "$ubootelf" "$2"
-	printf "%s\n" "$tmprom"
-}
-
 cprom()
 {
 	printf "Creating target image: %s\n" "$2"
-- 
cgit v1.2.1