diff --git a/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md b/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md index c871e6d46..84e8cbf3c 100644 --- a/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md +++ b/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md @@ -171,7 +171,7 @@ If you own a Proxmark3 Easy with only 256KB, you can use a few definitions to he First thing is of course to use the `PLATFORM=PM3GENERIC`. Adding `PLATFORM_SIZE=256` will provoke an error during compilation of the recovery image if your image is too big, so you can detect the problem before trying to flash the Proxmark3, e.g. ``` -[=] GEN proxmark3_recovery.bin +[=] GEN recovery.bin !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ERROR: Firmware image too large for your platform! 262768 > 262144 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/doc/path_notes.md b/doc/path_notes.md index 2dbe03661..ae1c9c9d4 100644 --- a/doc/path_notes.md +++ b/doc/path_notes.md @@ -63,7 +63,7 @@ The recovery / firmware files will be copied to /usr/local/share/proxmark3/firmware ``` -* Proxmark3 firmware: `bootrom.elf`, `fullimage.elf`, `proxmark3_recovery.bin` (used for JTAG) +* Proxmark3 firmware: `bootrom.elf`, `fullimage.elf`, `recovery.bin` (used for JTAG) * SIM firmware: `sim014.bin`, `sim014.sha512.txt` diff --git a/recovery/Makefile b/recovery/Makefile index e18e66c06..8e39ef6ab 100644 --- a/recovery/Makefile +++ b/recovery/Makefile @@ -1,6 +1,6 @@ include ../common_arm/Makefile.common -INSTALLFW = proxmark3_recovery.bin +INSTALLFW = recovery.bin ifneq (,$(FWTAG)) INSTALLFWTAG = $(notdir $(INSTALLFW:%.bin=%-$(FWTAG).bin)) else @@ -24,13 +24,19 @@ all: $(BINS) bootrom.bin: ../bootrom/obj/bootrom.elf $(info [=] GEN $@) - $(Q)$(CROSS_OBJCOPY) --gap-fill=0xff --pad-to 0x00102000 -O binary $^ $@ +ifeq ($(PLATFORM),PM5) + $(info [=] GENA $@) + $(Q)$(CROSS_OBJCOPY) --gap-fill=0xff --pad-to 0x08004000 -O binary $^ $@ +else: + $(info [=] GENB $@) + $(Q)$(CROSS_OBJCOPY) --gap-fill=0xff --pad-to 0x00104000 -O binary $^ $@ +endif fullimage.bin: ../armsrc/obj/fullimage.elf $(info [=] GEN $@) $(Q)$(CROSS_OBJCOPY) --gap-fill=0xff -O binary $^ $@ -proxmark3_recovery.bin: bootrom.bin fullimage.bin +recovery.bin: bootrom.bin fullimage.bin $(info [=] GEN $@) $(Q)cat bootrom.bin fullimage.bin > $@ diff --git a/tools/jtag_openocd/openocd_configuration.sample b/tools/jtag_openocd/openocd_configuration.sample index 2468bab76..2fc6a82e3 100644 --- a/tools/jtag_openocd/openocd_configuration.sample +++ b/tools/jtag_openocd/openocd_configuration.sample @@ -1,6 +1,6 @@ CONFIG_GEN=general.cfg CONFIG_BOARD=board-at91sam7s.cfg -IMAGE=../../recovery/proxmark3_recovery.bin +IMAGE=../../recovery/recovery.bin DUMP="dump_$(date +'%Y%m%d-%H%M%S').bin" # One can use openocd-provided interfaces or local interface files diff --git a/tools/pm3_tests.sh b/tools/pm3_tests.sh index 170abb922..16bd3719b 100755 --- a/tools/pm3_tests.sh +++ b/tools/pm3_tests.sh @@ -311,7 +311,7 @@ while true; do fi if $TESTALL || $TESTRECOVERY; then echo -e "\n${C_BLUE}Testing recovery:${C_NC}" - if ! CheckFileExist "recovery image exists" "./recovery/proxmark3_recovery.bin"; then break; fi + if ! CheckFileExist "recovery image exists" "./recovery/recovery.bin"; then break; fi fi if $TESTALL || $TESTFPGACOMPRESS; then