coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-12 14:32:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

lbmk: use 2-level directory structure in script/

Browse Source 
as opposed to the current 3-level structure.

recent build system simplifications have enabled
this change, thus:

./build fw coreboot -> ./build roms
./build fw grub -> ./build grub
./build fw serprog -> ./build serprog
./update project release -> ./update release
./update project trees -> ./update trees
./update vendor download -> ./vendor download
./update vendor inject -> ./vendor inject

alper criticised that the commands were too long,
so i made them shorter!

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2023-10-20 00:17:30 +01:00
parent 0b98c9b00c
commit 8d9aeef3de
60 changed files with 106 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/build/fw/grub → script/build/grub
+1 -1
View File
@@ -23,7 +23,7 @@ main()
handle_dependencies()
{
[ -d "src/grub" ] || x_ ./update project trees -f grub
[ -d "src/grub" ] || x_ ./update trees -f grub
[ -f "src/grub/grub-mkstandalone" ] || build_grub_utils
x_ mkdir -p "${elfdir}"
x_ rm -f "${elfdir}/"*
script/build/fw/coreboot → script/build/roms
+12 -12
View File
@@ -128,13 +128,13 @@ prepare_target()
cbrom="${cbdir}/build/coreboot.rom"
[ -f "${cbfstool}" ] || \
x_ ./update project trees -b coreboot utils ${tree}
x_ ./update trees -b coreboot utils ${tree}
build_dependency_seabios
memtest_bin="memtest86plus/build64/memtest.bin"
[ "${payload_memtest}" != "y" ] || [ -f "src/${memtest_bin}" ] || \
x_ ./update project trees -b memtest86plus
x_ ./update trees -b memtest86plus
x_ rm -f "${romdir}/"*
@@ -151,7 +151,7 @@ build_dependency_seabios()
[ -f elf/seabios/default/vgarom/bios.bin.elf ] && \
[ -f elf/seabios/default/normal/bios.bin.elf ] && return 0
x_ ./update project trees -b seabios
x_ ./update trees -b seabios
}
build_dependency_grub()
@@ -171,14 +171,14 @@ build_dependency_grub()
rebuild_grub="y" && break
done
[ "${rebuild_grub}" = "y" ] || return 0
x_ ./build fw grub
x_ ./build grub
}
build_dependency_uboot()
{
[ "${payload_uboot}" = "y" ] || return 0
x_ ./update project trees -b u-boot ${board}
x_ ./update trees -b u-boot ${board}
ubdir="elf/u-boot/${board}/${uboot_config}"
ubootelf="${ubdir}/u-boot.elf"
[ ! -f "${ubootelf}" ] && [ -f "${ubdir}/u-boot" ] && \
@@ -215,7 +215,7 @@ build_roms()
"${cbcfg}" "${board}" "${displaymode}" "${initmode}" \
1>&2 && return 0
x_ ./update project trees -b coreboot ${board}
x_ ./update trees -b coreboot ${board}
_cbrom="elf/coreboot_nopayload_DO_NOT_FLASH/${board}/${initmode}_${displaymode}"
[ "${initmode}" = "normal" ] && \
@@ -391,9 +391,9 @@ moverom() {
usage()
{
cat <<- EOF
USAGE: ./build fw coreboot targetname
To build *all* boards, do this: ./build fw coreboot all
To list *all* boards, do this: ./build fw coreboot list
USAGE: ./build roms targetname
To build *all* boards, do this: ./build roms all
To list *all* boards, do this: ./build roms list
Optional Flags:
-d: displaymode
@@ -402,9 +402,9 @@ usage()
Example commands:
./build fw coreboot x60
./build fw coreboot x200_8mb x60
./build fw coreboot x60 -p grub -d corebootfb -k usqwerty
./build roms x60
./build roms x200_8mb x60
./build roms x60 -p grub -d corebootfb -k usqwerty
possible values for 'target':
$(items "config/coreboot")
script/build/fw/serprog → script/build/serprog
+2 -2
View File
@@ -22,12 +22,12 @@ main()
platform="rp2040"
boards_dir=${pico_sdk_dir}/src/boards/include/boards
[ -d "${pico_src_dir}/" ] || \
x_ ./update project trees -f "rpi-pico-serprog"
x_ ./update trees -f "rpi-pico-serprog"
elif [ "${1}" = "stm32" ]; then
platform="stm32"
boards_dir=${stm32_src_dir}/boards
[ -d "${stm32_src_dir}/" ] || \
x_ ./update project trees -f "stm32-vserprog"
x_ ./update trees -f "stm32-vserprog"
else
err "${usage}"
fi