ADD: found a BCARD KeyB on the net. ref: http://irq5.io/2013/04/13/decoding-bcard...

[proxmark3-svn] / Makefile

diff --git a/Makefile b/Makefile
index c5deed956b0730f3f8501548777b52c505687eb2..b558da2d74a5dfcdbadd47d3bb37a89ae3eb7b47 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 include common/Makefile.common
 
 GZIP=gzip
 include common/Makefile.common
 
 GZIP=gzip

+FLASH_PORT=/dev/ttyACM0

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


@@ -22,8 +23,8 @@ help:
        @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 + 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-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


@@ -31,19 +32,19 @@ help:
 client: client/all
 
 flash-bootrom: bootrom/obj/bootrom.elf $(FLASH_TOOL)
 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-os: armsrc/obj/osimage.elf $(FLASH_TOOL)

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

 
 

-flash-fpga: armsrc/obj/fpgaimage.elf $(FLASH_TOOL)
-       $(FLASH_TOOL) $(subst /,$(PATHSEP),$<)
+#flash-fpga: armsrc/obj/fpgaimage.elf $(FLASH_TOOL)
+#      $(FLASH_TOOL) $(FLASH_PORT) $(subst /,$(PATHSEP),$<)

 
 

-flash-both: armsrc/obj/osimage.elf armsrc/obj/fpgaimage.elf $(FLASH_TOOL)
-       $(FLASH_TOOL) $(subst /,$(PATHSEP),$(filter-out $(FLASH_TOOL),$^))
+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 armsrc/obj/fpgaimage.elf $(FLASH_TOOL)
-       $(FLASH_TOOL) -b $(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
 
 newtarbin:
        $(DELETE) proxmark3-$(platform)-bin.tar proxmark3-$(platform)-bin.tar.gz