From d59026518e02c37ab0673a670b9ea14e17ae399c Mon Sep 17 00:00:00 2001 From: Iceman Date: Mon, 29 May 2017 09:39:25 +0200 Subject: [PATCH 1/2] FIX: fullimage.s19 According to @doegox the *.s19 file is generated with wrong offset for the data section. ref: http://wiki.yobi.be/wiki/Proxmark#Flashing_full_image.2C_take_1 --- common/Makefile.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/Makefile.common b/common/Makefile.common index 95820e667..e697ae140 100644 --- a/common/Makefile.common +++ b/common/Makefile.common @@ -99,7 +99,7 @@ $(VERSIONOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES) # See ldscript.common. -- Henryk Plötz 2009-08-27 OBJCOPY_TRANSLATIONS = --no-change-warnings \ --change-addresses -0x100000 --change-start 0 \ - --change-section-address .bss+0 --change-section-address .data+0 \ + --change-section-address .bss+0 --change-section-address .data-0x100000 \ --change-section-address .commonarea+0 $(OBJDIR)/%.s19: $(OBJDIR)/%.elf $(OBJCOPY) -Osrec --srec-forceS3 --strip-debug $(OBJCOPY_TRANSLATIONS) $^ $@ From 9f3d7bbe29ea114ea7b47279a9bb6a43bc606b17 Mon Sep 17 00:00:00 2001 From: Iceman Date: Mon, 29 May 2017 09:49:02 +0200 Subject: [PATCH 2/2] Update hfsnoop.c Fix increment on bool variable (#294) (thanks to @ikarus23) https://github.com/Proxmark/proxmark3/commit/c87c452120aa30e0db9ca8046f00def677365ae6 --- armsrc/hfsnoop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c index 4af8522a5..7f641529a 100644 --- a/armsrc/hfsnoop.c +++ b/armsrc/hfsnoop.c @@ -31,7 +31,7 @@ void HfSnoop(int samplesToSkip, int triggersToSkip) BigBuf_free(); BigBuf_Clear(); Dbprintf("Skipping first %d sample pairs, Skipping %d triggers.\n", samplesToSkip, triggersToSkip); - bool trigger_cnt; + int trigger_cnt; LED_D_ON(); // Select correct configs