Merge pull request #378 from tista3/master

Faster delete of uicr/mbr addresses from loaded hex

Author: jornbh

nordicsemi/dfu/nrfhex.py

@@ -85,17 +85,11 @@ def __init__(self, source, bootloader=None, arch=None):
 
     def _removeuicr(self):
         uicr_start_address = 0x10000000
-        maxaddress = self.maxaddr()
-        if maxaddress >= uicr_start_address:
-            for i in range(uicr_start_address, maxaddress + 1):
-                self._buf.pop(i, 0)
+        self._buf = {k: v for k, v in self._buf.items() if k < uicr_start_address}
 
     def _removembr(self):
         mbr_end_address = 0x1000
-        minaddress = super().minaddr()
-        if minaddress < mbr_end_address:
-            for i in range(minaddress, mbr_end_address):
-                self._buf.pop(i, 0)
+        self._buf = {k: v for k, v in self._buf.items() if k >= mbr_end_address}
 
     def address_has_magic_number(self, address):
         try: