summaryrefslogtreecommitdiff
path: root/script/roms
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-06-16 17:42:34 +0100
committerLeah Rowe <leah@libreboot.org>2024-06-16 17:42:34 +0100
commit8b58c1eac6cad89b202527e0486a12680a6ba520 (patch)
tree2224eb40cdc8f8afda52c2030d6ad60d3c0d1be1 /script/roms
parentc3f0a109c3d1c5378bd55b2a7827d335fe0ad21d (diff)
roms: merge mkUbootRom() into build_uboot_roms()
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script/roms')
-rwxr-xr-xscript/roms13
1 files 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"