diff options
| -rw-r--r-- | config/git/revisions | 6 | ||||
| -rwxr-xr-x | script/build/rp2040/serprog (renamed from script/build/rpi-pico/serprog) | 42 |
2 files changed, 30 insertions, 18 deletions
diff --git a/config/git/revisions b/config/git/revisions index 753a3c4c..e5001699 100644 --- a/config/git/revisions +++ b/config/git/revisions @@ -78,19 +78,19 @@ {rpi-pico-sdk}{ rev: 6a7db34ff63345a7badec79ebea3aaef1712f374 - loc: util-fw/pico-sdk + loc: util-fw/rp2040/pico-sdk url: https://github.com/raspberrypi/pico-sdk } {rpi-pico-tinyusb}{ rev: 86c416d4c0fb38432460b3e11b08b9de76941bf5 - loc: util-fw/pico-sdk/lib/tinyusb + loc: util-fw/rp2040/pico-sdk/lib/tinyusb url: https://github.com/hathach/tinyusb.git } {rpi-pico-serprog}{ rev: c8c16e9c11fe9e5b7230ff358f79de3f1951e1d9 - loc: util-fw/pico-serprog + loc: util-fw/rp2040/pico-serprog url: https://codeberg.org/libreboot/pico-serprog bkup_url: https://notabug.org/libreboot/pico-serprog depend: rpi-pico-sdk diff --git a/script/build/rpi-pico/serprog b/script/build/rp2040/serprog index cd4ba84f..e265cc7a 100755 --- a/script/build/rpi-pico/serprog +++ b/script/build/rp2040/serprog @@ -23,9 +23,9 @@ set -u -e . "include/err.sh" -serprog_release_dir=bin/serprog -sdk_dir=$(pwd)/util-fw/pico-sdk -src_dir=$(pwd)/util-fw/pico-serprog +serprog_release_dir=$(pwd)/bin/serprog_rp2040 +sdk_dir=$(pwd)/util-fw/rp2040/pico-sdk +src_dir=$(pwd)/util-fw/rp2040/pico-serprog main() { @@ -33,20 +33,32 @@ main() [ -d "${src_dir}/" ] || ./update project repo rpi-pico-serprog \ || err "fetch rpi-pico-serprog failed!\n" - - ( - cd "${src_dir}" || err "can't cd to ${src_dir}" - cmake -DPICO_SDK_PATH="${sdk_dir}" . || \ - err "can't cmake ${sdk_dir}" - make clean - make - ) - mkdir -p "${serprog_release_dir}" || \ err "can't create dir: ${serprog_release_dir}" - mv "${src_dir}/pico_serprog.uf2" \ - "${serprog_release_dir}/rpi-pico-serprog.uf2" || \ - err "rpi-pico serprog build failed!\n" + + boards_dir=${sdk_dir}/src/boards/include/boards + + if [ $# -gt 0 ] ; then + buildrom "${1}" + else + basename -a -s .h ${boards_dir}/*.h | while read board ; do + [ "${board}" = "none" ] || buildrom ${board} + done + fi +} + +# buildrom <board> +buildrom() +{ + board=${1} + (cd ${src_dir}; cmake -DPICO_BOARD="${board}" \ + -DPICO_SDK_PATH="${sdk_dir}" "${src_dir}" || \ + err "can't cmake ${src_dir}") + make -C ${src_dir} clean + make -C ${src_dir} + mv ${src_dir}/pico_serprog.uf2 \ + ${serprog_release_dir}/serprog_${board}.uf2 \ + || err "${board} serprog build failed!" } main $@ |