diff --git a/lib/rp2040/libbearssl.a b/lib/rp2040/libbearssl.a
diff --git a/lib/rp2040/libipv4-big.a b/lib/rp2040/libipv4-big.a
diff --git a/lib/rp2040/libipv4-bt-big.a b/lib/rp2040/libipv4-bt-big.a
diff --git a/lib/rp2040/libipv4-bt.a b/lib/rp2040/libipv4-bt.a
diff --git a/lib/rp2040/libipv4-ipv6-big.a b/lib/rp2040/libipv4-ipv6-big.a
diff --git a/lib/rp2040/libipv4-ipv6-bt-big.a b/lib/rp2040/libipv4-ipv6-bt-big.a
diff --git a/lib/rp2040/libipv4-ipv6-bt.a b/lib/rp2040/libipv4-ipv6-bt.a
diff --git a/lib/rp2040/libipv4-ipv6.a b/lib/rp2040/libipv4-ipv6.a
diff --git a/lib/rp2040/libipv4.a b/lib/rp2040/libipv4.a
diff --git a/lib/rp2040/libpico.a b/lib/rp2040/libpico.a
diff --git a/lib/rp2350-riscv/libbearssl.a b/lib/rp2350-riscv/libbearssl.a
diff --git a/lib/rp2350-riscv/libipv4-big.a b/lib/rp2350-riscv/libipv4-big.a
diff --git a/lib/rp2350-riscv/libipv4-bt-big.a b/lib/rp2350-riscv/libipv4-bt-big.a
diff --git a/lib/rp2350-riscv/libipv4-bt.a b/lib/rp2350-riscv/libipv4-bt.a
diff --git a/lib/rp2350-riscv/libipv4-ipv6-big.a b/lib/rp2350-riscv/libipv4-ipv6-big.a
diff --git a/lib/rp2350-riscv/libipv4-ipv6-bt-big.a b/lib/rp2350-riscv/libipv4-ipv6-bt-big.a
diff --git a/lib/rp2350-riscv/libipv4-ipv6-bt.a b/lib/rp2350-riscv/libipv4-ipv6-bt.a
diff --git a/lib/rp2350-riscv/libipv4-ipv6.a b/lib/rp2350-riscv/libipv4-ipv6.a
diff --git a/lib/rp2350-riscv/libipv4.a b/lib/rp2350-riscv/libipv4.a
diff --git a/lib/rp2350-riscv/libpico.a b/lib/rp2350-riscv/libpico.a
diff --git a/lib/rp2350/libbearssl.a b/lib/rp2350/libbearssl.a
diff --git a/lib/rp2350/libipv4-big.a b/lib/rp2350/libipv4-big.a
diff --git a/lib/rp2350/libipv4-bt-big.a b/lib/rp2350/libipv4-bt-big.a
diff --git a/lib/rp2350/libipv4-bt.a b/lib/rp2350/libipv4-bt.a
diff --git a/lib/rp2350/libipv4-ipv6-big.a b/lib/rp2350/libipv4-ipv6-big.a
diff --git a/lib/rp2350/libipv4-ipv6-bt-big.a b/lib/rp2350/libipv4-ipv6-bt-big.a
diff --git a/lib/rp2350/libipv4-ipv6-bt.a b/lib/rp2350/libipv4-ipv6-bt.a
diff --git a/lib/rp2350/libipv4-ipv6.a b/lib/rp2350/libipv4-ipv6.a
diff --git a/lib/rp2350/libipv4.a b/lib/rp2350/libipv4.a
diff --git a/lib/rp2350/libpico.a b/lib/rp2350/libpico.a
diff --git a/libraries/I2S/src/pio_i2s.pio.h b/libraries/I2S/src/pio_i2s.pio.h
@@ -28,7 +28,7 @@ static const struct pio_program pio_i2s_mclk_program = {
     .instructions = pio_i2s_mclk_program_instructions,
     .length = 2,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = pio_i2s_mclk_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -67,7 +67,7 @@ static const struct pio_program pio_i2s_out_program = {
     .instructions = pio_i2s_out_program_instructions,
     .length = 8,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = pio_i2s_out_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -107,7 +107,7 @@ static const struct pio_program pio_i2s_out_swap_program = {
     .instructions = pio_i2s_out_swap_program_instructions,
     .length = 8,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = pio_i2s_out_swap_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -143,7 +143,7 @@ static const struct pio_program pio_tdm_out_program = {
     .instructions = pio_tdm_out_program_instructions,
     .length = 4,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = pio_tdm_out_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -179,7 +179,7 @@ static const struct pio_program pio_tdm_out_swap_program = {
     .instructions = pio_tdm_out_swap_program_instructions,
     .length = 4,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = pio_tdm_out_swap_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -217,7 +217,7 @@ static const struct pio_program pio_tdm_inout_program = {
     .instructions = pio_tdm_inout_program_instructions,
     .length = 6,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = pio_tdm_inout_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -255,7 +255,7 @@ static const struct pio_program pio_tdm_inout_swap_program = {
     .instructions = pio_tdm_inout_swap_program_instructions,
     .length = 6,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = pio_tdm_inout_swap_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -295,7 +295,7 @@ static const struct pio_program pio_lsbj_out_program = {
     .instructions = pio_lsbj_out_program_instructions,
     .length = 8,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = pio_lsbj_out_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -335,7 +335,7 @@ static const struct pio_program pio_lsbj_out_swap_program = {
     .instructions = pio_lsbj_out_swap_program_instructions,
     .length = 8,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = pio_lsbj_out_swap_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -375,7 +375,7 @@ static const struct pio_program pio_i2s_in_program = {
     .instructions = pio_i2s_in_program_instructions,
     .length = 8,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = pio_i2s_in_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -415,7 +415,7 @@ static const struct pio_program pio_i2s_in_swap_program = {
     .instructions = pio_i2s_in_swap_program_instructions,
     .length = 8,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = pio_i2s_in_swap_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -459,7 +459,7 @@ static const struct pio_program pio_i2s_inout_program = {
     .instructions = pio_i2s_inout_program_instructions,
     .length = 12,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = pio_i2s_inout_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -503,7 +503,7 @@ static const struct pio_program pio_i2s_inout_swap_program = {
     .instructions = pio_i2s_inout_swap_program_instructions,
     .length = 12,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = pio_i2s_inout_swap_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif

diff --git a/libraries/PDM/src/rp2040/pdm.pio.h b/libraries/PDM/src/rp2040/pdm.pio.h
@@ -28,7 +28,7 @@ static const struct pio_program pdm_pio_program = {
     .instructions = pdm_pio_program_instructions,
     .length = 2,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = pdm_pio_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif

diff --git a/libraries/Servo/src/servo.pio.h b/libraries/Servo/src/servo.pio.h
@@ -36,7 +36,7 @@ static const struct pio_program servo_program = {
     .instructions = servo_program_instructions,
     .length = 8,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = servo_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif

diff --git a/libraries/SoftwareSPI/src/spi.pio.h b/libraries/SoftwareSPI/src/spi.pio.h
@@ -28,7 +28,7 @@ static const struct pio_program spi_cpha0_program = {
     .instructions = spi_cpha0_program_instructions,
     .length = 2,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = spi_cpha0_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -63,7 +63,7 @@ static const struct pio_program spi_cpha1_program = {
     .instructions = spi_cpha1_program_instructions,
     .length = 3,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = spi_cpha1_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -133,7 +133,7 @@ static const struct pio_program spi_cpha0_cs_program = {
     .instructions = spi_cpha0_cs_program_instructions,
     .length = 9,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = spi_cpha0_cs_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif
@@ -176,7 +176,7 @@ static const struct pio_program spi_cpha1_cs_program = {
     .instructions = spi_cpha1_cs_program_instructions,
     .length = 9,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = spi_cpha1_cs_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif

diff --git a/libraries/WiFi/examples/BearSSL_Validation/certs.h b/libraries/WiFi/examples/BearSSL_Validation/certs.h
@@ -6,42 +6,53 @@
 const char* ssl_host = "www.akamai.com";
 const uint16_t ssl_port = 443;
 
+// openssl s_client -connect www.akamai.com:443  < /dev/null 2>/dev/null | openssl x509 -fingerprint -noout -in /dev/stdin | cut -f2 -d= | sed 's/^/const char fingerprint_ssl[] = "/' | sed 's/$/";/'
+const char fingerprint_ssl[] = "D6:6C:EF:1A:8A:CE:27:18:D4:0C:83:2C:AE:4D:1B:B9:4C:B8:C9:83";
 
-const char fingerprint_ssl [] PROGMEM = "48:EF:70:29:41:CE:64:C9:DF:57:A2:46:E8:34:E1:50:0B:70:AE:17";
-const char pubkey_ssl [] PROGMEM = R"PUBKEY(
+// openssl s_client -connect www.akamai.com:443 < /dev/null 2>/dev/null | openssl x509 -pubkey -noout
+const char pubkey_ssl[] = R"PUBKEY(
 -----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEiuc+zlu43bv55+s0Fj6RiBW+olZm
-c/AkoTP48CFCIGP1DET7Oufx6oe63GIuBzdVfR5D6R2z818b5gY1o2lBxg==
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE2BD04+A9idhYCHJ4RBy2KHtvJAsz
+KLkAzZOWDEqjNu4plNmiWMymBw0rJggZOU4/TE+a4KqzBgsus9QkFZh88w==
 -----END PUBLIC KEY-----
 )PUBKEY";
 
-const char cert_CA [] PROGMEM = R"CERT(
+// openssl s_client -connect www.akamai.com:443 < /dev/null 2> /dev/null | openssl x509
+
+const char cert_CA[]  = R"CERT(
 -----BEGIN CERTIFICATE-----
-MIIEvjCCA6agAwIBAgIQBtjZBNVYQ0b2ii+nVCJ+xDANBgkqhkiG9w0BAQsFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0yMTA0MTQwMDAwMDBaFw0zMTA0MTMyMzU5NTlaME8xCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxKTAnBgNVBAMTIERpZ2lDZXJ0IFRMUyBS
-U0EgU0hBMjU2IDIwMjAgQ0ExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwUuzZUdwvN1PWNvsnO3DZuUfMRNUrUpmRh8sCuxkB+Uu3Ny5CiDt3+PE0J6a
-qXodgojlEVbbHp9YwlHnLDQNLtKS4VbL8Xlfs7uHyiUDe5pSQWYQYE9XE0nw6Ddn
-g9/n00tnTCJRpt8OmRDtV1F0JuJ9x8piLhMbfyOIJVNvwTRYAIuE//i+p1hJInuW
-raKImxW8oHzf6VGo1bDtN+I2tIJLYrVJmuzHZ9bjPvXj1hJeRPG/cUJ9WIQDgLGB
-Afr5yjK7tI4nhyfFK3TUqNaX3sNk+crOU6JWvHgXjkkDKa77SU+kFbnO8lwZV21r
-eacroicgE7XQPUDTITAHk+qZ9QIDAQABo4IBgjCCAX4wEgYDVR0TAQH/BAgwBgEB
-/wIBADAdBgNVHQ4EFgQUt2ui6qiqhIx56rTaD5iyxZV2ufQwHwYDVR0jBBgwFoAU
-A95QNVbRTLtm8KPiGxvDl7I90VUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBABggrBgEFBQcwAoY0aHR0cDovL2Nh
-Y2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNydDBCBgNV
-HR8EOzA5MDegNaAzhjFodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRH
-bG9iYWxSb290Q0EuY3JsMD0GA1UdIAQ2MDQwCwYJYIZIAYb9bAIBMAcGBWeBDAEB
-MAgGBmeBDAECATAIBgZngQwBAgIwCAYGZ4EMAQIDMA0GCSqGSIb3DQEBCwUAA4IB
-AQCAMs5eC91uWg0Kr+HWhMvAjvqFcO3aXbMM9yt1QP6FCvrzMXi3cEsaiVi6gL3z
-ax3pfs8LulicWdSQ0/1s/dCYbbdxglvPbQtaCdB73sRD2Cqk3p5BJl+7j5nL3a7h
-qG+fh/50tx8bIKuxT8b1Z11dmzzp/2n3YWzW2fP9NsarA4h20ksudYbj/NhVfSbC
-EXffPgK2fPOre3qGNm+499iTcc+G33Mw+nur7SpZyEKEOxEXGlLzyQ4UfaJbcme6
-ce1XR2bFuAJKZTRei9AqPCCcUZlM51Ke92sRKw2Sfh3oius2FkOH6ipjv3U/697E
-A7sKPPcw7+uvTPyLNhBzPvOk
+MIIGAzCCBOugAwIBAgIQA0bb8BLx/7BiUlnlhKlA6TANBgkqhkiG9w0BAQsFADBP
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMSkwJwYDVQQDEyBE
+aWdpQ2VydCBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMTAeFw0yNDA5MDMwMDAwMDBa
+Fw0yNTA5MDMyMzU5NTlaMHYxCzAJBgNVBAYTAlVTMRYwFAYDVQQIEw1NYXNzYWNo
+dXNldHRzMRIwEAYDVQQHEwlDYW1icmlkZ2UxIjAgBgNVBAoTGUFrYW1haSBUZWNo
+bm9sb2dpZXMsIEluYy4xFzAVBgNVBAMTDnd3dy5ha2FtYWkuY29tMFkwEwYHKoZI
+zj0CAQYIKoZIzj0DAQcDQgAE2BD04+A9idhYCHJ4RBy2KHtvJAszKLkAzZOWDEqj
+Nu4plNmiWMymBw0rJggZOU4/TE+a4KqzBgsus9QkFZh886OCA30wggN5MB8GA1Ud
+IwQYMBaAFLdrouqoqoSMeeq02g+YssWVdrn0MB0GA1UdDgQWBBR1CWtuGpgU+vEH
+b6yp42l2leyozDAlBgNVHREEHjAcgg53d3cuYWthbWFpLmNvbYIKYWthbWFpLmNv
+bTA+BgNVHSAENzA1MDMGBmeBDAECAjApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3
+LmRpZ2ljZXJ0LmNvbS9DUFMwDgYDVR0PAQH/BAQDAgOIMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY3Js
+My5kaWdpY2VydC5jb20vRGlnaUNlcnRUTFNSU0FTSEEyNTYyMDIwQ0ExLTQuY3Js
+MECgPqA8hjpodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vRGlnaUNlcnRUTFNSU0FT
+SEEyNTYyMDIwQ0ExLTQuY3JsMH8GCCsGAQUFBwEBBHMwcTAkBggrBgEFBQcwAYYY
+aHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEkGCCsGAQUFBzAChj1odHRwOi8vY2Fj
+ZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUTFNSU0FTSEEyNTYyMDIwQ0ExLTEu
+Y3J0MAwGA1UdEwEB/wQCMAAwggF+BgorBgEEAdZ5AgQCBIIBbgSCAWoBaAB2ABLx
+TjS9U3JMhAYZw48/ehP457Vih4icbTAFhOvlhiY6AAABkbhvAhwAAAQDAEcwRQIh
+AKw2mqyB5bKpwGN5Dn4rLL5pjsNY03bEnNpVXltFpOtDAiBmwhRQg/V+whwdynkK
+OOyuChdAd2JH76KE+XISMjPM3gB1AObSMWNAd4zBEEEG13G5zsHSQPaWhIb7uocy
+Hf0eN45QAAABkbhvAm8AAAQDAEYwRAIgOw/ZyiiIsgDbM55pvJmV/CvwA5AGWbpC
+lB9q78TiJj4CIC2d9w9Ntb3HTOrLQvwSiNOrpop+deZ3fa1LQ92miaclAHcAzPsP
+aoVxCWX+lZtTzumyfCLphVwNl422qX5UwP5MDbAAAAGRuG8CMAAABAMASDBGAiEA
+oSSK9/26Uk3fqp7btK2SaEyWM/u++sOZXMeEOefnKwUCIQCqKysJztOF58PueXeE
+pLliBWZUnjUrvPIbtxp31gQQITANBgkqhkiG9w0BAQsFAAOCAQEAAoJryZtJc8oc
++hf5vflkW2w0PdJ5NpbmjZOMTyutBRaJpxrDqKnjKBEOp6liZ2pDbUngGAwLEM30
+KRBwJCc44u7w8Kj/KOoIZFoh9SiONAEn1qXWF0nFkYAD8J8yYwzkJy7fa3sdodaI
+ex5NJosK/tyXjEBOcTrBsXkzs55pjSi+KJiiOHs/hDuBdyDtJs1ENAOswd8AWMSk
+S9WycNxxEFH9VQgwgUhaI5Lc9J8rt3IJur1wp1JoDwdjIhs1M0rofgdW716UpmQ9
+visdfGu8fCAlDSBPPC6gUPlFGFf4ujUmprJyBQ5xsYva0sVqhGbaoxtV7FdMDJkg
+nDRma+9lPA==
 -----END CERTIFICATE-----
 )CERT";
diff --git a/libraries/lwIP_w55rp20/src/wiznet_pio_spi.pio.h b/libraries/lwIP_w55rp20/src/wiznet_pio_spi.pio.h
@@ -39,7 +39,7 @@ static const struct pio_program wiznet_pio_spi_write_read_program = {
     .instructions = wiznet_pio_spi_write_read_program_instructions,
     .length = 9,
     .origin = -1,
-    .pio_version = 0,
+    .pio_version = wiznet_pio_spi_write_read_pio_version,
 #if PICO_PIO_VERSION > 0
     .used_gpio_ranges = 0x0
 #endif

diff --git a/package/package_pico_index.template.json b/package/package_pico_index.template.json
diff --git a/pico-sdk b/pico-sdk
diff --git a/platform.txt b/platform.txt
@@ -60,7 +60,7 @@ compiler.libbearssl="{runtime.platform.path}/lib/{build.chip}/libbearssl.a"
 compiler.c.cmd={build.toolchain}-gcc
 compiler.c.flags=-c {compiler.warning_flags} {compiler.defines} {compiler.flags} -MMD {compiler.includes} -std=gnu17 -g -pipe
 compiler.c.elf.cmd={build.toolchain}-g++
-compiler.c.elf.flags={compiler.warning_flags} {compiler.defines} {compiler.flags} {build.flags.optimize} -u _printf_float -u _scanf_float
+compiler.c.elf.flags={compiler.warning_flags} {compiler.defines} {compiler.flags} {build.flags.optimize}
 compiler.S.cmd={build.toolchain}-gcc
 compiler.S.flags=-c {compiler.warning_flags} {compiler.defines} -g -x assembler-with-cpp -MMD {compiler.includes} {build.toolchainopts} -g
 compiler.cpp.cmd={build.toolchain}-g++

diff --git a/tools/libbearssl/bearssl b/tools/libbearssl/bearssl
diff --git a/tools/libpico/make-libpico.sh b/tools/libpico/make-libpico.sh
@@ -14,41 +14,45 @@ cd build-rp2040
 CPU=rp2040 cmake ..
 make -j
 
-rm -rf boot
-mkdir boot
-cd boot
-mkdir -p pico 
-touch pico/config.h
-for type in boot2_generic_03h boot2_is25lp080 boot2_w25q080 boot2_w25x10cl; do
-    for div in 2 4; do
-        arm-none-eabi-gcc -march=armv6-m -mcpu=cortex-m0plus -mthumb -O3 \
-                         -DNDEBUG -DPICO_FLASH_SPI_CLKDIV=$div \
-                         -c "$PICO_SDK_PATH/src/rp2040/boot_stage2/$type.S" \
-                         -I "$PICO_SDK_PATH/src/boards/include/boards/" \
-                         -I "$PICO_SDK_PATH/src/rp2040/hardware_regs/include/" \
-                         -I "$PICO_SDK_PATH/src/rp2_common/pico_platform/include/" \
-                         -I "$PICO_SDK_PATH/src/rp2_common/boot_stage2/asminclude/" \
-                         -I "$PICO_SDK_PATH/src/rp2040/pico_platform/include/" \
-                         -I "$PICO_SDK_PATH/src/rp2040/boot_stage2/asminclude/" \
-                         -I .
+# The develop branch of the SDK seems to have busted the RP2040 boot2.S files.
+# These don't change and aren't lkikely to get any new additions, so comment out
+# for now and use the prior versions built under earlier SDK.
+#rm -rf boot
+#mkdir boot
+#cd boot
+#mkdir -p pico 
+#touch pico/config.h
+#for type in boot2_generic_03h boot2_is25lp080 boot2_w25q080 boot2_w25x10cl; do
+#    for div in 2 4; do
+#        arm-none-eabi-gcc -march=armv6-m -mcpu=cortex-m0plus -mthumb -O3 \
+#                         -DNDEBUG -DPICO_FLASH_SPI_CLKDIV=$div \
+#                         -c "$PICO_SDK_PATH/src/rp2040/boot_stage2/$type.S" \
+#                         -I "$PICO_SDK_PATH/src/boards/include/boards/" \
+#                         -I "$PICO_SDK_PATH/src/rp2040/hardware_regs/include/" \
+#                         -I "$PICO_SDK_PATH/src/rp2_common/pico_platform/include/" \
+#                         -I "$PICO_SDK_PATH/src/rp2_common/boot_stage2/asminclude/" \
+#                         -I "$PICO_SDK_PATH/src/rp2040/pico_platform/include/" \
+#                         -I "$PICO_SDK_PATH/src/rp2040/boot_stage2/asminclude/" \
+#                         -I .
+#
+#        arm-none-eabi-gcc -march=armv6-m -mcpu=cortex-m0plus -mthumb -O3 \
+#                          -DNDEBUG -Wl,--build-id=none --specs=nosys.specs -nostartfiles \
+#                          -Wl,--script="$PICO_SDK_PATH/src/rp2040/boot_stage2/boot_stage2.ld" \
+#                          -Wl,-Map=$type.$div.elf.map $type.o -o $type.$div.elf 
+#
+#        arm-none-eabi-objdump -h $type.$div.elf >  $type.$div.dis
+#        arm-none-eabi-objdump -d $type.$div.elf >> $type.$div.dis
+#
+#        arm-none-eabi-objcopy -Obinary $type.$div.elf $type.$div.bin
+#
+#        python3 "$PICO_SDK_PATH/src/rp2040/boot_stage2/pad_checksum" \
+#                   -s 0xffffffff $type.$div.bin ${type}_${div}_padded_checksum.S
+#    done
+#done
+#mv *.S ../../../../boot2/rp2040/.
+#cd ../..
 
-        arm-none-eabi-gcc -march=armv6-m -mcpu=cortex-m0plus -mthumb -O3 \
-                          -DNDEBUG -Wl,--build-id=none --specs=nosys.specs -nostartfiles \
-                          -Wl,--script="$PICO_SDK_PATH/src/rp2040/boot_stage2/boot_stage2.ld" \
-                          -Wl,-Map=$type.$div.elf.map $type.o -o $type.$div.elf 
-
-        arm-none-eabi-objdump -h $type.$div.elf >  $type.$div.dis
-        arm-none-eabi-objdump -d $type.$div.elf >> $type.$div.dis
-
-        arm-none-eabi-objcopy -Obinary $type.$div.elf $type.$div.bin
-
-        python3 "$PICO_SDK_PATH/src/rp2040/boot_stage2/pad_checksum" \
-                   -s 0xffffffff $type.$div.bin ${type}_${div}_padded_checksum.S
-    done
-done
-mv *.S ../../../../boot2/rp2040/.
-
-cd ../..
+cd ..
 rm -rf build-rp2350
 mkdir build-rp2350
 cd build-rp2350

diff --git a/tools/platformio-build.py b/tools/platformio-build.py
@@ -242,8 +242,6 @@ def is_pio_build():
     LINKFLAGS=[
         "@%s" % os.path.join(FRAMEWORK_DIR, "lib", chip, "platform_wrap.txt"),
         "@%s" % os.path.join(FRAMEWORK_DIR, "lib", "core_wrap.txt"),
-        "-u_printf_float",
-        "-u_scanf_float",
         # no cross-reference table, heavily spams the output
         # "-Wl,--cref",
         "-Wl,--no-warn-rwx-segments",