serprog: Remove pico2 support for the time being

Many users report bugs, so I'm reverting lbmk back to only
supporting the rp2040 dongles for the time being. The
documentation will be updated to reflect this.

Pico2 support will be re-added at a later date, once more
testing has been done, and fixes made if necessary.
This commit is contained in:
Leah Rowe
2025-04-30 02:27:47 +01:00
parent a08b8d94fc
commit 2009c26f0a
5 changed files with 3 additions and 32 deletions

View File

@@ -7,4 +7,3 @@ serx="$sersrc/build/pico_serprog.uf2"
picosdk="src/pico-sdk"
serdir="$picosdk/src/boards/include/boards"
premake="mkserprog pico"
picotool="$xbmkpwd/src/picotool/xbmkbin"

View File

@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-or-later
rev="95ea6acad131124694cda1c162c52cd30e0aece0"
rev="6a7db34ff63345a7badec79ebea3aaef1712f374"
url="https://codeberg.org/libreboot/pico-sdk"
bkup_url="https://github.com/raspberrypi/pico-sdk"

View File

@@ -3,4 +3,4 @@
rev="3ea792664ed29ca1ff3e2e78d1d16099684781bd"
url="https://codeberg.org/libreboot/pico-serprog"
bkup_url="https://git.disroot.org/libreboot/pico-serprog"
depend="pico-sdk picotool"
depend="pico-sdk"

View File

@@ -1,5 +0,0 @@
# SPDX-License-Identifier: GPL-3.0-or-later
rev="df21059f7ca6f1babc7f1f3b92122cacffc85951"
url="https://github.com/raspberrypi/picotool"
bkup_url="https://codeberg.org/libreboot/picotool"

View File

@@ -9,25 +9,13 @@ grubdata="config/data/grub"
mkserprog()
{
[ $# -lt 1 ] && $err "mkserprog: no arguments provided"
[ "$_f" = "-d" ] && return 0 # dry run
[ "$1" = "pico" ] && mkpicotool
basename -as .h "$serdir/"*.h > "$xbmktmp/ser" || \
$err "!mk $1 $xbmktmp"
while read -r sertarget; do
[ "$1" = "pico" ] &&
x_ rm -rf "$sersrc/build" \
&& (pt=$(x_ grep "pico_cmake_set" \
"$picosdk/src/boards/include/boards/$sertarget.h" \
| grep "PICO_PLATFORM" | cut -d= -f2 | tr -d [:blank:])
mkdir -p "$sersrc/build_$pt"
ln -srf "$sersrc/build_$pt/" "$sersrc/build") \
&& x_ cmake -DPICO_BOARD="$sertarget" \
[ "$1" = "pico" ] && x_ cmake -DPICO_BOARD="$sertarget" \
-DPICO_SDK_PATH="$picosdk" -B "$sersrc/build" "$sersrc" \
-Dpicotool_DIR="$picotool/picotool" \
&& x_ cmake --build "$sersrc/build"
[ "$1" = "stm32" ] && x_ make -C "$sersrc" \
libopencm3-just-make BOARD=$sertarget && x_ make -C \
@@ -39,17 +27,6 @@ mkserprog()
[ "$XBMK_RELEASE" = "y" ] && mkrom_tarball "bin/serprog_$1"; :
}
mkpicotool()
{
rm -Rf "$picotool" || $err "Can't remove picotool builddir"
(
x_ cd src/picotool
x_ cmake -DCMAKE_INSTALL_PREFIX=xbmkbin -DPICOTOOL_FLAT_INSTALL=1 \
-DPICO_SDK_PATH=../pico-sdk
x_ make install
) || $err "Can't build picotool"; :
}
copyps1bios()
{
x_ rm -Rf bin/playstation