projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #17 from Proxmark/iclass-fixes
[proxmark3-svn]
/
Makefile
diff --git
a/Makefile
b/Makefile
index c5deed956b0730f3f8501548777b52c505687eb2..101212b49c0a7fbf3aadbe27033a68d1057ca47f 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/%
@@
-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-fpga: armsrc/obj/fpgaimage.elf $(FLASH_TOOL)
- $(FLASH_TOOL) $(subst /,$(PATHSEP),$<)
+ $(FLASH_TOOL) $(
FLASH_PORT) $(
subst /,$(PATHSEP),$<)
flash-both: armsrc/obj/osimage.elf armsrc/obj/fpgaimage.elf $(FLASH_TOOL)
flash-both: armsrc/obj/osimage.elf armsrc/obj/fpgaimage.elf $(FLASH_TOOL)
- $(FLASH_TOOL) $(subst /,$(PATHSEP),$(filter-out $(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-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_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
Impressum
,
Datenschutz