diff --git a/Makefile.platform.sample b/Makefile.platform.sample index 8a31a0e9c..4ecb3b9f6 100644 --- a/Makefile.platform.sample +++ b/Makefile.platform.sample @@ -2,7 +2,7 @@ # Run 'make PLATFORM=' to get an exhaustive list of possible parameters for this file. PLATFORM=PM3RDV4 -#PLATFORM=PM3OTHER +#PLATFORM=PM3GENERIC # If you want more than one PLATFORM_EXTRAS option, separate them by spaces: #PLATFORM_EXTRAS=BTADDON #STANDALONE=HF_MSDSAL diff --git a/client/src/cmdhw.c b/client/src/cmdhw.c index b97a4f773..5c61d2cf4 100644 --- a/client/src/cmdhw.c +++ b/client/src/cmdhw.c @@ -963,7 +963,7 @@ void pm3_version(bool verbose, bool oneliner) { PrintAndLogEx(NORMAL, "\n [ " _YELLOW_("PROXMARK3") " ]"); if (IfPm3Rdv4Fw() == false) { - PrintAndLogEx(NORMAL, " firmware.................. %s", _YELLOW_("PM3OTHER")); + PrintAndLogEx(NORMAL, " firmware.................. %s", _YELLOW_("PM3GENERIC")); if (IfPm3FpcUsartHost()) { PrintAndLogEx(NORMAL, " FPC USART for BT add-on... %s", _GREEN_("present")); } diff --git a/common_arm/Makefile.hal b/common_arm/Makefile.hal index bfbe56d34..d47bb3cf2 100644 --- a/common_arm/Makefile.hal +++ b/common_arm/Makefile.hal @@ -17,15 +17,15 @@ Known definitions: +============================================+ | PLATFORM | DESCRIPTION | +============================================+ -| PM3RDV4 (def) | Proxmark3 rdv4 | +| PM3RDV4 (def) | Proxmark3 RDV4 | +--------------------------------------------+ -| PM3OTHER | Proxmark3 Generic target | +| PM3GENERIC | Proxmark3 generic target | +--------------------------------------------+ +============================================+ | PLATFORM_EXTRAS | DESCRIPTION | +============================================+ -| BTADDON | Proxmark3 rdv4 BT add-on | +| BTADDON | Proxmark3 RDV4 BT add-on | +--------------------------------------------+ endef @@ -33,10 +33,10 @@ endef define HELP_DEFINITIONS Options to define platform, platform extras and/or standalone mode: (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.: -PLATFORM=PM3OTHER +PLATFORM=PM3GENERIC or if you have a Proxmark 3 RDV4 with the BT add-on: PLATFORM=PM3RDV4 @@ -74,9 +74,12 @@ PLTNAME = Unknown Platform ifeq ($(PLATFORM),PM3RDV4) PLATFORM_DEFS = -DWITH_SMARTCARD -DWITH_FLASH -DRDV4 - PLTNAME = Proxmark3 rdv4 + PLTNAME = Proxmark3 RDV4 else ifeq ($(PLATFORM),PM3OTHER) - PLTNAME = Proxmark3 Generic target + PLTNAME = Proxmark3 generic target +else ifeq ($(PLATFORM),PM3GENERIC) + PLTNAME = Proxmark3 generic target + else $(error Invalid or empty PLATFORM: $(PLATFORM). $(KNOWN_DEFINITIONS)) endif diff --git a/doc/md/Development/Maintainers.md b/doc/md/Development/Maintainers.md index 66c736235..9af92bf72 100644 --- a/doc/md/Development/Maintainers.md +++ b/doc/md/Development/Maintainers.md @@ -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} ``` -It's possible to add other firmwares as well with tagged names (`FWTAG=`), 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=`), e.g. here we're compiling another image for generic Proxmark3 devices: ``` -make -j fullimage PLATFORM=PM3OTHER PLATFORM_EXTRAS= -make fullimage/install PLATFORM=PM3OTHER PLATFORM_EXTRAS= DESTDIR=build PREFIX=/usr FWTAG=other +make -j fullimage PLATFORM=PM3GENERIC PLATFORM_EXTRAS= +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`. diff --git a/doc/md/Development/Makefile-vs-CMake.md b/doc/md/Development/Makefile-vs-CMake.md index 675ba0e96..a6a9c497a 100644 --- a/doc/md/Development/Makefile-vs-CMake.md +++ b/doc/md/Development/Makefile-vs-CMake.md @@ -91,7 +91,7 @@ At the moment both are maintained because they don't perfectly overlap yet. | Feature | Makefile | Remarks | |-----|---|---| -| Platform choice | `PLATFORM=` | values: `PM3RDV4`, `PM3OTHER` | +| Platform choice | `PLATFORM=` | values: `PM3RDV4`, `PM3GENERIC` | | Platform size | `PLATFORM_SIZE=` | values: `256`, `512` | | 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 | 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 61ad2d9d8..6dbe54d49 100644 --- a/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md +++ b/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md @@ -29,8 +29,8 @@ make SKIPBT=1 ## 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. -These features make it very different from all other devices, there is non other like this one. +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 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. @@ -43,8 +43,8 @@ Here are the supported values you can assign to `PLATFORM` in `Makefile.platform | PLATFORM | DESCRIPTION | |-----------------|--------------------------| -| PM3RDV4 (def) | Proxmark3 rdv4 | -| PM3OTHER | Proxmark3 generic target | +| PM3RDV4 (def) | Proxmark3 RDV4 | +| PM3GENERIC | Proxmark3 generic target | 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. -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. ``` [=] 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: ``` -PLATFORM=PM3OTHER +PLATFORM=PM3GENERIC PLATFORM_SIZE=256 STANDALONE= SKIP_HITAG=1