From 8b3eb8eaac623542e764a443a58074b83d5f7fc1 Mon Sep 17 00:00:00 2001 From: hathach Date: Mon, 27 Aug 2018 14:16:19 +0700 Subject: [PATCH] seperate mergehex from genhex --- Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9f39a6e..a3e9edc 100644 --- a/Makefile +++ b/Makefile @@ -453,9 +453,15 @@ genhex: $(BUILD)/$(OUTPUT_FILENAME).hex $(BUILD)/$(OUTPUT_FILENAME).hex: $(BUILD)/$(OUTPUT_FILENAME).out @echo CR $(OUTPUT_FILENAME).hex - @echo CR $(MERGED_FNAME).hex $(QUIET)$(OBJCOPY) -O ihex $< $@ - @mergehex -q -m $@ $(SD_HEX) -o $(BUILD)/$(MERGED_FNAME).hex + + +# merge bootloader and sd hex together +combinehex: $(BUILD)/$(MERGED_FNAME).hex + +$(BUILD)/$(MERGED_FNAME).hex: $(BUILD)/$(OUTPUT_FILENAME).hex + @echo CR $(MERGED_FNAME).hex + @mergehex -q -m $< $(SD_HEX) -o $@ ## Create pkg file for bootloader+SD combo to use with DFU genpkg: $(BUILD)/$(MERGED_FNAME).zip @@ -464,7 +470,7 @@ $(BUILD)/$(MERGED_FNAME).zip: $(BUILD)/$(OUTPUT_FILENAME).hex @$(NRFUTIL) dfu genpkg --dev-type 0x0052 --dev-revision $(DFU_DEV_REV) --bootloader $< --softdevice $(SD_HEX) $@ # Create SD+bootloader combo with hex & dfu package at release folder -release: genhex genpkg +release: combinehex genpkg @echo CR $(RELEASE_DIR)/$(MERGED_FNAME).hex @echo CR $(RELEASE_DIR)/$(MERGED_FNAME).zip @mkdir -p $(RELEASE_DIR)