From caca0b1e7a2f0a6906267861528a9ff231463f80 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Fri, 5 May 2017 22:29:15 +0200
Subject: [PATCH] Makefile: Add new 'combined' target to build combined DFU+APP
 image

---
 firmware/Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/firmware/Makefile b/firmware/Makefile
index e3bb418d..96343982 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -182,6 +182,15 @@ OUTPUT := $(BIN)/$(OUTPUT)
 
 all: apps/$(APP)/usb_strings_generated.h $(BIN) $(OBJ) $(MEMORIES)
 
+combined: $(OUTPUT)-combined.bin
+
+$(BIN)/$(BOARD)-dfu-flash-padded.bin: $(BIN)/$(BOARD)-dfu-flash.bin
+	dd if=/dev/zero bs=16384 count=1 of=$@
+	dd if=$< conv=notrunc of=$@
+
+$(OUTPUT)-combined.bin: $(BIN)/$(BOARD)-dfu-flash-padded.bin $(OUTPUT)-dfu.bin
+	cat $^ > $@
+
 $(BIN) $(OBJ):
 	mkdir $@