FIX: coverity scan error CID 121781, unused value. error 0x88 will be overritten...

[proxmark3-svn] / Makefile

diff --git a/Makefile b/Makefile
index b558da2d74a5dfcdbadd47d3bb37a89ae3eb7b47..4d55d22b5e5573f4231dc70e0867fe96c5ea2a0c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
 include common/Makefile.common
 
 include common/Makefile.common
 

-GZIP=gzip

 FLASH_PORT=/dev/ttyACM0
 
 FLASH_PORT=/dev/ttyACM0
 

-all clean: %: bootrom/% armsrc/% client/% recovery/%
+all clean: %: client/% bootrom/% armsrc/% recovery/%

 
 bootrom/%: FORCE
        $(MAKE) -C bootrom $(patsubst bootrom/%,%,$@)
 
 bootrom/%: FORCE
        $(MAKE) -C bootrom $(patsubst bootrom/%,%,$@)


@@ -15,18 +14,16 @@ recovery/%: FORCE
        $(MAKE) -C recovery $(patsubst recovery/%,%,$@)
 FORCE: # Dummy target to force remake in the subdirectories, even if files exist (this Makefile doesn't know about the prerequisites)
 
        $(MAKE) -C recovery $(patsubst recovery/%,%,$@)
 FORCE: # Dummy target to force remake in the subdirectories, even if files exist (this Makefile doesn't know about the prerequisites)
 

+.PHONY: all clean help _test flash-bootrom flash-os flash-all FORCE

 
 

-.PHONY: all clean help _test flash-bootrom flash-os flash-fpga flash-both flash-all FORCE

 help:
        @echo Multi-OS Makefile, you are running on $(DETECTED_OS)
        @echo Possible targets:
        @echo + all           - Make bootrom, armsrc and the OS-specific host directory
        @echo + client        - Make only the OS-specific host directory
        @echo + flash-bootrom - Make bootrom and flash it
 help:
        @echo Multi-OS Makefile, you are running on $(DETECTED_OS)
        @echo Possible targets:
        @echo + all           - Make bootrom, armsrc and the OS-specific host directory
        @echo + client        - Make only the OS-specific host directory
        @echo + flash-bootrom - Make bootrom and flash it

-       @echo + flash-os      - Make armsrc and flash os (includes fpga)
-       @echo + flash-fpga    - (Deprecated:) Make armsrc and flash fpga
-       @echo + flash-both    - Make armsrc and flash os and fpga image
-       @echo + flash-all     - Make bootrom and armsrc and flash bootrom, os and fpga image
+       @echo + flash-os      - Make armsrc and flash os \(includes fpga\)
+       @echo + flash-all     - Make bootrom and armsrc and flash bootrom and os image

        @echo + clean         - Clean in bootrom, armsrc and the OS-specific host directory
 
 client: client/all
        @echo + clean         - Clean in bootrom, armsrc and the OS-specific host directory
 
 client: client/all


@@ -34,16 +31,10 @@ client: client/all
 flash-bootrom: bootrom/obj/bootrom.elf $(FLASH_TOOL)
        $(FLASH_TOOL) $(FLASH_PORT) -b $(subst /,$(PATHSEP),$<)
 
 flash-bootrom: bootrom/obj/bootrom.elf $(FLASH_TOOL)
        $(FLASH_TOOL) $(FLASH_PORT) -b $(subst /,$(PATHSEP),$<)
 

-flash-os: armsrc/obj/osimage.elf $(FLASH_TOOL)
+flash-os: armsrc/obj/fullimage.elf $(FLASH_TOOL)

        $(FLASH_TOOL) $(FLASH_PORT) $(subst /,$(PATHSEP),$<)
 
        $(FLASH_TOOL) $(FLASH_PORT) $(subst /,$(PATHSEP),$<)
 

-#flash-fpga: armsrc/obj/fpgaimage.elf $(FLASH_TOOL)
-#      $(FLASH_TOOL) $(FLASH_PORT) $(subst /,$(PATHSEP),$<)
-
-flash-both: armsrc/obj/osimage.elf $(FLASH_TOOL)
-       $(FLASH_TOOL) $(FLASH_PORT) $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
-
-flash-all: bootrom/obj/bootrom.elf armsrc/obj/osimage.elf $(FLASH_TOOL)
+flash-all: bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf $(FLASH_TOOL)

        $(FLASH_TOOL) $(FLASH_PORT) -b $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
 
 newtarbin:
        $(FLASH_TOOL) $(FLASH_PORT) -b $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
 
 newtarbin:


@@ -53,5 +44,9 @@ newtarbin:
 tarbin: newtarbin client/tarbin armsrc/tarbin bootrom/tarbin
        $(GZIP) proxmark3-$(platform)-bin.tar
 
 tarbin: newtarbin client/tarbin armsrc/tarbin bootrom/tarbin
        $(GZIP) proxmark3-$(platform)-bin.tar
 

+udev:
+       sudo cp -rf driver/77-mm-usb-device-blacklist.rules /etc/udev/rules.d/77-mm-usb-device-blacklist.rules
+       sudo udevadm control --reload-rules
+ 

 # Dummy target to test for GNU make availability
 _test:
 # Dummy target to test for GNU make availability
 _test: