X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/db335b3de0cbe71cabe37931aa085cffa0032239..7142c87e1fcff2fbf442fc8eab3d52adda7098b7:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 2c95cc14..b558da2d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,57 @@
 include common/Makefile.common
 
-ifeq ($(DETECTED_OS),Linux)
-HOST_BINARY=linux
-else
-HOST_BINARY=winsrc
-endif
-
-all clean: %:
-	$(MAKE) -C bootrom $@
-	$(MAKE) -C armsrc $@
-	$(MAKE) -C $(HOST_BINARY) $@
-
-.PHONY: all clean help
+GZIP=gzip
+FLASH_PORT=/dev/ttyACM0
+
+all clean: %: bootrom/% armsrc/% client/% recovery/%
+
+bootrom/%: FORCE
+	$(MAKE) -C bootrom $(patsubst bootrom/%,%,$@)
+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-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 +	clean - Clean in bootrom, armsrc and the OS-specific host directory
-	
\ No newline at end of file
+	@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 +	clean         - Clean in bootrom, armsrc and the OS-specific host directory
+
+client: client/all
+
+flash-bootrom: bootrom/obj/bootrom.elf $(FLASH_TOOL)
+	$(FLASH_TOOL) $(FLASH_PORT) -b $(subst /,$(PATHSEP),$<)
+
+flash-os: armsrc/obj/osimage.elf $(FLASH_TOOL)
+	$(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_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: