diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | include/lib.sh | 19 | ||||
| -rwxr-xr-x | include/vendor.sh | 8 | ||||
| -rwxr-xr-x | script/roms | 2 |
4 files changed, 17 insertions, 13 deletions
@@ -2,7 +2,6 @@ *.o /lbmk.err.log /docs/ -/cbutils/ /pciroms/ /util/dell-flash-unlock/dell_flash_unlock /TODO diff --git a/include/lib.sh b/include/lib.sh index f4214e27..eed75e2a 100755 --- a/include/lib.sh +++ b/include/lib.sh @@ -8,8 +8,8 @@ export LC_ALL=C tmpdir_was_set="y" cbdir="src/coreboot/default" -ifdtool="cbutils/default/ifdtool" -cbfstool="cbutils/default/cbfstool" +ifdtool="elf/ifdtool/default/ifdtool" +cbfstool="elf/cbfstool/default/cbfstool" tmpgit="$PWD/tmp/gitclone" grubdata="config/data/grub" err="err_" @@ -157,11 +157,16 @@ check_defconfig() handle_coreboot_utils() { for util in cbfstool ifdtool; do - x_ make -C "src/coreboot/$1/util/$util" - [ -z "$mode" ] && [ ! -f "cbutils/$1/$util" ] && \ - x_ mkdir -p "cbutils/$1" && \ - x_ cp "src/coreboot/$1/util/$util/$util" "cbutils/$1" - [ -z "$mode" ] || x_ rm -Rf "cbutils/$1" + utilelfdir="elf/$util/$1" + utilsrcdir="src/coreboot/$1/util/$util" + + utilmode="" + [ -z "$mode" ] || utilmode="clean" + x_ make -C "$utilsrcdir" $utilmode + [ -z "$mode" ] && [ ! -f "$utilelfdir/$util" ] && \ + x_ mkdir -p "$utilelfdir" && \ + x_ cp "$utilsrcdir/$util" "elf/$util/$1" + [ -z "$mode" ] || x_ rm -Rf "$utilelfdir" done } 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 diff --git a/script/roms b/script/roms index f6c322e1..79b716ff 100755 --- a/script/roms +++ b/script/roms @@ -209,7 +209,7 @@ build_payloads() romdir="bin/$board" cbdir="src/coreboot/$board" [ "$board" = "$tree" ] || cbdir="src/coreboot/$tree" - cbfstool="cbutils/$tree/cbfstool" + cbfstool="elf/cbfstool/$tree/cbfstool" cbrom="$cbdir/build/coreboot.rom" [ -f "$cbfstool" ] || x_ ./update trees -b coreboot utils $tree |