From a42c387e02eec9603b4d9cd52710877965ca07e5 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Wed, 19 Feb 2025 12:16:27 +0100 Subject: [PATCH 1/6] Add support for ESP32-S2 autobuild. Signed-off-by: Pol Henarejos --- pico-keys-sdk | 2 +- workflows/autobuild.sh | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pico-keys-sdk b/pico-keys-sdk index 3d91287..94a842f 160000 --- a/pico-keys-sdk +++ b/pico-keys-sdk @@ -1 +1 @@ -Subproject commit 3d912878f1627719a006291eef5d60142a2f474f +Subproject commit 94a842fa0423d2f2d0a36ea6db99be6e7380cfe5 diff --git a/workflows/autobuild.sh b/workflows/autobuild.sh index 16c9600..55adca9 100755 --- a/workflows/autobuild.sh +++ b/workflows/autobuild.sh @@ -36,6 +36,16 @@ mkdir -p release cd build esptool.py --chip ESP32-S3 merge_bin -o ../release/pico_openpgp_esp32-s3.bin @flash_args cd .. +cd esp-idf +./install.sh esp32s2 +. ./export.sh +cd .. +idf.py set-target esp32s2 +idf.py all +mkdir -p release +cd build +esptool.py --chip ESP32-S2 merge_bin -o ../release/pico_openpgp_esp32-s2.bin @flash_args +cd .. else mkdir build cd build From d35e67c790bd001d6f4aa170dede667cd62f7d20 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Wed, 19 Feb 2025 12:17:46 +0100 Subject: [PATCH 2/6] Autobuild Pico SDK 2.1.1 Signed-off-by: Pol Henarejos --- workflows/autobuild.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/workflows/autobuild.sh b/workflows/autobuild.sh index 55adca9..e57a570 100755 --- a/workflows/autobuild.sh +++ b/workflows/autobuild.sh @@ -7,6 +7,7 @@ if [[ $1 == "pico" ]]; then sudo apt install -y cmake gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib git clone https://github.com/raspberrypi/pico-sdk cd pico-sdk +git checkout tags/2.1.1 git submodule update --init cd .. git clone https://github.com/raspberrypi/picotool From 4e96b0ce5a09977debfd2b15d4739d23f688e094 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Wed, 19 Feb 2025 19:30:39 +0100 Subject: [PATCH 3/6] Use all available boards. Signed-off-by: Pol Henarejos --- build_pico_openpgp.sh | 97 +++---------------------------------------- 1 file changed, 6 insertions(+), 91 deletions(-) diff --git a/build_pico_openpgp.sh b/build_pico_openpgp.sh index 4b41085..27ade21 100755 --- a/build_pico_openpgp.sh +++ b/build_pico_openpgp.sh @@ -11,98 +11,13 @@ rm -rf release/* mkdir -p build_release mkdir -p release cd build_release - -for board in 0xcb_helios \ - adafruit_feather_rp2040_usb_host \ - adafruit_feather_rp2040 \ - adafruit_itsybitsy_rp2040 \ - adafruit_kb2040 \ - adafruit_macropad_rp2040 \ - adafruit_qtpy_rp2040 \ - adafruit_trinkey_qt2040 \ - amethyst_fpga \ - archi \ - arduino_nano_rp2040_connect \ - cytron_maker_pi_rp2040 \ - datanoisetv_rp2040_dsp \ - eetree_gamekit_rp2040 \ - garatronic_pybstick26_rp2040 \ - gen4_rp2350_24 \ - gen4_rp2350_24ct \ - gen4_rp2350_24t \ - gen4_rp2350_28 \ - gen4_rp2350_28ct \ - gen4_rp2350_28t \ - gen4_rp2350_32 \ - gen4_rp2350_32ct \ - gen4_rp2350_32t \ - gen4_rp2350_35 \ - gen4_rp2350_35ct \ - gen4_rp2350_35t \ - hellbender_2350A_devboard \ - ilabs_challenger_rp2350_bconnect \ - ilabs_challenger_rp2350_wifi_ble \ - ilabs_opendec02 \ - melopero_perpetuo_rp2350_lora \ - melopero_shake_rp2040 \ - metrotech_xerxes_rp2040 \ - net8086_usb_interposer \ - nullbits_bit_c_pro \ - phyx_rick_tny_rp2350 \ - pi-plates_micropi \ - pico \ - pico_w \ - pico2 \ - pimoroni_badger2040 \ - pimoroni_interstate75 \ - pimoroni_keybow2040 \ - pimoroni_motor2040 \ - pimoroni_pga2040 \ - pimoroni_pga2350 \ - pimoroni_pico_plus2_rp2350 \ - pimoroni_picolipo_4mb \ - pimoroni_picolipo_16mb \ - pimoroni_picosystem \ - pimoroni_plasma2040 \ - pimoroni_plasma2350 \ - pimoroni_servo2040 \ - pimoroni_tiny2040 \ - pimoroni_tiny2040_2mb \ - pimoroni_tiny2350 \ - pololu_3pi_2040_robot \ - pololu_zumo_2040_robot \ - seeed_xiao_rp2040 \ - seeed_xiao_rp2350 \ - solderparty_rp2040_stamp \ - solderparty_rp2040_stamp_carrier \ - solderparty_rp2040_stamp_round_carrier \ - solderparty_rp2350_stamp_xl \ - solderparty_rp2350_stamp \ - sparkfun_micromod \ - sparkfun_promicro \ - sparkfun_promicro_rp2350 \ - sparkfun_thingplus \ - switchscience_picossci2_conta_base \ - switchscience_picossci2_dev_board \ - switchscience_picossci2_micro \ - switchscience_picossci2_rp2350_breakout \ - switchscience_picossci2_tiny \ - tinycircuits_thumby_color_rp2350 \ - vgaboard \ - waveshare_rp2040_lcd_0.96 \ - waveshare_rp2040_lcd_1.28 \ - waveshare_rp2040_one \ - waveshare_rp2040_plus_4mb \ - waveshare_rp2040_plus_16mb \ - waveshare_rp2040_zero \ - weact_studio_rp2040_2mb \ - weact_studio_rp2040_4mb \ - weact_studio_rp2040_8mb \ - weact_studio_rp2040_16mb \ - wiznet_w5100s_evb_pico +PICO_SDK_PATH="${PICO_SDK_PATH:-../../pico-sdk}" +board_dir=${PICO_SDK_PATH}/src/boards/include/boards +for board in "$board_dir"/* do + board_name="$(basename -- $board .h)" rm -rf * - PICO_SDK_PATH="${PICO_SDK_PATH:-../../pico-sdk}" cmake .. -DPICO_BOARD=$board + PICO_SDK_PATH="${PICO_SDK_PATH:-../../pico-sdk}" cmake .. -DPICO_BOARD=$board_name make -j`nproc` - mv pico_openpgp.uf2 ../release/pico_openpgp_$board-$SUFFIX.uf2 + mv pico_openpgp.uf2 ../release/pico_openpgp_$board_name-$SUFFIX.uf2 done From 9f91376bedc60f4698abbef23bfeee7213b0bd12 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Wed, 19 Feb 2025 19:30:47 +0100 Subject: [PATCH 4/6] Use fastest clk for rp2040. Signed-off-by: Pol Henarejos --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0c7f62..cea8ece 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,7 @@ if(ESP_PLATFORM) include($ENV{IDF_PATH}/tools/cmake/project.cmake) else() if(NOT ENABLE_EMULATION) + set(PICO_USE_FASTEST_SUPPORTED_CLOCK 1) include(pico_sdk_import.cmake) endif() From f11017fd139beda7a5f0d6de00292cec705371a9 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Wed, 19 Feb 2025 19:32:33 +0100 Subject: [PATCH 5/6] Take led driver on build. Signed-off-by: Pol Henarejos --- pico-keys-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pico-keys-sdk b/pico-keys-sdk index 94a842f..6e6b524 160000 --- a/pico-keys-sdk +++ b/pico-keys-sdk @@ -1 +1 @@ -Subproject commit 94a842fa0423d2f2d0a36ea6db99be6e7380cfe5 +Subproject commit 6e6b524878e36649aeb547a9f705ff89457209ce From 7aefacd1d3800312f4387eaef26b33bca7d11e50 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Wed, 19 Feb 2025 19:32:44 +0100 Subject: [PATCH 6/6] Upgrade to v3.4. Signed-off-by: Pol Henarejos --- VERSION | 2 +- build_pico_openpgp.sh | 4 ++-- src/openpgp/version.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 19fd49a..ad4c660 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version=3.2 +Version=3.4 diff --git a/build_pico_openpgp.sh b/build_pico_openpgp.sh index 27ade21..9f150f3 100755 --- a/build_pico_openpgp.sh +++ b/build_pico_openpgp.sh @@ -1,7 +1,7 @@ #!/bin/bash VERSION_MAJOR="3" -VERSION_MINOR="2" +VERSION_MINOR="4" SUFFIX="${VERSION_MAJOR}.${VERSION_MINOR}" #if ! [[ -z "${GITHUB_SHA}" ]]; then # SUFFIX="${SUFFIX}.${GITHUB_SHA}" @@ -17,7 +17,7 @@ for board in "$board_dir"/* do board_name="$(basename -- $board .h)" rm -rf * - PICO_SDK_PATH="${PICO_SDK_PATH:-../../pico-sdk}" cmake .. -DPICO_BOARD=$board_name + PICO_SDK_PATH="${PICO_SDK_PATH}" cmake .. -DPICO_BOARD=$board_name make -j`nproc` mv pico_openpgp.uf2 ../release/pico_openpgp_$board_name-$SUFFIX.uf2 done diff --git a/src/openpgp/version.h b/src/openpgp/version.h index c7c33b2..7e12a96 100644 --- a/src/openpgp/version.h +++ b/src/openpgp/version.h @@ -29,7 +29,7 @@ #define PIV_VERSION_MINOR (PIV_VERSION & 0xff) -#define PIPGP_VERSION 0x0302 +#define PIPGP_VERSION 0x0304 #define PIPGP_VERSION_MAJOR ((PIPGP_VERSION >> 8) & 0xff) #define PIPGP_VERSION_MINOR (PIPGP_VERSION & 0xff)