From 941fbcbf1b070c5e82c8590e6a4f1afcc0da78a4 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 24 Jun 2023 23:23:16 +0100 Subject: run coreboot utils from own directory this means coreboot can now be distcleaned safely, before and after each build of a rom image Signed-off-by: Leah Rowe --- resources/scripts/build/boot/roms_helper | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'resources/scripts/build/boot') diff --git a/resources/scripts/build/boot/roms_helper b/resources/scripts/build/boot/roms_helper index 8f1be3ef..b6051880 100755 --- a/resources/scripts/build/boot/roms_helper +++ b/resources/scripts/build/boot/roms_helper @@ -121,7 +121,7 @@ load_config() fi romdir="bin/${board}" - cbfstool="${cbdir}/util/cbfstool/cbfstool" + cbfstool="cbutils/${cbtree}/cbfstool" seavgabiosrom="payload/seabios/seavgabios.bin" corebootrom="${cbdir}/build/coreboot.rom" @@ -236,9 +236,7 @@ build_dependencies() if [ ! -d "${cbdir}" ]; then ./download coreboot ${cbtree} fi - if [ ! -f "${cbfstool}" ]; then - ./build module cbutils ${cbtree} || exit 1 - fi + ./build module cbutils ${cbtree} || exit 1 cat version > "${cbdir}/.coreboot-version" build_dependency_crossgcc @@ -499,7 +497,6 @@ mkCoreboot() fi cp "${_cbcfg}" "${cbdir}"/.config - ./build module cbutils ${cbdir#coreboot/} || exit 1 make -j$(nproc) -BC "${cbdir}" } -- cgit v1.2.1