From 175e38711e69db2fbf976d24a82e75ea9e4c3c39 Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Sun, 1 Mar 2020 16:45:53 +0100 Subject: [PATCH 1/2] Removed duplicate binpack rule. --- build/targets.device.n0110.mak | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/build/targets.device.n0110.mak b/build/targets.device.n0110.mak index 5b5078ac5..456da622a 100644 --- a/build/targets.device.n0110.mak +++ b/build/targets.device.n0110.mak @@ -20,28 +20,3 @@ $(BUILD_DIR)/test.external_flash.write.$(EXE): $(BUILD_DIR)/quiz/src/test_ion_ex 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 - -.PHONY: binpack -binpack: - rm -rf output/binpack - mkdir -p output/binpack - $(MAKE) clean - $(MAKE) $(BUILD_DIR)/flasher.light.bin - cp $(BUILD_DIR)/flasher.light.bin output/binpack - $(MAKE) $(BUILD_DIR)/bench.flash.bin - $(MAKE) $(BUILD_DIR)/bench.ram.bin - cp $(BUILD_DIR)/bench.ram.bin $(BUILD_DIR)/bench.flash.bin output/binpack - $(MAKE) 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 From 8a4e9520f398f938fa5b2cce8cb026aa3d4d9f4f Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Sun, 1 Mar 2020 16:48:36 +0100 Subject: [PATCH 2/2] Removed .gradle, added it to gitignore. --- .gitignore | 3 ++- .../.gradle/5.2.1/fileChanges/last-build.bin | Bin 1 -> 0 bytes .../.gradle/5.2.1/fileHashes/fileHashes.lock | Bin 17 -> 0 bytes .../simulator/android/.gradle/5.2.1/gc.properties | 0 4 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 ion/src/simulator/android/.gradle/5.2.1/fileChanges/last-build.bin delete mode 100644 ion/src/simulator/android/.gradle/5.2.1/fileHashes/fileHashes.lock delete mode 100644 ion/src/simulator/android/.gradle/5.2.1/gc.properties diff --git a/.gitignore b/.gitignore index c8a0d0c92..7212d2758 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ build/device/**/*.pyc epsilon.elf .vscode -.DS_Store \ No newline at end of file +.DS_Store +.gradle diff --git a/ion/src/simulator/android/.gradle/5.2.1/fileChanges/last-build.bin b/ion/src/simulator/android/.gradle/5.2.1/fileChanges/last-build.bin deleted file mode 100644 index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1 IcmZPo000310RR91 diff --git a/ion/src/simulator/android/.gradle/5.2.1/fileHashes/fileHashes.lock b/ion/src/simulator/android/.gradle/5.2.1/fileHashes/fileHashes.lock deleted file mode 100644 index bc5ad9eb016d04ae87770bca2d8c9df2933ac4c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 TcmZSny6MP|^HaC8GC%