diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-10-07 06:55:10 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-10-07 10:26:11 +0100 |
| commit | 1e89264ce326997f95391e00f1fa71319f1bb226 (patch) | |
| tree | f1a577604f4ff74fe7f122b1f511e93499adac27 /script/build/fw/coreboot | |
| parent | a413c01a3ef90f7befc5805b233b67b9352ee727 (diff) | |
update/project/*: merge to update/project/trees
Just one script.
Just one!
Well, two, but the 2nd one already existed:
logic in update/project/trees and
update/project/repo was merged into
include/git.sh and update/project/build
was renamed to update/project/trees; an -f
option was added, which calls the functions
under git.sh
so git clones are now handled by the main build
script (for handling makefiles and defconfigs)
but the logic there is a stub, where git.sh
does all the actual heavy lifting
this cuts the file count down by two, and reduces
sloccount a reasonable amount because much of
the logic already exists in the build script, when
it comes to handling targets. git.sh was adjusted
to integrate with this, rather than act standalone
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script/build/fw/coreboot')
| -rwxr-xr-x | script/build/fw/coreboot | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/script/build/fw/coreboot b/script/build/fw/coreboot index 7c89bb35..7479caae 100755 --- a/script/build/fw/coreboot +++ b/script/build/fw/coreboot @@ -125,13 +125,13 @@ prepare_target() cbfstool="cbutils/${tree}/cbfstool" cbrom="${cbdir}/build/coreboot.rom" - x_ ./update project build -b coreboot utils ${tree} + x_ ./update project trees -b coreboot utils ${tree} build_dependency_seabios memtest_bin="memtest86plus/build${arch#*_}/memtest.bin" [ "${payload_memtest}" != "y" ] || [ -f "src/${memtest_bin}" ] || \ - x_ ./update project build -b memtest86plus + x_ ./update project trees -b memtest86plus x_ rm -f "${romdir}/"* @@ -148,7 +148,7 @@ build_dependency_seabios() || [ ! -f elf/seabios/default/libgfxinit/bios.bin.elf ] \ || [ ! -f elf/seabios/default/vgarom/bios.bin.elf ] \ || [ ! -f elf/seabios/default/normal/bios.bin.elf ]; then - x_ ./update project build -b seabios + x_ ./update project trees -b seabios fi } @@ -176,7 +176,7 @@ build_dependency_uboot() { [ "${payload_uboot}" = "y" ] || return 0 - x_ ./update project build -b u-boot ${board} + x_ ./update project trees -b u-boot ${board} ubdir="elf/u-boot/${board}/${uboot_config}" ubootelf="${ubdir}/u-boot.elf" [ ! -f "${ubootelf}" ] && [ -f "${ubdir}/u-boot.bin" ] && \ @@ -213,7 +213,7 @@ build_roms() "${cbcfg}" "${board}" "${displaymode}" "${initmode}" \ 1>&2 && return 0 - x_ ./update project build -b coreboot ${board} + x_ ./update project trees -b coreboot ${board} _cbrom="elf/coreboot/${board}/${initmode}_${displaymode}" [ "${initmode}" = "normal" ] && \ |