RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-18 03:00:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

Add option -i to flasher to query Pm3 for its memory size, and some doc tuning

Browse source
This commit is contained in:
Philippe Teuwen 2019-07-19 13:02:12 +02:00
parent 44278272a4
commit f6f14f82d4
2 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -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... 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] ## [unreleased][unreleased]
- Add option -i to flasher to query Pm3 for its memory size (@doegox)
- Add support for flashing 512K units (@slurdge) - Add support for flashing 512K units (@slurdge)
- Add a simple python tool to check the elf sizes (@slurdge) - Add a simple python tool to check the elf sizes (@slurdge)
- Change: new keys for Vigik badges in default_keys.dict (@luminouw) - Change: new keys for Vigik badges in default_keys.dict (@luminouw)

58
client/flasher.c
View file

@ -24,15 +24,20 @@
#define ONE_KB 1024 #define ONE_KB 1024
static void usage(char *argv0) { static void usage(char *argv0) {
PrintAndLogEx(NORMAL, "Usage: %s <port> [-b] image.elf [image.elf...]\n", argv0); PrintAndLogEx(NORMAL, "Usage: %s <port> [-b] image.elf [image.elf...]", argv0);
PrintAndLogEx(NORMAL, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n"); PrintAndLogEx(NORMAL, " %s <port> -i\n", argv0);
PrintAndLogEx(NORMAL, "\nExample:\n\n\t %s "SERIAL_PORT_EXAMPLE_H" armsrc/obj/fullimage.elf", argv0); PrintAndLogEx(NORMAL, "\t-b\tEnable flashing of bootloader area (DANGEROUS)");
PrintAndLogEx(NORMAL, "\t-i\tProbe the connected Proxmark3 to retrieve its memory size");
PrintAndLogEx(NORMAL, "\nExamples:\n\t %s "SERIAL_PORT_EXAMPLE_H" -i", argv0);
PrintAndLogEx(NORMAL, "\t %s "SERIAL_PORT_EXAMPLE_H" armsrc/obj/fullimage.elf", argv0);
#ifdef __linux__ #ifdef __linux__
PrintAndLogEx(NORMAL, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark3 to reappear on <DEVICE>',"); PrintAndLogEx(NORMAL, "\nNote (Linux):\nif the flasher gets stuck in 'Waiting for Proxmark3 to reappear on <DEVICE>',");
PrintAndLogEx(NORMAL, " you need to blacklist Proxmark3 for modem-manager - see wiki for more details:\n"); PrintAndLogEx(NORMAL, "you need to blacklist Proxmark3 for modem-manager - see documentation for more details:");
PrintAndLogEx(NORMAL, " https://github.com/Proxmark/proxmark3/wiki/Gentoo Linux\n"); PrintAndLogEx(NORMAL, "* https://github.com/RfidResearchGroup/proxmark3/blob/master/doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md");
PrintAndLogEx(NORMAL, " https://github.com/Proxmark/proxmark3/wiki/Ubuntu Linux\n"); PrintAndLogEx(NORMAL, "\nMore info on flashing procedure from the official Proxmark3 wiki:");
PrintAndLogEx(NORMAL, " https://github.com/Proxmark/proxmark3/wiki/OSX\n"); PrintAndLogEx(NORMAL, "* https://github.com/Proxmark/proxmark3/wiki/Gentoo%%20Linux");
PrintAndLogEx(NORMAL, "* https://github.com/Proxmark/proxmark3/wiki/Ubuntu%%20Linux");
PrintAndLogEx(NORMAL, "* https://github.com/Proxmark/proxmark3/wiki/OSX\n");
#endif #endif
} }
@ -78,7 +83,7 @@ int main(int argc, char **argv) {
int res; int res;
flash_file_t files[MAX_FILES]; flash_file_t files[MAX_FILES];
char * filenames[MAX_FILES]; char * filenames[MAX_FILES];
bool info = false;
memset(files, 0, sizeof(files)); memset(files, 0, sizeof(files));
session.supports_colors = false; session.supports_colors = false;
@ -99,6 +104,8 @@ int main(int argc, char **argv) {
if (argv[i][0] == '-') { if (argv[i][0] == '-') {
if (!strcmp(argv[i], "-b")) { if (!strcmp(argv[i], "-b")) {
can_write_bl = 1; can_write_bl = 1;
} else if (!strcmp(argv[i], "-i")) {
info = true;
} else { } else {
usage(argv[0]); usage(argv[0]);
return -1; return -1;
@ -133,24 +140,25 @@ int main(int argc, char **argv) {
mem_avail = 256; //we default to a low value mem_avail = 256; //we default to a low value
} }
for (int i = 0 ; i < num_files; ++i){ if (! info) {
res = flash_load(&files[i], filenames[i], can_write_bl, mem_avail*ONE_KB); for (int i = 0 ; i < num_files; ++i){
if (res < 0) res = flash_load(&files[i], filenames[i], can_write_bl, mem_avail*ONE_KB);
return -1; if (res < 0)
return -1;
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
}
PrintAndLogEx(SUCCESS, "\n" _BLUE_("Flashing..."));
for (int i = 0; i < num_files; i++) {
res = flash_write(&files[i]);
if (res < 0)
return -1;
flash_free(&files[i]);
PrintAndLogEx(NORMAL, "\n");
}
} }
PrintAndLogEx(SUCCESS, "\n" _BLUE_("Flashing..."));
for (int i = 0; i < num_files; i++) {
res = flash_write(&files[i]);
if (res < 0)
return -1;
flash_free(&files[i]);
PrintAndLogEx(NORMAL, "\n");
}
res = flash_stop_flashing(); res = flash_stop_flashing();
if (res < 0) if (res < 0)
return -1; return -1;