diff options
| -rw-r--r-- | config/data/pico-serprog/mkhelper.cfg | 1 | ||||
| -rw-r--r-- | config/git/pico-sdk/pkg.cfg | 2 | ||||
| -rw-r--r-- | config/git/pico-serprog/pkg.cfg | 2 | ||||
| -rw-r--r-- | config/git/picotool/pkg.cfg | 5 | ||||
| -rw-r--r-- | include/rom.sh | 25 |
5 files changed, 3 insertions, 32 deletions
diff --git a/config/data/pico-serprog/mkhelper.cfg b/config/data/pico-serprog/mkhelper.cfg index c913767c..ccfdc0df 100644 --- a/config/data/pico-serprog/mkhelper.cfg +++ b/config/data/pico-serprog/mkhelper.cfg @@ -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" diff --git a/config/git/pico-sdk/pkg.cfg b/config/git/pico-sdk/pkg.cfg index 8af13d09..284ee057 100644 --- a/config/git/pico-sdk/pkg.cfg +++ b/config/git/pico-sdk/pkg.cfg @@ -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" diff --git a/config/git/pico-serprog/pkg.cfg b/config/git/pico-serprog/pkg.cfg index 3d3e0f19..03b45a1b 100644 --- a/config/git/pico-serprog/pkg.cfg +++ b/config/git/pico-serprog/pkg.cfg @@ -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" diff --git a/config/git/picotool/pkg.cfg b/config/git/picotool/pkg.cfg deleted file mode 100644 index 3711ce04..00000000 --- a/config/git/picotool/pkg.cfg +++ /dev/null @@ -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" diff --git a/include/rom.sh b/include/rom.sh index 68c61936..f74912af 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -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 |