Merge pull request #47 from earlephilhower/except

Fix Pyton on RPI, EEPROM start address in LD file

boards.txt

@@ -25,33 +25,33 @@ rpipico.build.ldscript=memmap_default.ld
 rpipico.menu.flash.2097152_0=2MB (no FS)
 rpipico.menu.flash.2097152_0.upload.maximum_size=2093056
 rpipico.menu.flash.2097152_0.build.flash_length=2093056
-rpipico.menu.flash.2097152_0.build.eeprom_start=2093056
-rpipico.menu.flash.2097152_0.build.fs_start=2093056
-rpipico.menu.flash.2097152_0.build.fs_end=2093056
+rpipico.menu.flash.2097152_0.build.eeprom_start=270528512
+rpipico.menu.flash.2097152_0.build.fs_start=270528512
+rpipico.menu.flash.2097152_0.build.fs_end=270528512
 rpipico.menu.flash.2097152_65536=2MB (FS: 64KB)
 rpipico.menu.flash.2097152_65536.upload.maximum_size=2027520
 rpipico.menu.flash.2097152_65536.build.flash_length=2027520
-rpipico.menu.flash.2097152_65536.build.eeprom_start=2093056
-rpipico.menu.flash.2097152_65536.build.fs_start=2027520
-rpipico.menu.flash.2097152_65536.build.fs_end=2093056
+rpipico.menu.flash.2097152_65536.build.eeprom_start=270528512
+rpipico.menu.flash.2097152_65536.build.fs_start=270462976
+rpipico.menu.flash.2097152_65536.build.fs_end=270528512
 rpipico.menu.flash.2097152_262144=2MB (FS: 256KB)
 rpipico.menu.flash.2097152_262144.upload.maximum_size=1830912
 rpipico.menu.flash.2097152_262144.build.flash_length=1830912
-rpipico.menu.flash.2097152_262144.build.eeprom_start=2093056
-rpipico.menu.flash.2097152_262144.build.fs_start=1830912
-rpipico.menu.flash.2097152_262144.build.fs_end=2093056
+rpipico.menu.flash.2097152_262144.build.eeprom_start=270528512
+rpipico.menu.flash.2097152_262144.build.fs_start=270266368
+rpipico.menu.flash.2097152_262144.build.fs_end=270528512
 rpipico.menu.flash.2097152_524288=2MB (FS: 512KB)
 rpipico.menu.flash.2097152_524288.upload.maximum_size=1568768
 rpipico.menu.flash.2097152_524288.build.flash_length=1568768
-rpipico.menu.flash.2097152_524288.build.eeprom_start=2093056
-rpipico.menu.flash.2097152_524288.build.fs_start=1568768
-rpipico.menu.flash.2097152_524288.build.fs_end=2093056
+rpipico.menu.flash.2097152_524288.build.eeprom_start=270528512
+rpipico.menu.flash.2097152_524288.build.fs_start=270004224
+rpipico.menu.flash.2097152_524288.build.fs_end=270528512
 rpipico.menu.flash.2097152_1048576=2MB (FS: 1MB)
 rpipico.menu.flash.2097152_1048576.upload.maximum_size=1044480
 rpipico.menu.flash.2097152_1048576.build.flash_length=1044480
-rpipico.menu.flash.2097152_1048576.build.eeprom_start=2093056
-rpipico.menu.flash.2097152_1048576.build.fs_start=1044480
-rpipico.menu.flash.2097152_1048576.build.fs_end=2093056
+rpipico.menu.flash.2097152_1048576.build.eeprom_start=270528512
+rpipico.menu.flash.2097152_1048576.build.fs_start=269479936
+rpipico.menu.flash.2097152_1048576.build.fs_end=270528512
 rpipico.menu.freq.125=125 MHz
 rpipico.menu.freq.125.build.f_cpu=125000000L
 rpipico.menu.freq.50=50 MHz
@@ -116,69 +116,69 @@ adafruitfeather.build.ldscript=memmap_default.ld
 adafruitfeather.menu.flash.8388608_0=8MB (no FS)
 adafruitfeather.menu.flash.8388608_0.upload.maximum_size=8384512
 adafruitfeather.menu.flash.8388608_0.build.flash_length=8384512
-adafruitfeather.menu.flash.8388608_0.build.eeprom_start=8384512
-adafruitfeather.menu.flash.8388608_0.build.fs_start=8384512
-adafruitfeather.menu.flash.8388608_0.build.fs_end=8384512
+adafruitfeather.menu.flash.8388608_0.build.eeprom_start=276819968
+adafruitfeather.menu.flash.8388608_0.build.fs_start=276819968
+adafruitfeather.menu.flash.8388608_0.build.fs_end=276819968
 adafruitfeather.menu.flash.8388608_65536=8MB (FS: 64KB)
 adafruitfeather.menu.flash.8388608_65536.upload.maximum_size=8318976
 adafruitfeather.menu.flash.8388608_65536.build.flash_length=8318976
-adafruitfeather.menu.flash.8388608_65536.build.eeprom_start=8384512
-adafruitfeather.menu.flash.8388608_65536.build.fs_start=8318976
-adafruitfeather.menu.flash.8388608_65536.build.fs_end=8384512
+adafruitfeather.menu.flash.8388608_65536.build.eeprom_start=276819968
+adafruitfeather.menu.flash.8388608_65536.build.fs_start=276754432
+adafruitfeather.menu.flash.8388608_65536.build.fs_end=276819968
 adafruitfeather.menu.flash.8388608_262144=8MB (FS: 256KB)
 adafruitfeather.menu.flash.8388608_262144.upload.maximum_size=8122368
 adafruitfeather.menu.flash.8388608_262144.build.flash_length=8122368
-adafruitfeather.menu.flash.8388608_262144.build.eeprom_start=8384512
-adafruitfeather.menu.flash.8388608_262144.build.fs_start=8122368
-adafruitfeather.menu.flash.8388608_262144.build.fs_end=8384512
+adafruitfeather.menu.flash.8388608_262144.build.eeprom_start=276819968
+adafruitfeather.menu.flash.8388608_262144.build.fs_start=276557824
+adafruitfeather.menu.flash.8388608_262144.build.fs_end=276819968
 adafruitfeather.menu.flash.8388608_524288=8MB (FS: 512KB)
 adafruitfeather.menu.flash.8388608_524288.upload.maximum_size=7860224
 adafruitfeather.menu.flash.8388608_524288.build.flash_length=7860224
-adafruitfeather.menu.flash.8388608_524288.build.eeprom_start=8384512
-adafruitfeather.menu.flash.8388608_524288.build.fs_start=7860224
-adafruitfeather.menu.flash.8388608_524288.build.fs_end=8384512
+adafruitfeather.menu.flash.8388608_524288.build.eeprom_start=276819968
+adafruitfeather.menu.flash.8388608_524288.build.fs_start=276295680
+adafruitfeather.menu.flash.8388608_524288.build.fs_end=276819968
 adafruitfeather.menu.flash.8388608_1048576=8MB (FS: 1MB)
 adafruitfeather.menu.flash.8388608_1048576.upload.maximum_size=7335936
 adafruitfeather.menu.flash.8388608_1048576.build.flash_length=7335936
-adafruitfeather.menu.flash.8388608_1048576.build.eeprom_start=8384512
-adafruitfeather.menu.flash.8388608_1048576.build.fs_start=7335936
-adafruitfeather.menu.flash.8388608_1048576.build.fs_end=8384512
+adafruitfeather.menu.flash.8388608_1048576.build.eeprom_start=276819968
+adafruitfeather.menu.flash.8388608_1048576.build.fs_start=275771392
+adafruitfeather.menu.flash.8388608_1048576.build.fs_end=276819968
 adafruitfeather.menu.flash.8388608_2097152=8MB (FS: 2MB)
 adafruitfeather.menu.flash.8388608_2097152.upload.maximum_size=6287360
 adafruitfeather.menu.flash.8388608_2097152.build.flash_length=6287360
-adafruitfeather.menu.flash.8388608_2097152.build.eeprom_start=8384512
-adafruitfeather.menu.flash.8388608_2097152.build.fs_start=6287360
-adafruitfeather.menu.flash.8388608_2097152.build.fs_end=8384512
+adafruitfeather.menu.flash.8388608_2097152.build.eeprom_start=276819968
+adafruitfeather.menu.flash.8388608_2097152.build.fs_start=274722816
+adafruitfeather.menu.flash.8388608_2097152.build.fs_end=276819968
 adafruitfeather.menu.flash.8388608_3145728=8MB (FS: 3MB)
 adafruitfeather.menu.flash.8388608_3145728.upload.maximum_size=5238784
 adafruitfeather.menu.flash.8388608_3145728.build.flash_length=5238784
-adafruitfeather.menu.flash.8388608_3145728.build.eeprom_start=8384512
-adafruitfeather.menu.flash.8388608_3145728.build.fs_start=5238784
-adafruitfeather.menu.flash.8388608_3145728.build.fs_end=8384512
+adafruitfeather.menu.flash.8388608_3145728.build.eeprom_start=276819968
+adafruitfeather.menu.flash.8388608_3145728.build.fs_start=273674240
+adafruitfeather.menu.flash.8388608_3145728.build.fs_end=276819968
 adafruitfeather.menu.flash.8388608_4194304=8MB (FS: 4MB)
 adafruitfeather.menu.flash.8388608_4194304.upload.maximum_size=4190208
 adafruitfeather.menu.flash.8388608_4194304.build.flash_length=4190208
-adafruitfeather.menu.flash.8388608_4194304.build.eeprom_start=8384512
-adafruitfeather.menu.flash.8388608_4194304.build.fs_start=4190208
-adafruitfeather.menu.flash.8388608_4194304.build.fs_end=8384512
+adafruitfeather.menu.flash.8388608_4194304.build.eeprom_start=276819968
+adafruitfeather.menu.flash.8388608_4194304.build.fs_start=272625664
+adafruitfeather.menu.flash.8388608_4194304.build.fs_end=276819968
 adafruitfeather.menu.flash.8388608_5242880=8MB (FS: 5MB)
 adafruitfeather.menu.flash.8388608_5242880.upload.maximum_size=3141632
 adafruitfeather.menu.flash.8388608_5242880.build.flash_length=3141632
-adafruitfeather.menu.flash.8388608_5242880.build.eeprom_start=8384512
-adafruitfeather.menu.flash.8388608_5242880.build.fs_start=3141632
-adafruitfeather.menu.flash.8388608_5242880.build.fs_end=8384512
+adafruitfeather.menu.flash.8388608_5242880.build.eeprom_start=276819968
+adafruitfeather.menu.flash.8388608_5242880.build.fs_start=271577088
+adafruitfeather.menu.flash.8388608_5242880.build.fs_end=276819968
 adafruitfeather.menu.flash.8388608_6291456=8MB (FS: 6MB)
 adafruitfeather.menu.flash.8388608_6291456.upload.maximum_size=2093056
 adafruitfeather.menu.flash.8388608_6291456.build.flash_length=2093056
-adafruitfeather.menu.flash.8388608_6291456.build.eeprom_start=8384512
-adafruitfeather.menu.flash.8388608_6291456.build.fs_start=2093056
-adafruitfeather.menu.flash.8388608_6291456.build.fs_end=8384512
+adafruitfeather.menu.flash.8388608_6291456.build.eeprom_start=276819968
+adafruitfeather.menu.flash.8388608_6291456.build.fs_start=270528512
+adafruitfeather.menu.flash.8388608_6291456.build.fs_end=276819968
 adafruitfeather.menu.flash.8388608_7340032=8MB (FS: 7MB)
 adafruitfeather.menu.flash.8388608_7340032.upload.maximum_size=1044480
 adafruitfeather.menu.flash.8388608_7340032.build.flash_length=1044480
-adafruitfeather.menu.flash.8388608_7340032.build.eeprom_start=8384512
-adafruitfeather.menu.flash.8388608_7340032.build.fs_start=1044480
-adafruitfeather.menu.flash.8388608_7340032.build.fs_end=8384512
+adafruitfeather.menu.flash.8388608_7340032.build.eeprom_start=276819968
+adafruitfeather.menu.flash.8388608_7340032.build.fs_start=269479936
+adafruitfeather.menu.flash.8388608_7340032.build.fs_end=276819968
 adafruitfeather.menu.freq.125=125 MHz
 adafruitfeather.menu.freq.125.build.f_cpu=125000000L
 adafruitfeather.menu.freq.50=50 MHz
@@ -243,33 +243,33 @@ generic.build.ldscript=memmap_default.ld
 generic.menu.flash.2097152_0=2MB (no FS)
 generic.menu.flash.2097152_0.upload.maximum_size=2093056
 generic.menu.flash.2097152_0.build.flash_length=2093056
-generic.menu.flash.2097152_0.build.eeprom_start=2093056
-generic.menu.flash.2097152_0.build.fs_start=2093056
-generic.menu.flash.2097152_0.build.fs_end=2093056
+generic.menu.flash.2097152_0.build.eeprom_start=270528512
+generic.menu.flash.2097152_0.build.fs_start=270528512
+generic.menu.flash.2097152_0.build.fs_end=270528512
 generic.menu.flash.2097152_65536=2MB (FS: 64KB)
 generic.menu.flash.2097152_65536.upload.maximum_size=2027520
 generic.menu.flash.2097152_65536.build.flash_length=2027520
-generic.menu.flash.2097152_65536.build.eeprom_start=2093056
-generic.menu.flash.2097152_65536.build.fs_start=2027520
-generic.menu.flash.2097152_65536.build.fs_end=2093056
+generic.menu.flash.2097152_65536.build.eeprom_start=270528512
+generic.menu.flash.2097152_65536.build.fs_start=270462976
+generic.menu.flash.2097152_65536.build.fs_end=270528512
 generic.menu.flash.2097152_262144=2MB (FS: 256KB)
 generic.menu.flash.2097152_262144.upload.maximum_size=1830912
 generic.menu.flash.2097152_262144.build.flash_length=1830912
-generic.menu.flash.2097152_262144.build.eeprom_start=2093056
-generic.menu.flash.2097152_262144.build.fs_start=1830912
-generic.menu.flash.2097152_262144.build.fs_end=2093056
+generic.menu.flash.2097152_262144.build.eeprom_start=270528512
+generic.menu.flash.2097152_262144.build.fs_start=270266368
+generic.menu.flash.2097152_262144.build.fs_end=270528512
 generic.menu.flash.2097152_524288=2MB (FS: 512KB)
 generic.menu.flash.2097152_524288.upload.maximum_size=1568768
 generic.menu.flash.2097152_524288.build.flash_length=1568768
-generic.menu.flash.2097152_524288.build.eeprom_start=2093056
-generic.menu.flash.2097152_524288.build.fs_start=1568768
-generic.menu.flash.2097152_524288.build.fs_end=2093056
+generic.menu.flash.2097152_524288.build.eeprom_start=270528512
+generic.menu.flash.2097152_524288.build.fs_start=270004224
+generic.menu.flash.2097152_524288.build.fs_end=270528512
 generic.menu.flash.2097152_1048576=2MB (FS: 1MB)
 generic.menu.flash.2097152_1048576.upload.maximum_size=1044480
 generic.menu.flash.2097152_1048576.build.flash_length=1044480
-generic.menu.flash.2097152_1048576.build.eeprom_start=2093056
-generic.menu.flash.2097152_1048576.build.fs_start=1044480
-generic.menu.flash.2097152_1048576.build.fs_end=2093056
+generic.menu.flash.2097152_1048576.build.eeprom_start=270528512
+generic.menu.flash.2097152_1048576.build.fs_start=269479936
+generic.menu.flash.2097152_1048576.build.fs_end=270528512
 generic.menu.freq.125=125 MHz
 generic.menu.freq.125.build.f_cpu=125000000L
 generic.menu.freq.50=50 MHz

package/package_pico_index.template.json

@@ -126,10 +126,10 @@
                "systems": [
                   {
                      "host": "arm-linux-gnueabihf",
-                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.1.0-base/aarch64-linux-gnu.openocd-d58c2ef5e.210324.tar.gz",
-                     "archiveFileName": "aarch64-linux-gnu.openocd-d58c2ef5e.210324.tar.gz",
-                     "checksum": "SHA-256:46866ab64b7a36630d9435b94c57ce7790766425ba09f08187888879c25e1c97",
-                     "size": "6075925"
+                     "url": "https://github.com/earlephilhower/pico-quick-toolchain/releases/download/1.0.1-base/python3-via-env.tar.gz",
+                     "archiveFileName": "python3-via-env.tar.gz",
+                     "checksum": "SHA-256:c9237bfe0f62842d7187a39495baa4a7e3ab8b87c0b433614294b023cf0bc0f3",
+                     "size": "292"
                   },
                   {
                      "host": "x86_64-mingw32",
@@ -405,4 +405,4 @@
          ]
       }
    ]
-}
\ No newline at end of file
+}

tools/makeboards.py

@@ -12,9 +12,9 @@ def BuildFlashMenu(name, flashsize, fssizelist):
         print("%s.menu.flash.%s=%dMB (%s)" % (name, mn, flashsize / (1024 * 1024), fssizename))
         print("%s.menu.flash.%s.upload.maximum_size=%d" % (name, mn, flashsize - 4096 - fssize))
         print("%s.menu.flash.%s.build.flash_length=%d" % (name, mn, flashsize - 4096 - fssize))
-        print("%s.menu.flash.%s.build.eeprom_start=%d" % (name, mn, flashsize - 4096))
-        print("%s.menu.flash.%s.build.fs_start=%d" % (name, mn, flashsize - 4096 - fssize))
-        print("%s.menu.flash.%s.build.fs_end=%d" % (name, mn, flashsize - 4096))
+        print("%s.menu.flash.%s.build.eeprom_start=%d" % (name, mn, int("0x10000000",0) + flashsize - 4096))
+        print("%s.menu.flash.%s.build.fs_start=%d" % (name, mn, int("0x10000000",0) + flashsize - 4096 - fssize))
+        print("%s.menu.flash.%s.build.fs_end=%d" % (name, mn, int("0x10000000",0) + flashsize - 4096))
 
 def BuildDebugPort(name):
     print("%s.menu.dbgport.Disabled=Disabled" % (name))