From 1a459d644de3e7f701bb6adf06fb549561b54953 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Mon, 9 Sep 2019 01:54:59 +0200 Subject: [PATCH] fix flasher doc --- CHANGELOG.md | 1 + ...OS-X-Homebrew-Installation-Instructions.md | 6 ++--- .../ModemManager-Must-Be-Discarded.md | 2 +- .../Troubleshooting.md | 23 +++++++++---------- .../Windows-Installation-Instructions.md | 8 +++---- .../0_Compilation-Instructions.md | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cb0e5c1d..2099db5fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] + - Chg proxmark3-flasher is now merged into proxmark3 client. Add pm3-flash (@doegox) - Chg `hf iclass clone\dump\rdbl\wrbl` - now uses NG (@iceman1001) - Fix `hf iclass clone` - last block always fails (@iceman1001) - Chg `hf iclass clone` - retries ten times, less output (honor verbose) (@iceman1001) diff --git a/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md b/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md index 6d6a1c48a..85fb7f98f 100644 --- a/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md +++ b/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md @@ -40,7 +40,7 @@ pm3-flash-all If port detection failed, you'll have to call the flasher manually and specify the correct port: ```sh -pm3-flash /dev/tty.usbmodemiceman1 -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf +proxmark3 /dev/tty.usbmodemiceman1 --flash --unlock-bootloader --image /usr/local/share/proxmark3/firmware/bootrom.elf --image /usr/local/share/proxmark3/firmware/fullimage.elf ``` > Depending on the firmware version your Proxmark3 can also appear as `/dev/tty.usbmodem881`. @@ -99,13 +99,13 @@ pm3-flash-all If port detection failed, you'll have to call the flasher manually and specify the correct port: ```sh -pm3-flash /dev/tty.usbmodemiceman1 -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf +proxmark3 /dev/tty.usbmodemiceman1 --flash --unlock-bootloader --image /usr/local/share/proxmark3/firmware/bootrom.elf --image /usr/local/share/proxmark3/firmware/fullimage.elf ``` or from the local repo ```sh -client/pm3-flash /dev/tty.usbmodemiceman1 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf +client/proxmark3 /dev/tty.usbmodemiceman1 --flash --unlock-bootloader --image bootrom/obj/bootrom.elf --image armsrc/obj/fullimage.elf ``` Similarly, to run the client, you may try: diff --git a/doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md b/doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md index 7303bdb4b..23ae480cc 100644 --- a/doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md +++ b/doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md @@ -121,7 +121,7 @@ In short: * unplug device * press button and keep it pressed (IMPORTANT) * plug in device -* run flash command `pm3-flash /dev/ttyACM0 /usr/local/share/proxmark3/firmware/fullimage.elf` +* run flash command `pm3-flash-fullimage` * wait until flash is finished * release button * un/plug device diff --git a/doc/md/Installation_Instructions/Troubleshooting.md b/doc/md/Installation_Instructions/Troubleshooting.md index b7898fb97..e0cf7f7aa 100644 --- a/doc/md/Installation_Instructions/Troubleshooting.md +++ b/doc/md/Installation_Instructions/Troubleshooting.md @@ -6,7 +6,7 @@ Always use the latest repository commits from *master* branch. There are always ## Table of Contents - * [pm3 or pm3-flash-* doesn't see my Proxmark](#pm3-or-pm3-flash-doesnt-see-my-proxmark) + * [pm3 or pm3-flash* doesn't see my Proxmark](#pm3-or-pm3-flash-doesnt-see-my-proxmark) * [My Proxmark3 seems bricked](#my-proxmark3-seems-bricked) * [Maybe just a false alarm?](#maybe-just-a-false-alarm) * [Find out why it would be bricked](#find-out-why-it-would-be-bricked) @@ -18,12 +18,11 @@ Always use the latest repository commits from *master* branch. There are always * [File not found](#file-not-found) * [pixmap / pixbuf warnings](#pixmap--pixbuf-warnings) -## `pm3` or `pm3-flash-*` doesn't see my Proxmark +## `pm3` or `pm3-flash*` doesn't see my Proxmark -Try using directly the client or flasher: +Try using directly the client: ``` -client/pm3-flash ... client/proxmark3 ... ``` @@ -49,8 +48,8 @@ pm3-flash-fullimage ``` or ``` -pm3-flash -b bootrom/obj/bootrom.elf -pm3-flash armsrc/obj/fullimage.elf +proxmark3 --flash --unlock-bootloader --image bootrom/obj/bootrom.elf +proxmark3 --flash --image armsrc/obj/fullimage.elf ``` ### Find out why it would be bricked @@ -71,7 +70,7 @@ pm3-flash-fullimage ``` or ``` -pm3-flash armsrc/obj/fullimage.elf +proxmark3 --flash --image armsrc/obj/fullimage.elf ``` You should be back on tracks now. In case the flasher complains about bootloader version, you can follow the button procedure and flash first your bootloader. @@ -81,7 +80,7 @@ pm3-flash-bootrom ``` or ``` -pm3-flash -b bootrom/obj/bootrom.elf +proxmark3 --flash --unlock-bootloader --image bootrom/obj/bootrom.elf ``` ### Ok, my bootloader is definitively dead, now what? @@ -119,9 +118,9 @@ proxmark3 and you must adapt accordingly the file path of some commands, e.g. ``` -pm3-flash /usr/local/share/proxmark3/firmware/fullimage.elf +proxmark3 --flash --image /usr/local/share/proxmark3/firmware/fullimage.elf <> -pm3-flash /usr/share/proxmark3/firmware/fullimage.elf +proxmark3 --flash --image /usr/share/proxmark3/firmware/fullimage.elf pm3 --> sc upgrade f /usr/local/share/proxmark3/firmware/sim011.bin <> @@ -144,9 +143,9 @@ cd client; ./proxmark3 ... Therefore client commands referring to files of the repo must be adapted, e.g. ``` -client/pm3-flash armsrc/obj/fullimage.elf +client/proxmark3 --flash --image armsrc/obj/fullimage.elf <> -./pm3-flash ../armsrc/obj/fullimage.elf +./proxmark3 --flash --image ../armsrc/obj/fullimage.elf pm3 --> sc upgrade f tools/simmodule/sim011.bin <> diff --git a/doc/md/Installation_Instructions/Windows-Installation-Instructions.md b/doc/md/Installation_Instructions/Windows-Installation-Instructions.md index 4f6bf99e8..303a87d1e 100644 --- a/doc/md/Installation_Instructions/Windows-Installation-Instructions.md +++ b/doc/md/Installation_Instructions/Windows-Installation-Instructions.md @@ -65,13 +65,13 @@ pm3-flash-all If COM port detection failed, you'll have to call the flasher manually and specify the correct port: ```sh -pm3-flash comX -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf +proxmark3 comX --flash --unlock-bootloader --image /usr/local/share/proxmark3/firmware/bootrom.elf --image /usr/local/share/proxmark3/firmware/fullimage.elf ``` or from the local repo ```sh -client/pm3-flash comX -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf +client/proxmark3 comX --flash --unlock-bootloader --image bootrom/obj/bootrom.elf --image armsrc/obj/fullimage.elf ``` Similarly, to run the client, you may try: @@ -156,13 +156,13 @@ pm3-flash-all If port detection failed, you'll have to call the flasher manually and specify the correct port: ```sh -pm3-flash /dev/ttySX -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf +proxmark3 /dev/ttySX --flash --unlock-bootloader --image /usr/local/share/proxmark3/firmware/bootrom.elf --image /usr/local/share/proxmark3/firmware/fullimage.elf ``` or from the local repo ```sh -client/pm3-flash /dev/ttySX -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf +client/proxmark3 /dev/ttySX --flash --unlock-bootloader --image bootrom/obj/bootrom.elf --image armsrc/obj/fullimage.elf ``` Similarly, to run the client, you may try: diff --git a/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md b/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md index 7ec483d0c..dd2630f18 100644 --- a/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md +++ b/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md @@ -45,13 +45,13 @@ In most cases, you can run the script `pm3-flash-all` which try to auto-detect t For the other cases, specify the port by yourself. For example, for a Proxmark3 connected via USB under Linux: ```sh -pm3-flash /dev/ttyACM0 -b /usr/local/share/proxmark3/firmware/bootrom.elf /usr/local/share/proxmark3/firmware/fullimage.elf +proxmark3 /dev/ttyACM0 --flash --unlock-bootloader --image /usr/local/share/proxmark3/firmware/bootrom.elf --image /usr/local/share/proxmark3/firmware/fullimage.elf ``` or from the local repo ```sh -client/pm3-flash /dev/ttyACM0 -b bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf +client/proxmark3 /dev/ttyACM0 --flash --unlock-bootloader --image bootrom/obj/bootrom.elf --image armsrc/obj/fullimage.elf ``` ## Run the client