diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-06-16 17:46:58 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-06-16 17:46:58 +0100 |
| commit | e67628c6a5e7a6ac23b4c519a753ead61beae116 (patch) | |
| tree | fbbd4a135914cc951cdbc158062bc67452af9be2 | |
| parent | 8b58c1eac6cad89b202527e0486a12680a6ba520 (diff) | |
unify coreboot elfdir (DO_NOT_FLASH)
use a common string when setting this path
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rwxr-xr-x | include/lib.sh | 1 | ||||
| -rwxr-xr-x | script/roms | 3 | ||||
| -rwxr-xr-x | script/trees | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/lib.sh b/include/lib.sh index bf734f3a..9f722313 100755 --- a/include/lib.sh +++ b/include/lib.sh @@ -10,6 +10,7 @@ _ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" tmpdir_was_set="y" cbdir="src/coreboot/default" +cbelfdir="elf/coreboot_nopayload_DO_NOT_FLASH" ifdtool="elf/ifdtool/default/ifdtool" cbfstool="elf/cbfstool/default/cbfstool" tmpgit="$PWD/tmp/gitclone" diff --git a/script/roms b/script/roms index 815eeb99..d0f95524 100755 --- a/script/roms +++ b/script/roms @@ -193,8 +193,7 @@ build_roms() { x_ ./update trees -b coreboot $board - _cbrom="elf/coreboot_nopayload_DO_NOT_FLASH" - _cbrom="$_cbrom/$board/${initmode}_$displaymode" + _cbrom="$cbelfdir/$board/${initmode}_$displaymode" [ "$initmode" = "normal" ] && _cbrom="${_cbrom%"_$displaymode"}" _cbrom="$_cbrom/coreboot.rom" cbrom="$(mktemp -t coreboot_rom.XXXXXXXXXX)" diff --git a/script/trees b/script/trees index 5f80c344..13f6d652 100755 --- a/script/trees +++ b/script/trees @@ -78,8 +78,7 @@ build_projects() build_targets() { - [ "$elfdir" = "elf/coreboot" ] && \ - elfdir="elf/coreboot_nopayload_DO_NOT_FLASH" + [ "$elfdir" = "elf/coreboot" ] && elfdir="$cbelfdir" [ -d "$cfgsdir" ] || $err "directory, $cfgsdir, does not exist" [ -f "$listfile" ] || $err "list file, $listfile, does not exist" |