summaryrefslogtreecommitdiff
path: root/script/build
diff options
context:
space:
mode:
Diffstat (limited to 'script/build')
-rwxr-xr-xscript/build/fw/serprog18
-rwxr-xr-xscript/build/release/roms10
-rwxr-xr-xscript/build/release/src2
3 files changed, 10 insertions, 20 deletions
diff --git a/script/build/fw/serprog b/script/build/fw/serprog
index cdbf07e1..222d7751 100755
--- a/script/build/fw/serprog
+++ b/script/build/fw/serprog
@@ -20,22 +20,21 @@ main()
if [ "${1}" = "rp2040" ]; then
platform="rp2040"
boards_dir=${pico_sdk_dir}/src/boards/include/boards
- [ -d "${pico_src_dir}/" ] || fetch_repo rpi-pico-serprog
+ [ -d "${pico_src_dir}/" ] || \
+ x_ ./update project repo "rpi-pico-serprog"
elif [ "${1}" = "stm32" ]; then
platform="stm32"
boards_dir=${stm32_src_dir}/boards
- [ -d "${stm32_src_dir}/" ] || fetch_repo stm32-vserprog
+ [ -d "${stm32_src_dir}/" ] || \
+ x_ ./update project repo "stm32-vserprog"
else
err "${usage}"
fi
x_ mkdir -p "bin/serprog_${platform}"
if [ $# -gt 1 ] ; then
- if [ "${2}" = "list" ] ; then
- print_boards ${boards_dir}
- else
- build_${platform}_rom "${2}"
- fi
+ [ "${2}" = "list" ] && print_boards ${boards_dir} && return 0
+ build_${platform}_rom "${2}"
else
printf "Building all serprog targets\n"
list_boards "${boards_dir}" | while read board; do
@@ -44,11 +43,6 @@ main()
fi
}
-fetch_repo()
-{
- x_ ./update project repo "${1}"
-}
-
build_rp2040_rom()
{
board=${1}
diff --git a/script/build/release/roms b/script/build/release/roms
index 50560f98..3cf5d93e 100755
--- a/script/build/release/roms
+++ b/script/build/release/roms
@@ -31,10 +31,8 @@ main()
init_check()
{
- [ -f version ] && \
- read version < version
- [ -f versiondate ] && \
- read versiondate < versiondate
+ [ -f version ] && read version < version
+ [ -f versiondate ] && read versiondate < versiondate
[ ! -d "bin/" ] && \
err "init_check: no ROMs built yet (error)"
[ -d "release/" ] || \
@@ -106,9 +104,9 @@ make_archive()
strip_archive()
{
romdir=${1}
-
[ -d "coreboot/${tree}" ] || \
x_ ./update project trees coreboot ${tree}
+
x_ ./build coreboot utils ${tree}
if [ "${microcode_required}" = "n" ]; then
@@ -125,12 +123,10 @@ strip_archive()
# Hash the rom before removing blobs
x_ rm -f "${romdir}/blobhashes"
x_ touch "${romdir}/blobhashes"
-
(
x_ cd "${romdir}"
x_ sha512sum *.rom >> blobhashes
)
-
for romfile in "${romdir}"/*.rom; do
[ -f "${romfile}" ] || continue
strip_rom_image "${romfile}"
diff --git a/script/build/release/src b/script/build/release/src
index 71b8e111..6dae201c 100755
--- a/script/build/release/src
+++ b/script/build/release/src
@@ -109,7 +109,7 @@ purge_files()
done
x_ ./handle make file -c bios_extract flashrom grub uefitool \
util-fw/stm32-vserprog util-fw/stm32-vserprog/libopencm3 \
- memtest86plus/build* util/* \
+ memtest86plus/build* util/*
x_ rm -Rf .git* */.git* */*/.git* */*/*/.git* */*/*/*/.git* \
*/*/*/*/*/.git* */*/*/*/*/*/.git* */*/*/*/*/*/*/.git*