From c292e01b009405931f66adbf5c1c17377ef0a50c Mon Sep 17 00:00:00 2001
From: Riku Viitanen <riku.viitanen@protonmail.com>
Date: Fri, 8 Sep 2023 20:42:15 +0300
Subject: Build for all pico board, not just the "original"

Signed-off-by: Riku Viitanen <riku.viitanen@protonmail.com>
---
 config/git/revisions          |  6 ++--
 script/build/rp2040/serprog   | 64 +++++++++++++++++++++++++++++++++++++++++++
 script/build/rpi-pico/serprog | 52 -----------------------------------
 3 files changed, 67 insertions(+), 55 deletions(-)
 create mode 100755 script/build/rp2040/serprog
 delete mode 100755 script/build/rpi-pico/serprog

diff --git a/config/git/revisions b/config/git/revisions
index 753a3c4c..e5001699 100644
--- a/config/git/revisions
+++ b/config/git/revisions
@@ -78,19 +78,19 @@
 
 {rpi-pico-sdk}{
 	rev: 6a7db34ff63345a7badec79ebea3aaef1712f374
-	loc: util-fw/pico-sdk
+	loc: util-fw/rp2040/pico-sdk
 	url: https://github.com/raspberrypi/pico-sdk
 }
 
 {rpi-pico-tinyusb}{
 	rev: 86c416d4c0fb38432460b3e11b08b9de76941bf5
-	loc: util-fw/pico-sdk/lib/tinyusb
+	loc: util-fw/rp2040/pico-sdk/lib/tinyusb
 	url: https://github.com/hathach/tinyusb.git
 }
 
 {rpi-pico-serprog}{
 	rev: c8c16e9c11fe9e5b7230ff358f79de3f1951e1d9
-	loc: util-fw/pico-serprog
+	loc: util-fw/rp2040/pico-serprog
 	url: https://codeberg.org/libreboot/pico-serprog
 	bkup_url: https://notabug.org/libreboot/pico-serprog
 	depend: rpi-pico-sdk
diff --git a/script/build/rp2040/serprog b/script/build/rp2040/serprog
new file mode 100755
index 00000000..e265cc7a
--- /dev/null
+++ b/script/build/rp2040/serprog
@@ -0,0 +1,64 @@
+#!/usr/bin/env sh
+
+# compile the serprog firmware for raspberry pi pico
+#
+#	Copyright (C) 2023 Riku Viitanen <riku.viitanen@protonmail.com>
+#
+#	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 <http://www.gnu.org/licenses/>.
+#
+
+[ "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 <board>
+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/rpi-pico/serprog b/script/build/rpi-pico/serprog
deleted file mode 100755
index cd4ba84f..00000000
--- a/script/build/rpi-pico/serprog
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env sh
-
-# compile the serprog firmware for raspberry pi pico
-#
-#	Copyright (C) 2023 Riku Viitanen <riku.viitanen@protonmail.com>
-#
-#	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 <http://www.gnu.org/licenses/>.
-#
-
-[ "x${DEBUG+set}" = 'xset' ] && set -v
-set -u -e
-
-. "include/err.sh"
-
-serprog_release_dir=bin/serprog
-sdk_dir=$(pwd)/util-fw/pico-sdk
-src_dir=$(pwd)/util-fw/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"
-
-	(
-	cd "${src_dir}" || err "can't cd to ${src_dir}"
-	cmake -DPICO_SDK_PATH="${sdk_dir}" . || \
-	    err "can't cmake ${sdk_dir}"
-	make clean
-	make
-	)
-
-	mkdir -p "${serprog_release_dir}" || \
-	    err "can't create dir: ${serprog_release_dir}"
-	mv "${src_dir}/pico_serprog.uf2" \
-	    "${serprog_release_dir}/rpi-pico-serprog.uf2" || \
-	    err "rpi-pico serprog build failed!\n"
-}
-
-main $@
-- 
cgit v1.2.1