From 80961d1fb2eb5b22ac4b2f086a279225e616a4e1 Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Sat, 22 Jun 2019 01:19:16 +0200
Subject: [PATCH] chore(bootloader): Cleanup generation scripts

Signed-off-by: Rahix <rahix@rahix.de>
---
 bootloader/build_multi_image.sh |  7 +++----
 bootloader/crc_patch.py         | 21 ++++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/bootloader/build_multi_image.sh b/bootloader/build_multi_image.sh
index db1943a91..94a3b46b1 100755
--- a/bootloader/build_multi_image.sh
+++ b/bootloader/build_multi_image.sh
@@ -1,14 +1,13 @@
 #!/bin/sh
 set -e
 
-echo "build multi image" $1 $2 $3 $4
 PYTHON="$1"
 BIN1="$2"
 BIN2="$3"
 BINOUT="$4"
 
-dd if=/dev/zero ibs=1k count=448 | tr "\000" "\377" > "$BINOUT"
-dd if="$BIN1" of="$BINOUT" conv=notrunc
-dd if="$BIN2" of="$BINOUT" conv=notrunc oflag=append
+dd if=/dev/zero ibs=1k count=448 2>/dev/null | tr "\000" "\377" > "$BINOUT"
+dd if="$BIN1" of="$BINOUT" conv=notrunc 2>/dev/null
+dd if="$BIN2" of="$BINOUT" conv=notrunc oflag=append 2>/dev/null
 
 "$PYTHON" "$(dirname "$0")/crc_patch.py" "$BINOUT"
diff --git a/bootloader/crc_patch.py b/bootloader/crc_patch.py
index 21eeb57a5..59ec6befb 100755
--- a/bootloader/crc_patch.py
+++ b/bootloader/crc_patch.py
@@ -2,16 +2,19 @@
 import sys
 import crc16
 
-crc = 0
 
-data = open(sys.argv[1], 'rb').read()
-crc = crc16.crc16xmodem(data)
-print(crc)
+def main():
+    data = open(sys.argv[1], 'rb').read()
+    crc = crc16.crc16xmodem(data)
+    # print(crc)
 
-padded = data + bytes([crc >> 8, crc & 0xFF])
+    padded = data + bytes([crc >> 8, crc & 0xFF])
 
-crc = 0
-crc = crc16.crc16xmodem(padded)
-print(crc)
+    crc = crc16.crc16xmodem(padded)
+    # print(crc)
 
-open(sys.argv[1], 'wb').write(padded)
+    open(sys.argv[1], 'wb').write(padded)
+
+
+if __name__ == "__main__":
+    main()
-- 
GitLab