canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

roms: merge mkUbootRom() into build_uboot_roms() 

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit2-merge1
Leah Rowe 2024-06-16 17:42:34 +01:00 committed by Leah Rowe
parent a9819d7385
commit be04f59602
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
script/roms
View File

@ -290,21 +290,14 @@ mkSeabiosRom() {
build_uboot_roms() build_uboot_roms()
{ {
tmprom="$(mkUbootRom "$cbrom" "fallback/payload")" || \ tmprom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"
$err "build_uboot_roms $board: could not create tmprom"
newrom="$romdir/uboot_payload_${board}_${initmode}_$displaymode.rom" newrom="$romdir/uboot_payload_${board}_${initmode}_$displaymode.rom"
x_ cp "$cbrom" "$tmprom"
cbfs "$tmprom" "$ubootelf" "fallback/payload"
x_ cprom "$tmprom" "$newrom" x_ cprom "$tmprom" "$newrom"
x_ rm -f "$tmprom" 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() cprom()
{ {
printf "Creating target image: %s\n" "$2" printf "Creating target image: %s\n" "$2"