diff options
| author | Leah Rowe <vimuser@noreply.codeberg.org> | 2024-12-28 12:26:39 +0000 |
|---|---|---|
| committer | Leah Rowe <vimuser@noreply.codeberg.org> | 2024-12-28 12:26:39 +0000 |
| commit | 4fa5f696db87e410c5361e2ad597b38f40364cc4 (patch) | |
| tree | 3285fc0880cc2d8379412c9a383927bcd7a3257c | |
| parent | ccc2b4d589fb3315f43443e74c861c47fa2d5ff4 (diff) | |
| parent | a5e0360992d5411c098e4434c8617c234932ede8 (diff) | |
Merge pull request 'rp2530' (#258) from Riku_V/lbmk:rp2530 into master
Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/258
| -rw-r--r-- | config/git/pico-sdk/pkg.cfg | 2 | ||||
| l--------- | config/git/pico-serprog/rp2040-serprog | 1 | ||||
| -rw-r--r-- | include/rom.sh | 9 |
3 files changed, 10 insertions, 2 deletions
diff --git a/config/git/pico-sdk/pkg.cfg b/config/git/pico-sdk/pkg.cfg index 284ee057..8af13d09 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="6a7db34ff63345a7badec79ebea3aaef1712f374" +rev="95ea6acad131124694cda1c162c52cd30e0aece0" url="https://codeberg.org/libreboot/pico-sdk" bkup_url="https://github.com/raspberrypi/pico-sdk" diff --git a/config/git/pico-serprog/rp2040-serprog b/config/git/pico-serprog/rp2040-serprog new file mode 120000 index 00000000..25af91dc --- /dev/null +++ b/config/git/pico-serprog/rp2040-serprog @@ -0,0 +1 @@ +config/git/rp2040-serprog
\ No newline at end of file diff --git a/include/rom.sh b/include/rom.sh index ec2ad650..215b9eab 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -11,7 +11,14 @@ mkserprog() basename -as .h "$serdir/"*.h > "$TMPDIR/ser" || $err "!mk $1 $TMPDIR" while read -r sertarget; do - [ "$1" = "rp2040" ] && x_ cmake -DPICO_BOARD="$sertarget" \ + [ "$1" = "rp2040" ] && + 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" \ -DPICO_SDK_PATH="$picosdk" -B "$sersrc/build" "$sersrc" \ && x_ cmake --build "$sersrc/build" [ "$1" = "stm32" ] && x_ make -C "$sersrc" \ |