diff --git a/script/build/release/src b/script/build/release/src index 8d36e5fb..27a93729 100755 --- a/script/build/release/src +++ b/script/build/release/src @@ -169,6 +169,8 @@ purge_files() err "purge_files rm-rf2: can't purge .git files/directories" rm -Rf cbutils || err "purge_files: can't remove ${srcdir}/cbutils/" rm -Rf elf || err "purge_files: can't remove ${srcdir}/elf/" + rm -Rf util-fw/rp2040/pico-serprog/build + || err "purge_files: can't remove pico-serprog/build" ) } diff --git a/script/build/serprog/rp2040 b/script/build/serprog/rp2040 index e265cc7a..3b4fbf14 100755 --- a/script/build/serprog/rp2040 +++ b/script/build/serprog/rp2040 @@ -51,14 +51,14 @@ main() 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 \ + cmake -DPICO_BOARD="${board}" -DPICO_SDK_PATH="${sdk_dir}" \ + -B "${src_dir}/build" "${src_dir}" \ + || err "can't cmake ${src_dir}" + cmake --build "${src_dir}/build" + mv ${src_dir}/build/pico_serprog.uf2 \ ${serprog_release_dir}/serprog_${board}.uf2 \ || err "${board} serprog build failed!" + printf "output to ${serprog_release_dir}/serprog_${board}.uf2\n" } main $@