github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

swapped PM3OTHER -> PM3GENERIC, while keeping PM3OTHER functionalitwise for backwards compat.

Browse source
This commit is contained in:
iceman1001 2021-01-14 14:23:00 +01:00
commit d7baee2f0c
6 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.platform.sample
View file

@ -2,7 +2,7 @@
# Run 'make PLATFORM=' to get an exhaustive list of possible parameters for this file. # Run 'make PLATFORM=' to get an exhaustive list of possible parameters for this file.
PLATFORM=PM3RDV4 PLATFORM=PM3RDV4
#PLATFORM=PM3OTHER #PLATFORM=PM3GENERIC
# If you want more than one PLATFORM_EXTRAS option, separate them by spaces: # If you want more than one PLATFORM_EXTRAS option, separate them by spaces:
#PLATFORM_EXTRAS=BTADDON #PLATFORM_EXTRAS=BTADDON
#STANDALONE=HF_MSDSAL #STANDALONE=HF_MSDSAL

2
client/src/cmdhw.c
View file

@ -963,7 +963,7 @@ void pm3_version(bool verbose, bool oneliner) {
PrintAndLogEx(NORMAL, "\n [ " _YELLOW_("PROXMARK3") " ]"); PrintAndLogEx(NORMAL, "\n [ " _YELLOW_("PROXMARK3") " ]");
if (IfPm3Rdv4Fw() == false) { if (IfPm3Rdv4Fw() == false) {
PrintAndLogEx(NORMAL, " firmware.................. %s", _YELLOW_("PM3OTHER")); PrintAndLogEx(NORMAL, " firmware.................. %s", _YELLOW_("PM3GENERIC"));
if (IfPm3FpcUsartHost()) { if (IfPm3FpcUsartHost()) {
PrintAndLogEx(NORMAL, " FPC USART for BT add-on... %s", _GREEN_("present")); PrintAndLogEx(NORMAL, " FPC USART for BT add-on... %s", _GREEN_("present"));
} }

17
common_arm/Makefile.hal
View file

@ -17,15 +17,15 @@ Known definitions:
+============================================+ +============================================+
| PLATFORM | DESCRIPTION | | PLATFORM | DESCRIPTION |
+============================================+ +============================================+
| PM3RDV4 (def) | Proxmark3 rdv4 | | PM3RDV4 (def) | Proxmark3 RDV4 |
+--------------------------------------------+ +--------------------------------------------+
| PM3OTHER | Proxmark3 Generic target | | PM3GENERIC | Proxmark3 generic target |
+--------------------------------------------+ +--------------------------------------------+
+============================================+ +============================================+
| PLATFORM_EXTRAS | DESCRIPTION | | PLATFORM_EXTRAS | DESCRIPTION |
+============================================+ +============================================+
| BTADDON | Proxmark3 rdv4 BT add-on | | BTADDON | Proxmark3 RDV4 BT add-on |
+--------------------------------------------+ +--------------------------------------------+
endef endef
@ -33,10 +33,10 @@ endef
define HELP_DEFINITIONS define HELP_DEFINITIONS
Options to define platform, platform extras and/or standalone mode: Options to define platform, platform extras and/or standalone mode:
(1) Run make with your PLATFORM, PLATFORM_EXTRAS and/or STANDALONE choices as follows: (1) Run make with your PLATFORM, PLATFORM_EXTRAS and/or STANDALONE choices as follows:
make PLATFORM=PM3OTHER STANDALONE=$(HELP_EXAMPLE_STANDALONE) make PLATFORM=PM3GENERIC STANDALONE=$(HELP_EXAMPLE_STANDALONE)
(2) Save a file called Makefile.platform with contents, e.g.: (2) Save a file called Makefile.platform with contents, e.g.:
PLATFORM=PM3OTHER PLATFORM=PM3GENERIC
or if you have a Proxmark 3 RDV4 with the BT add-on: or if you have a Proxmark 3 RDV4 with the BT add-on:
PLATFORM=PM3RDV4 PLATFORM=PM3RDV4
@ -74,9 +74,12 @@ PLTNAME = Unknown Platform
ifeq ($(PLATFORM),PM3RDV4) ifeq ($(PLATFORM),PM3RDV4)
PLATFORM_DEFS = -DWITH_SMARTCARD -DWITH_FLASH -DRDV4 PLATFORM_DEFS = -DWITH_SMARTCARD -DWITH_FLASH -DRDV4
PLTNAME = Proxmark3 rdv4 PLTNAME = Proxmark3 RDV4
else ifeq ($(PLATFORM),PM3OTHER) else ifeq ($(PLATFORM),PM3OTHER)
PLTNAME = Proxmark3 Generic target PLTNAME = Proxmark3 generic target
else ifeq ($(PLATFORM),PM3GENERIC)
PLTNAME = Proxmark3 generic target
else else
$(error Invalid or empty PLATFORM: $(PLATFORM). $(KNOWN_DEFINITIONS)) $(error Invalid or empty PLATFORM: $(PLATFORM). $(KNOWN_DEFINITIONS))
endif endif

10
doc/md/Development/Maintainers.md
View file

@ -34,17 +34,17 @@ E.g. you might need to move the documentation elsewhere according to your distro
make install PREFIX=/usr INSTALLDOCSRELPATH=share/doc/proxmark3-${version} make install PREFIX=/usr INSTALLDOCSRELPATH=share/doc/proxmark3-${version}
``` ```
It's possible to add other firmwares as well with tagged names (`FWTAG=<mytag>`), e.g. here we're compiling another image for non-RDV4 devices: It's possible to add other firmwares as well with tagged names (`FWTAG=<mytag>`), e.g. here we're compiling another image for generic Proxmark3 devices:
``` ```
make -j fullimage PLATFORM=PM3OTHER PLATFORM_EXTRAS= make -j fullimage PLATFORM=PM3GENERIC PLATFORM_EXTRAS=
make fullimage/install PLATFORM=PM3OTHER PLATFORM_EXTRAS= DESTDIR=build PREFIX=/usr FWTAG=other make fullimage/install PLATFORM=PM3GENERIC PLATFORM_EXTRAS= DESTDIR=build PREFIX=/usr FWTAG=generic
``` ```
and it will be added along the other firmware as: and it will be added along the other firmwares as:
``` ```
./build/usr/share/proxmark3/firmware/fullimage-other.elf ./build/usr/share/proxmark3/firmware/fullimage-generic.elf
``` ```
For verbose usage and see the actual commands being executed, add `V=1`. For verbose usage and see the actual commands being executed, add `V=1`.

2
doc/md/Development/Makefile-vs-CMake.md
View file

@ -91,7 +91,7 @@ At the moment both are maintained because they don't perfectly overlap yet.
| Feature | Makefile | Remarks | | Feature | Makefile | Remarks |
|-----|---|---| |-----|---|---|
| Platform choice | `PLATFORM=` | values: `PM3RDV4`, `PM3OTHER` | | Platform choice | `PLATFORM=` | values: `PM3RDV4`, `PM3GENERIC` |
| Platform size | `PLATFORM_SIZE=` | values: `256`, `512` | | Platform size | `PLATFORM_SIZE=` | values: `256`, `512` |
| Platform extras | `PLATFORM_EXTRAS=` | values: `BTADDON`, `FPC_USART_DEV` | | Platform extras | `PLATFORM_EXTRAS=` | values: `BTADDON`, `FPC_USART_DEV` |
| Skip LF/HF techs in the firmware | `SKIP_`*`=1` | see `common_arm/Makefile.hal` for a list | | Skip LF/HF techs in the firmware | `SKIP_`*`=1` | see `common_arm/Makefile.hal` for a list |

12
doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md
View file

@ -29,8 +29,8 @@ make SKIPBT=1
## Firmware ## Firmware
By default, the firmware is of course tuned for the Proxmark3 Rdv4.0 device, which has built-in support for 256kb onboard flash SPI memory, Sim module (smart card support), FPC connector. By default, the firmware is of course tuned for the Proxmark3 RDV4 device, which has built-in support for 256kb onboard flash SPI memory, Sim module (smart card support), FPC connector.
These features make it very different from all other devices, there is non other like this one. These features make it very different from all other Proxmark3 devices, there is non other like this one.
**Recommendation**: if you don't have a RDV4, we strongly recommend your device to have at least a 512kb arm chip, since this repo is crossing 256kb limit. There is still a way to skip parts to make it fit on a 256kb device, see below. **Recommendation**: if you don't have a RDV4, we strongly recommend your device to have at least a 512kb arm chip, since this repo is crossing 256kb limit. There is still a way to skip parts to make it fit on a 256kb device, see below.
@ -43,8 +43,8 @@ Here are the supported values you can assign to `PLATFORM` in `Makefile.platform
| PLATFORM | DESCRIPTION | | PLATFORM | DESCRIPTION |
|-----------------|--------------------------| |-----------------|--------------------------|
| PM3RDV4 (def) | Proxmark3 rdv4 | | PM3RDV4 (def) | Proxmark3 RDV4 |
| PM3OTHER | Proxmark3 generic target | | PM3GENERIC | Proxmark3 generic target |
By default `PLATFORM=PM3RDV4`. By default `PLATFORM=PM3RDV4`.
@ -103,7 +103,7 @@ By default `STANDALONE=HF_MSDSAL`.
If you own a Proxmark3 Easy with only 256kb, you can use a few definitions to help you getting a smaller firmware. If you own a Proxmark3 Easy with only 256kb, you can use a few definitions to help you getting a smaller firmware.
First thing is of course to use the `PLATFORM=PM3OTHER`. 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. 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 proxmark3_recovery.bin
@ -133,7 +133,7 @@ a series of `SKIP_*` allow to skip some of the functionalities and to get a smal
So for example, at the time of writing, this is a valid `Makefile.platform` compiling an image for 256k: So for example, at the time of writing, this is a valid `Makefile.platform` compiling an image for 256k:
``` ```
PLATFORM=PM3OTHER PLATFORM=PM3GENERIC
PLATFORM_SIZE=256 PLATFORM_SIZE=256
STANDALONE= STANDALONE=
SKIP_HITAG=1 SKIP_HITAG=1