diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-06-06 21:45:53 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-06-06 21:51:37 +0100 |
| commit | c0822ac458fc7b0f2630c1cff208bd5066efbc6b (patch) | |
| tree | 146d96acaffa1c1288598481ae37420dbed436ee /include/vendor.sh | |
| parent | d1ba085153efadaef9bc124efd043c06658ab969 (diff) | |
put coreboot utils in elf/, not cbutils/
one directory per util, under elf/
e.g. elf/cbfstool/
further split by tree name, e.g.:
elf/cbfstool/default/
elf/cbfstool/foo/
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include/vendor.sh')
| -rwxr-xr-x | include/vendor.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/vendor.sh b/include/vendor.sh index 57a8db48..651766df 100755 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -56,7 +56,7 @@ detect_firmware() [ -z "$tree" ] && $err "detect_firmware $boarddir: tree undefined" cbdir="src/coreboot/$tree" - cbfstool="cbutils/$tree/cbfstool" + cbfstool="elf/cbfstool/$tree/cbfstool" mecleaner="$PWD/$cbdir/util/me_cleaner/me_cleaner.py" kbc1126_ec_dump="$PWD/$cbdir/util/kbc1126/kbc1126_ec_dump" @@ -80,7 +80,7 @@ build_dependencies_download() [ ! -d "${kbc1126_ec_dump%/*}" ] || [ -f "$kbc1126_ec_dump" ] || x_ \ make -C "$cbdir/util/kbc1126" [ -n "$MRC_refcode_cbtree" ] && \ - cbfstoolref="cbutils/$MRC_refcode_cbtree/cbfstool" + cbfstoolref="elf/cbfstool/$MRC_refcode_cbtree/cbfstool" [ -z "$cbfstoolref" ] || [ -f "$cbfstoolref" ] || \ x_ ./update trees -b coreboot utils $MRC_refcode_cbtree [ -f "$cbfstool" ] && [ -f "$ifdtool" ] && return 0 @@ -337,8 +337,8 @@ detect_board() build_dependencies_inject() { cbdir="src/coreboot/$tree" - cbfstool="cbutils/$tree/cbfstool" - ifdtool="cbutils/$tree/ifdtool" + cbfstool="elf/cbfstool/$tree/cbfstool" + ifdtool="elf/ifdtool/$tree/ifdtool" [ -d "$cbdir" ] || x_ ./update trees -f coreboot $tree if [ ! -f "$cbfstool" ] || [ ! -f "$ifdtool" ]; then x_ ./update trees -b coreboot utils $tree |