summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xinclude/lib.sh1
-rwxr-xr-xscript/roms3
-rwxr-xr-xscript/trees3
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"