Merge pull request #6123 from theotherjimmy/correct-sector-info

Correct sector scraping in arm-pack-manager

tools/arm_pack_manager/__init__.py

@@ -163,10 +163,18 @@ class Cache () :
         """
         try:
             pack = self.pack_from_cache(device)
-            algo_itr = (pack.open(path) for path in device['algorithm'].keys())
-            algo_bin = algo_itr.next()
-            flm_file = algo_bin.read()
-            return PackFlashAlgo(flm_file).sector_sizes
+            ret = []
+            for filename in device['algorithm'].keys():
+                try:
+                    flm = pack.open(filename)
+                    flash_alg = PackFlashAlgo(flm.read())
+                    sectors = [(flash_alg.flash_start + offset, size)
+                               for offset, size in flash_alg.sector_sizes]
+                    ret.extend(sectors)
+                except Exception:
+                    pass
+            ret.sort(key=lambda sector: sector[0])
+            return ret
         except Exception:
             return None
 

tools/project.py

@@ -221,7 +221,7 @@ def main():
     if options.update_packs:
         from tools.arm_pack_manager import Cache
         cache = Cache(True, True)
-        cache.cache_descriptors()
+        cache.cache_everything()
 
     # Target
     if not options.mcu: