diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-01-04 02:33:32 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-01-04 02:33:32 +0000 |
| commit | c858099b35904a0bf7c388047613e32237769e89 (patch) | |
| tree | ebd0c24b1456c9528f44f2474cdfb3df8b1da1dd /include/vendor.sh | |
| parent | ce16856a2421db6d9dd3b04b18f05e6fcc3886da (diff) | |
vendor.sh: Download utils even if vcfg unset
This is because the user may have specified setmac.
I tried without this change, on a fresh lbmk, setting
the MAC address on an X200 tarball, and it produced an
error that ifdtool was unavailable.
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include/vendor.sh')
| -rw-r--r-- | include/vendor.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/vendor.sh b/include/vendor.sh index 67625949..08e0bfc3 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -406,10 +406,14 @@ readcfg() [ "$board" = "serprog_stm32" ] || \ [ "$board" = "serprog_pico" ]; then return 1 - fi; boarddir="$cbcfgsdir/$board" + fi + boarddir="$cbcfgsdir/$board" + eval "`setcfg "$boarddir/target.cfg"`" - [ -z "$vcfg" ] && return 1 chkvars tree + x_ ./mk -d coreboot "$tree" # even if vendorfiles not used, see: setmac + + [ -z "$vcfg" ] && return 1 cbdir="src/coreboot/$tree" cbfstool="elf/cbfstool/$tree/cbfstool" @@ -418,9 +422,7 @@ readcfg() kbc1126_ec_dump="$PWD/$cbdir/util/kbc1126/kbc1126_ec_dump" cbfstool="elf/cbfstool/$tree/cbfstool" ifdtool="elf/ifdtool/$tree/ifdtool" - [ -n "$IFD_platform" ] && ifdprefix="-p $IFD_platform" - - x_ ./mk -d coreboot "$tree" + [ -n "$IFD_platform" ] && ifdprefix="-p $IFD_platform"; : } patch_release_roms() |