Fixes detection of zero-containing blocks.

bakerstu · Dec 20, 2023 · 95e699a · 95e699a
1 parent 2fd8ecf
commit 95e699a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/applications/reflash_bootloader/targets/bare.armv7m.ek-tm4c123gxl/Makefile b/applications/reflash_bootloader/targets/bare.armv7m.ek-tm4c123gxl/Makefile
@@ -19,7 +19,7 @@ LDFLAGSEXTRA+= --specs=nano.specs
 bootloader_bin/bootloader.bin: FORCE
 	$(MAKE) -C $(realpath bootloader_bin) bootloader.bin
 
-payload.cxxout: bootloader_bin/bootloader.bin
+payload.cxxout: bootloader_bin/bootloader.bin $(OPENMRNPATH)/bin/build_bootloader_img.py
 	$(OPENMRNPATH)/bin/build_bootloader_img.py -i bootloader_bin/bootloader.bin -o $@
 
 .cxxout.o:

diff --git a/bin/build_bootloader_img.py b/bin/build_bootloader_img.py
@@ -105,26 +105,32 @@ def print_c_array(file_out, name, payload):
 
   outputblocks = []
 
+  print("Blocks:", end=" ")
   for k, block in enumerate(blocks):
     if k == 0:
       b = Block()
       b.ofs = 0
       b.data = block
       b.end_ofs = 0
       outputblocks.append(b)
+      print("b", end="")
       continue
-    if block.count('\0') == len(block):  # all zeros
+    if block.count(b'\x00') == len(block):  # all zeros
+      print("o", end="")
       continue
     if outputblocks[-1].end_ofs == k - 1:
       outputblocks[-1].data += block
       outputblocks[-1].end_ofs = k
+      print("x", end="")
     else:
       b = Block()
       b.ofs = k
       b.data = block
       b.end_ofs = k
       outputblocks.append(b)
+      print("b", end="")
 
+  print("")
   segmenttable = ''
   for b in outputblocks:
     print_c_array(file_out, "payload_%d" % b.ofs, b.data);