From fdeaa92b7e7fdd78c25f6f16e04027b435eeaa70 Mon Sep 17 00:00:00 2001
From: Dominic Spill <dominicgs@gmail.com>
Date: Tue, 24 Jan 2017 15:44:15 -0700
Subject: [PATCH 1/2] Replace python one liner with script to build dfu files

---
 firmware/dfu.py              | 7 +++++++
 firmware/hackrf-common.cmake | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 firmware/dfu.py

diff --git a/firmware/dfu.py b/firmware/dfu.py
new file mode 100644
index 00000000..97ead047
--- /dev/null
+++ b/firmware/dfu.py
@@ -0,0 +1,7 @@
+import os.path
+import struct
+
+with open("_header.bin", "wb") as f:
+    x = struct.pack('<H', os.path.getsize('hackrf_usb_dfu.bin') // 512 + 1)
+    y = [0xda, 0xff, x[0], x[1], 0xff, 0xff, 0xff, 0xff]
+    f.write(bytearray(y))
diff --git a/firmware/hackrf-common.cmake b/firmware/hackrf-common.cmake
index 8806a268..f9cc9176 100644
--- a/firmware/hackrf-common.cmake
+++ b/firmware/hackrf-common.cmake
@@ -194,9 +194,9 @@ macro(DeclareTargets)
 		COMMAND rm -f _tmp.dfu _header.bin
 		COMMAND cp ${PROJECT_NAME}_dfu.bin _tmp.dfu
 		COMMAND ${DFU_COMMAND}
-		COMMAND python -c \"import os.path\; import struct\; print\('0000000: da ff ' + ' '.join\(map\(lambda s: '%02x' % ord\(s\), struct.pack\('<H', os.path.getsize\('${PROJECT_NAME}_dfu.bin'\) / 512 + 1\)\)\) + ' ff ff ff ff'\)\" | xxd -g1 -r > _header.bin
+		COMMAND python ../../dfu.py
 		COMMAND cat _header.bin _tmp.dfu >${PROJECT_NAME}.dfu
-		COMMAND rm -f _tmp.dfu _header.bin
+		#COMMAND rm -f _tmp.dfu _header.bin
 	)
 
 	add_custom_target(

From 1ad2577f5567c3b986d8c5355adedf23870cc49b Mon Sep 17 00:00:00 2001
From: Dominic Spill <dominicgs@gmail.com>
Date: Tue, 24 Jan 2017 17:21:42 -0700
Subject: [PATCH 2/2] Reinstate commands to clean up after DFU process

---
 firmware/hackrf-common.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firmware/hackrf-common.cmake b/firmware/hackrf-common.cmake
index f9cc9176..f8c35b33 100644
--- a/firmware/hackrf-common.cmake
+++ b/firmware/hackrf-common.cmake
@@ -196,7 +196,7 @@ macro(DeclareTargets)
 		COMMAND ${DFU_COMMAND}
 		COMMAND python ../../dfu.py
 		COMMAND cat _header.bin _tmp.dfu >${PROJECT_NAME}.dfu
-		#COMMAND rm -f _tmp.dfu _header.bin
+		COMMAND rm -f _tmp.dfu _header.bin
 	)
 
 	add_custom_target(