diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-12-28 16:46:59 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-12-28 16:46:59 +0000 |
| commit | 754bd1e6ca3aa95bb1aa44b97612762e37c957b8 (patch) | |
| tree | 1f0b76193a2e9a1b2105474b08e57f1f88101875 | |
| parent | db22308eba516a85044ed738f0c9205d41701b33 (diff) | |
rom.sh: Name pico directory serprog_pico
Previously serprog_rp2040, but we now also support
the RP2530 boards.
Therefore, serprog_pico is a nice generic name. The
directory on release archives will now be serprog_pico
instead of serprog_rp2040; it will contain serprog images
for both RP2040 and RP2530 devices.
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | config/data/pico-serprog/mkhelper.cfg | 2 | ||||
| -rw-r--r-- | include/rom.sh | 2 | ||||
| -rw-r--r-- | include/vendor.sh | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/config/data/pico-serprog/mkhelper.cfg b/config/data/pico-serprog/mkhelper.cfg index d81f1e85..ccfdc0df 100644 --- a/config/data/pico-serprog/mkhelper.cfg +++ b/config/data/pico-serprog/mkhelper.cfg @@ -6,4 +6,4 @@ sersrc="src/pico-serprog" serx="$sersrc/build/pico_serprog.uf2" picosdk="src/pico-sdk" serdir="$picosdk/src/boards/include/boards" -premake="mkserprog rp2040" +premake="mkserprog pico" diff --git a/include/rom.sh b/include/rom.sh index f1b8fa65..0ea791d2 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -11,7 +11,7 @@ mkserprog() basename -as .h "$serdir/"*.h > "$TMPDIR/ser" || $err "!mk $1 $TMPDIR" while read -r sertarget; do - [ "$1" = "rp2040" ] && + [ "$1" = "pico" ] && x_ rm -rf "$sersrc/build" \ && (pt=$(x_ grep "pico_cmake_set" \ "$picosdk/src/boards/include/boards/$sertarget.h" \ diff --git a/include/vendor.sh b/include/vendor.sh index aa7256c4..7d1356f2 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -375,7 +375,8 @@ detect_board() readcfg() { if [ "$board" = "serprog_rp2040" ] || \ - [ "$board" = "serprog_stm32" ]; then + [ "$board" = "serprog_stm32" ] || \ + [ "$board" = "serprog_pico" ]; then return 1 fi; boarddir="$cbcfgsdir/$board" eval `setcfg "$boarddir/target.cfg"`; chkvars vcfg tree |