Fix issue #103 (hopefully). Quite an old bug which was previously

[proxmark3-svn] / Makefile

diff --git a/Makefile b/Makefile
index 287dc0418101e88f00fa87c0d9ada7d68b04ed1c..b558da2d74a5dfcdbadd47d3bb37a89ae3eb7b47 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,46 +1,57 @@
 include common/Makefile.common
 
 include common/Makefile.common
 

-ifeq ($(DETECTED_OS),Linux)
-HOST_BINARY=linux
-else
-HOST_BINARY=winsrc
-endif
+GZIP=gzip
+FLASH_PORT=/dev/ttyACM0

 
 

-all clean: %: bootrom/% armsrc/% $(HOST_BINARY)/%
+all clean: %: bootrom/% armsrc/% client/% recovery/%

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

-linux/%: FORCE
-       $(MAKE) -C linux $(patsubst linux/%,%,$@)
-winsrc/%: FORCE
-       $(MAKE) -C winsrc $(patsubst winsrc/%,%,$@)
+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)
 
 
 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-both 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
 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-bootrom - Make bootrom and flash it

-       @echo + flash-os      - Make armsrc and flash os
+       @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 + clean         - Clean in bootrom, armsrc and the OS-specific host directory
 
        @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 + clean         - Clean in bootrom, armsrc and the OS-specific host directory
 

-flash-bootrom: bootrom/obj/bootrom.s19 $(FLASH_TOOL)
-       $(FLASH_TOOL) bootrom $(subst /,$(PATHSEP),$<)
+client: client/all

 
 

-flash-os: armsrc/obj/osimage.s19 $(FLASH_TOOL)
-       $(FLASH_TOOL) os $(subst /,$(PATHSEP),$<)
+flash-bootrom: bootrom/obj/bootrom.elf $(FLASH_TOOL)
+       $(FLASH_TOOL) $(FLASH_PORT) -b $(subst /,$(PATHSEP),$<)

 
 

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

 
 

-flash-all: bootrom/obj/bootrom.s19 armsrc/obj/osimage.s19 armsrc/obj/fpgaimage.s19 $(FLASH_TOOL)
-       $(FLASH_TOOL) bootrom,os,fpga $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
+#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_TOOL) $(FLASH_PORT) -b $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
+
+newtarbin:
+       $(DELETE) proxmark3-$(platform)-bin.tar proxmark3-$(platform)-bin.tar.gz
+       @touch proxmark3-$(platform)-bin.tar
+
+tarbin: newtarbin client/tarbin armsrc/tarbin bootrom/tarbin
+       $(GZIP) proxmark3-$(platform)-bin.tar

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