From f258da16f194bee71d808410a088072b75b9edd8 Mon Sep 17 00:00:00 2001
From: Joachim LF <joachimlf@pm.me>
Date: Fri, 14 May 2021 14:16:41 +0200
Subject: [PATCH] [Build] revert binpack move

---
 build/targets.device.mak       | 18 +++++++++++++++++
 build/targets.device.n0110.mak | 36 ----------------------------------
 2 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/build/targets.device.mak b/build/targets.device.mak
index 891b1d097..9498371c4 100644
--- a/build/targets.device.mak
+++ b/build/targets.device.mak
@@ -54,3 +54,21 @@ $(BUILD_DIR)/bench.ram.$(EXE): LDFLAGS += -Lion/src/$(PLATFORM)/bench
 $(BUILD_DIR)/bench.ram.$(EXE): LDSCRIPT = ion/src/$(PLATFORM)/shared/ram.ld
 $(BUILD_DIR)/bench.flash.$(EXE): $(call flavored_object_for,$(bench_src),consoleuart usbxip)
 $(BUILD_DIR)/bench.flash.$(EXE): LDSCRIPT = ion/src/$(PLATFORM)/$(MODEL)/internal_flash.ld
+
+.PHONY: %.two_binaries
+%.two_binaries: %.elf
+	@echo "Building an internal and an external binary for     $<"
+	$(Q) $(OBJCOPY) -O binary -j .text.external -j .rodata.external -j .exam_mode_buffer $< $(basename $<).external.bin
+	$(Q) $(OBJCOPY) -O binary -R .text.external -R .rodata.external -R .exam_mode_buffer $< $(basename $<).internal.bin
+	@echo "Padding $(basename $<).external.bin and $(basename $<).internal.bin"
+	$(Q) printf "\xFF\xFF\xFF\xFF" >> $(basename $<).external.bin
+	$(Q) printf "\xFF\xFF\xFF\xFF" >> $(basename $<).internal.bin
+
+.PHONY: binpack
+binpack: $(BUILD_DIR)/flasher.light.bin $(BUILD_DIR)/epsilon.onboarding.two_binaries
+	rm -rf $(BUILD_DIR)/binpack
+	mkdir -p $(BUILD_DIR)/binpack
+	cp $(BUILD_DIR)/flasher.light.bin $(BUILD_DIR)/binpack
+	cp $(BUILD_DIR)/epsilon.onboarding.internal.bin $(BUILD_DIR)/epsilon.onboarding.external.bin $(BUILD_DIR)/binpack
+	cd $(BUILD_DIR) && for binary in flasher.light.bin epsilon.onboarding.internal.bin epsilon.onboarding.external.bin; do shasum -a 256 -b binpack/$${binary} > binpack/$${binary}.sha256;done
+	cd $(BUILD_DIR) && tar cvfz binpack-$(MODEL)-`git rev-parse HEAD | head -c 7`.tgz binpack/*
diff --git a/build/targets.device.n0110.mak b/build/targets.device.n0110.mak
index 27d4c8805..77bc1bf8c 100644
--- a/build/targets.device.n0110.mak
+++ b/build/targets.device.n0110.mak
@@ -19,39 +19,3 @@ $(BUILD_DIR)/test.external_flash.write.$(EXE): $(BUILD_DIR)/quiz/src/test_ion_ex
 	    sleep 2; \
 	fi
 	$(Q) $(PYTHON) build/device/dfu.py -u $(word 1,$^)
-
-.PHONY: %.two_binaries
-%.two_binaries: %.elf
-	@echo "Building an internal and an external binary for     $<"
-	$(Q) $(OBJCOPY) -O binary -j .text.external -j .rodata.external -j .exam_mode_buffer $(BUILD_DIR)/$< $(BUILD_DIR)/$(basename $<).external.bin
-	$(Q) $(OBJCOPY) -O binary -R .text.external -R .rodata.external -R .exam_mode_buffer $(BUILD_DIR)/$< $(BUILD_DIR)/$(basename $<).internal.bin
-	@echo "Padding $(basename $<).external.bin and $(basename $<).internal.bin"
-	$(Q) printf "\xFF\xFF\xFF\xFF" >> $(BUILD_DIR)/$(basename $<).external.bin
-	$(Q) printf "\xFF\xFF\xFF\xFF" >> $(BUILD_DIR)/$(basename $<).internal.bin
-
-USE_IN_FACTORY := 1
-
-.PHONY: binpack
-binpack:
-ifndef USE_IN_FACTORY
-	@echo "CAUTION: You are building a binpack."
-	@echo "You must specify where this binpack will be used."
-	@echo "Please set the USE_IN_FACTORY environment variable to either:"
-	@echo "  - 0 for use in diagnostic"
-	@echo "  - 1 for use in production"
-	@exit -1
-endif
-	rm -rf output/binpack
-	mkdir -p output/binpack
-	$(MAKE) clean
-	$(MAKE) IN_FACTORY=$(USE_IN_FACTORY) $(BUILD_DIR)/flasher.light.bin
-	cp $(BUILD_DIR)/flasher.light.bin output/binpack
-	$(MAKE) IN_FACTORY=$(USE_IN_FACTORY) $(BUILD_DIR)/bench.flash.bin
-	$(MAKE) IN_FACTORY=$(USE_IN_FACTORY) $(BUILD_DIR)/bench.ram.bin
-	cp $(BUILD_DIR)/bench.ram.bin $(BUILD_DIR)/bench.flash.bin output/binpack
-	$(MAKE) IN_FACTORY=$(USE_IN_FACTORY) epsilon.official.onboarding.update.two_binaries
-	cp $(BUILD_DIR)/epsilon.official.onboarding.update.internal.bin $(BUILD_DIR)/epsilon.official.onboarding.update.external.bin output/binpack
-	$(MAKE) clean
-	cd output && for binary in flasher.light.bin bench.flash.bin bench.ram.bin epsilon.official.onboarding.update.internal.bin epsilon.official.onboarding.update.external.bin; do shasum -a 256 -b binpack/$${binary} > binpack/$${binary}.sha256;done
-	cd output && tar cvfz binpack-`git rev-parse HEAD | head -c 7`.tgz binpack
-	rm -rf output/binpack