libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

roms: simplify seagrub check in build_grub_roms 

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit6-merge1
Leah Rowe 2024-06-16 01:05:28 +01:00
parent 4b764d26fd
commit 3a7b3660f9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
script/roms
View File

@ -21,7 +21,7 @@ stm32src="src/stm32-vserprog"
pv="payload_uboot payload_grub_withseabios payload_seabios payload_memtest t" pv="payload_uboot payload_grub_withseabios payload_seabios payload_memtest t"
pv="$pv payload_seabios_withgrub payload_seabios_grubonly payload_grub mt86bin" pv="$pv payload_seabios_withgrub payload_seabios_grubonly payload_grub mt86bin"
v="romdir cbrom initmode displaymode cbcfg targetdir tree release ubootelf" v="romdir cbrom initmode displaymode cbcfg targetdir tree release ubootelf"
v="$v grub_timeout board grub_scan_disk uboot_config grubtree grubelf" v="$v grub_timeout board grub_scan_disk uboot_config grubtree grubelf tmpmv"
eval "$(setvars "n" $pv)" eval "$(setvars "n" $pv)"
eval "$(setvars "" $v boards targets serprog_boards_dir)" eval "$(setvars "" $v boards targets serprog_boards_dir)"
@ -237,16 +237,15 @@ build_grub_roms()
grub_cbfs="fallback/payload" grub_cbfs="fallback/payload"
if [ "$payload1" = "grub" ] && [ "$payload_grub_withseabios" = "y" ] if [ "$payload1" = "grub" ] && [ "$payload_grub_withseabios" = "y" ]
then then
_tmpmvrom="$(mkSeabiosRom "$tmprom" "seabios.elf")" || \ tmpmv="$(mkSeabiosRom "$tmprom" "seabios.elf")" || \
$err "build_grub_roms 1 $board: can't build tmprom" $err "build_grub_roms 1 $board: can't build tmprom"
x_ mv "$_tmpmvrom" "$tmprom"
elif [ "$payload1" != "grub" ] && [ "$payload_seabios_withgrub" = "y" ] elif [ "$payload1" != "grub" ] && [ "$payload_seabios_withgrub" = "y" ]
then then
grub_cbfs="img/grub2" grub_cbfs="img/grub2"
_tmpmvrom="$(mkSeabiosRom "$tmprom" fallback/payload)" || \ tmpmv="$(mkSeabiosRom "$tmprom" fallback/payload)" || \
$err "build_grub_roms 2 $board: can't build tmprom" $err "build_grub_roms 2 $board: can't build tmprom"
x_ mv "$_tmpmvrom" "$tmprom"
fi fi
[ -n "$tmpmv" ] && [ -f "$tmpmv" ] && x_ mv "$tmpmv" "$tmprom"
# we only need insert grub.elf once, for each coreboot config: # we only need insert grub.elf once, for each coreboot config:
cbfs "$tmprom" "$grubelf" "$grub_cbfs" cbfs "$tmprom" "$grubelf" "$grub_cbfs"