X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/52b3d184ce098c773c8faaa8d91ba1eeb37b0a1f..f68211671cf3230b3ddbe948f3802418ee03d378:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 458ad7ab..0e065b41 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,48 @@
 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 _test
+FLASH_PORT=/dev/ttyACM0
+
+all clean: %: client/% bootrom/% armsrc/% 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-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
+	@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-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) $(FLASH_PORT) -b $(subst /,$(PATHSEP),$<)
+
+flash-os: armsrc/obj/fullimage.elf $(FLASH_TOOL)
+	$(FLASH_TOOL) $(FLASH_PORT) $(subst /,$(PATHSEP),$<)
+
+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
+	@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: