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

unify coreboot elfdir (DO_NOT_FLASH) 

use a common string when setting this path

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

1
include/lib.sh
View File

@ -10,6 +10,7 @@ _ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"
tmpdir_was_set="y" tmpdir_was_set="y"
cbdir="src/coreboot/default" cbdir="src/coreboot/default"
cbelfdir="elf/coreboot_nopayload_DO_NOT_FLASH"
ifdtool="elf/ifdtool/default/ifdtool" ifdtool="elf/ifdtool/default/ifdtool"
cbfstool="elf/cbfstool/default/cbfstool" cbfstool="elf/cbfstool/default/cbfstool"
tmpgit="$PWD/tmp/gitclone" tmpgit="$PWD/tmp/gitclone"

3
script/roms
View File

@ -193,8 +193,7 @@ build_roms()
{ {
x_ ./update trees -b coreboot $board x_ ./update trees -b coreboot $board
_cbrom="elf/coreboot_nopayload_DO_NOT_FLASH" _cbrom="$cbelfdir/$board/${initmode}_$displaymode"
_cbrom="$_cbrom/$board/${initmode}_$displaymode"
[ "$initmode" = "normal" ] && _cbrom="${_cbrom%"_$displaymode"}" [ "$initmode" = "normal" ] && _cbrom="${_cbrom%"_$displaymode"}"
_cbrom="$_cbrom/coreboot.rom" _cbrom="$_cbrom/coreboot.rom"
cbrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)" cbrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)"

3
script/trees
View File

@ -78,8 +78,7 @@ build_projects()
build_targets() build_targets()
{ {
[ "$elfdir" = "elf/coreboot" ] && \ [ "$elfdir" = "elf/coreboot" ] && elfdir="$cbelfdir"
elfdir="elf/coreboot_nopayload_DO_NOT_FLASH"
[ -d "$cfgsdir" ] || $err "directory, $cfgsdir, does not exist" [ -d "$cfgsdir" ] || $err "directory, $cfgsdir, does not exist"
[ -f "$listfile" ] || $err "list file, $listfile, does not exist" [ -f "$listfile" ] || $err "list file, $listfile, does not exist"