Little extra fixes

Author: will-v-pi

bootloaders/encrypted/CMakeLists.txt

@@ -53,7 +53,7 @@ add_linker_script(enc_bootloader "0x20070000" "64k")
 pico_set_otp_key_output_file(enc_bootloader ${CMAKE_CURRENT_BINARY_DIR}/otp.json)
 
 # sign, hash, and clear SRAM
-pico_sign_binary(enc_bootloader ${CMAKE_CURRENT_LIST_DIR}/private.pem)
+pico_sign_binary(enc_bootloader)
 pico_hash_binary(enc_bootloader)
 pico_load_map_clear_sram(enc_bootloader)
 
@@ -87,7 +87,7 @@ pico_set_binary_type(hello_serial_enc no_flash)
 add_linker_script(hello_serial_enc "0x20000000" "448k")
 
 # sign, hash, and encrypt
-pico_sign_binary(hello_serial_enc ${CMAKE_CURRENT_LIST_DIR}/private.pem)
+pico_sign_binary(hello_serial_enc)
 pico_hash_binary(hello_serial_enc)
 pico_encrypt_binary(hello_serial_enc ${CMAKE_CURRENT_LIST_DIR}/privateaes.bin)
 

pico_w/wifi/CMakeLists.txt

@@ -18,11 +18,10 @@ else()
     add_subdirectory_exclude_platforms(tcp_server)
     add_subdirectory_exclude_platforms(udp_beacon)
 
-    add_subdirectory_exclude_platforms(ota_update rp2040)
-
     if (NOT PICO_MBEDTLS_PATH)
-        message("Skipping tls examples as PICO_MBEDTLS_PATH is not defined")
+        message("Skipping some examples as PICO_MBEDTLS_PATH is not defined")
     else()
         add_subdirectory_exclude_platforms(tls_client)
+        add_subdirectory_exclude_platforms(ota_update rp2040)
     endif()
 endif()

pico_w/wifi/ota_update/main.json

@@ -12,7 +12,7 @@
     {
       "name": "Main A",
       "id": 0,
-      "size": "1748K",
+      "size": "1744K",
       "families": ["rp2350-arm-s", "rp2350-riscv"],
       "permissions": {
         "secure": "rw",
@@ -23,7 +23,7 @@
     {
       "name": "Main B",
       "id": 0,
-      "size": "1748K",
+      "size": "1744K",
       "families": ["rp2350-arm-s", "rp2350-riscv"],
       "permissions": {
         "secure": "rw",
@@ -35,14 +35,16 @@
     {
       "name": "Firmware A",
       "id": "0x123456789abcdef0",
+      "start": "3500k",
       "size": "240K",
       "families": ["0x12345678"],
       "permissions": {
         "secure": "rw",
         "nonsecure": "rw",
         "bootloader": "rw"
       },
-      "ignored_during_riscv_boot": true
+      "ignored_during_riscv_boot": true,
+      "no_reboot_on_uf2_download": true
     },
     {
       "name": "Firmware B",
@@ -55,7 +57,8 @@
         "bootloader": "rw"
       },
       "link": ["a", 2],
-      "ignored_during_riscv_boot": true
+      "ignored_during_riscv_boot": true,
+      "no_reboot_on_uf2_download": true
     }
   ]
 }

pico_w/wifi/ota_update/picow_ota_update.c

@@ -189,6 +189,7 @@ err_t tcp_update_server_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *p, er
             // Write to flash
             struct cflash_flags flags;
             int8_t ret;
+            (void)ret;
             if (block->target_addr / FLASH_SECTOR_ERASE_SIZE > state->highest_erased_sector) {
                 flags.flags =
                     (CFLASH_OP_VALUE_ERASE << CFLASH_OP_LSB) |