software: normalize firmware while deploying.

Author: whitequark

firmware/normalize.py

@@ -0,0 +1,19 @@
+import sys
+from fx2.format import input_data, output_data
+
+
+def normalize(input):
+    output = []
+    for (addr, chunk) in sorted(input):
+        if output and output[-1][0] + len(output[-1][1]) == addr:
+            output[-1] = (output[-1][0], output[-1][1] + chunk)
+        else:
+            output.append((addr, chunk))
+    return output
+
+
+with open(sys.argv[1], "rb") as f:
+    data = input_data(f)
+data = normalize(data)
+with open(sys.argv[2], "wb") as f:
+    output_data(f, data)

software/deploy-firmware.sh

@@ -23,7 +23,7 @@ set -ex
 
 # Install dependencies.
 apt-get update -qq
-apt-get install -qq --no-install-recommends git make sdcc
+apt-get install -qq --no-install-recommends git make sdcc python3 python3-usb1
 
 # Any commands that create new files in the host mount must be invoked with the caller UID/GID, or
 # else the created files will be owned by root. We can't use `docker run --user` because then
@@ -47,7 +47,10 @@ make -C firmware clean
 make -C vendor/libfx2/firmware/library all MODELS=medium
 make -C firmware all
 
-# Deploy the artifact.
-cp firmware/glasgow.ihex software/glasgow/hardware/firmware.ihex
+# Deploy the artifact. For incomprehensible (literally; I could not figure out why) reasons,
+# the Debian and NixOS builds of exact same commit of sdcc produce different .ihex files that
+# nevertheless translate to the same binary contents.
+PYTHONPATH=vendor/libfx2/software python3 firmware/normalize.py \
+    firmware/glasgow.ihex software/glasgow/hardware/firmware.ihex
 
 END