From bed444ff90242612d9a0b2e8cb8a8970c2027900 Mon Sep 17 00:00:00 2001 From: Riku Viitanen Date: Sat, 9 Sep 2023 16:49:27 +0300 Subject: Add stm32-vserprog Tested on a Nucleo-F042K6. That has an onboard stlink: `st-flash --format ihex write bin/serprog_stm32/serprog_nucleo-f042k6.hex` The usb port used for flashing is separate, its is exposed on the pin header instead. Check boards/nucleo-f042k6.h for usb pinout. Signed-off-by: Riku Viitanen --- config/git/revisions | 7 +++++ script/build/rp2040/serprog | 64 --------------------------------------------- script/build/serprog/rp2040 | 64 +++++++++++++++++++++++++++++++++++++++++++++ script/build/serprog/stm32 | 59 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 130 insertions(+), 64 deletions(-) delete mode 100755 script/build/rp2040/serprog create mode 100755 script/build/serprog/rp2040 create mode 100755 script/build/serprog/stm32 diff --git a/config/git/revisions b/config/git/revisions index e5001699..ed01d20f 100644 --- a/config/git/revisions +++ b/config/git/revisions @@ -96,3 +96,10 @@ depend: rpi-pico-sdk depend: rpi-pico-tinyusb } + +{stm32-vserprog}{ + rev: 60c6274f7f5d45d01c64b7acdc5b0e4ed71caa96 + loc: util-fw/stm32-vserprog + url: https://codeberg.org/libreboot/stm32-vserprog + bkup_url: https://notabug.org/libreboot/stm32-vserprog +} diff --git a/script/build/rp2040/serprog b/script/build/rp2040/serprog deleted file mode 100755 index e265cc7a..00000000 --- a/script/build/rp2040/serprog +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env sh - -# compile the serprog firmware for raspberry pi pico -# -# Copyright (C) 2023 Riku Viitanen -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -. "include/err.sh" - -serprog_release_dir=$(pwd)/bin/serprog_rp2040 -sdk_dir=$(pwd)/util-fw/rp2040/pico-sdk -src_dir=$(pwd)/util-fw/rp2040/pico-serprog - -main() -{ - printf "Compiling serprog firmware for Raspberry Pi Pico\n" - - [ -d "${src_dir}/" ] || ./update project repo rpi-pico-serprog \ - || err "fetch rpi-pico-serprog failed!\n" - mkdir -p "${serprog_release_dir}" || \ - err "can't create dir: ${serprog_release_dir}" - - 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 -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 $@ diff --git a/script/build/serprog/rp2040 b/script/build/serprog/rp2040 new file mode 100755 index 00000000..e265cc7a --- /dev/null +++ b/script/build/serprog/rp2040 @@ -0,0 +1,64 @@ +#!/usr/bin/env sh + +# compile the serprog firmware for raspberry pi pico +# +# Copyright (C) 2023 Riku Viitanen +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e + +. "include/err.sh" + +serprog_release_dir=$(pwd)/bin/serprog_rp2040 +sdk_dir=$(pwd)/util-fw/rp2040/pico-sdk +src_dir=$(pwd)/util-fw/rp2040/pico-serprog + +main() +{ + printf "Compiling serprog firmware for Raspberry Pi Pico\n" + + [ -d "${src_dir}/" ] || ./update project repo rpi-pico-serprog \ + || err "fetch rpi-pico-serprog failed!\n" + mkdir -p "${serprog_release_dir}" || \ + err "can't create dir: ${serprog_release_dir}" + + 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 +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 $@ diff --git a/script/build/serprog/stm32 b/script/build/serprog/stm32 new file mode 100755 index 00000000..8637e292 --- /dev/null +++ b/script/build/serprog/stm32 @@ -0,0 +1,59 @@ +#!/usr/bin/env sh + +# compile the serprog firmware for raspberry pi pico +# +# Copyright (C) 2023 Riku Viitanen +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +[ "x${DEBUG+set}" = 'xset' ] && set -v +set -u -e + +. "include/err.sh" + +serprog_release_dir=$(pwd)/bin/serprog_stm32 +src_dir=$(pwd)/util-fw/stm32-vserprog + +main() +{ + printf "Compiling serprog firmware for STM32\n" + + [ -d "${src_dir}/" ] || ./update project repo stm32-vserprog \ + || err "fetch stm32-vserprog failed!\n" + mkdir -p "${serprog_release_dir}" || \ + err "can't create dir: ${serprog_release_dir}" + + boards_dir=${src_dir}/boards + + if [ $# -gt 0 ] ; then + buildrom "${1}" + else + basename -a -s .h ${boards_dir}/*.h | while read board ; do + buildrom ${board} + done + fi +} + +# buildrom +buildrom() +{ + board=${1} + make -C ${src_dir} BOARD=${board} + mv ${src_dir}/stm32-vserprog.hex \ + ${serprog_release_dir}/serprog_${board}.hex \ + || err "${board} serprog build failed!" +} + +main $@ -- cgit v1.2.1