add l/h option to hw tune and optimize order of tuning

[proxmark3-svn] / Makefile

diff --git a/Makefile b/Makefile
index 4b1016c4429a261a784e2869f7f26d80f73547f6..bafd816102dc3cd1156edc8a54e4cfb5046a149a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 include common/Makefile.common
 
-GZIP=gzip
+FLASH_PORT=/dev/ttyACM0
 
-all clean: %: bootrom/% armsrc/% client/%
+all clean: %: client/% bootrom/% armsrc/% recovery/%
 
 bootrom/%: FORCE
        $(MAKE) -C bootrom $(patsubst bootrom/%,%,$@)
@@ -10,38 +10,32 @@ armsrc/%: FORCE
        $(MAKE) -C armsrc $(patsubst armsrc/%,%,$@)
 client/%: FORCE
        $(MAKE) -C client $(patsubst client/%,%,$@)
+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)
 
+.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
-       @echo + flash-os      - Make armsrc and flash os
-       @echo + flash-fpga    - 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
 
 flash-bootrom: bootrom/obj/bootrom.elf $(FLASH_TOOL)
-       $(FLASH_TOOL) -b $(subst /,$(PATHSEP),$<)
+       $(FLASH_TOOL) $(FLASH_PORT) -b $(subst /,$(PATHSEP),$<)
 
-flash-os: armsrc/obj/osimage.elf $(FLASH_TOOL)
-       $(FLASH_TOOL) $(subst /,$(PATHSEP),$<)
+flash-os: armsrc/obj/fullimage.elf $(FLASH_TOOL)
+       $(FLASH_TOOL) $(FLASH_PORT) $(subst /,$(PATHSEP),$<)
 
-flash-fpga: armsrc/obj/fpgaimage.elf $(FLASH_TOOL)
-       $(FLASH_TOOL) $(subst /,$(PATHSEP),$<)
-
-flash-both: armsrc/obj/osimage.elf armsrc/obj/fpgaimage.elf $(FLASH_TOOL)
-       $(FLASH_TOOL) $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
-
-flash-all: bootrom/obj/bootrom.elf armsrc/obj/osimage.elf armsrc/obj/fpgaimage.elf $(FLASH_TOOL)
-       $(FLASH_TOOL) -b $(subst /,$(PATHSEP),$(filter-out $(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:
        $(DELETE) proxmark3-$(platform)-bin.tar proxmark3-$(platform)-bin.tar.gz