projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix wrong terminology - LRC/CRC and calulate result instead of matching (thanks Henryk!)
[proxmark3-svn]
/
armsrc
/
Makefile
diff --git
a/armsrc/Makefile
b/armsrc/Makefile
index 5ed76ccc36f7a73c9f104d806a211a43b0ce25b6..bc15aeb9d568f48a6b8161dde7e06b20d04e4a6e 100644
(file)
--- a/
armsrc/Makefile
+++ b/
armsrc/Makefile
@@
-13,6
+13,7
@@
THUMBSRC = start.c \
lfops.c \
\r
iso15693.c \
\r
util.c \
\r
lfops.c \
\r
iso15693.c \
\r
util.c \
\r
+ hitag2.c \
\r
usb.c
\r
\r
# These are to be compiled in ARM mode
\r
usb.c
\r
\r
# These are to be compiled in ARM mode
\r
@@
-28,14
+29,14
@@
all: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19
$(OBJDIR)/fpga.o: fpga.bit
\r
$(OBJCOPY) -O elf32-littlearm -I binary -B arm --redefine-sym _binary____fpga_fpga_bit_start=_binary_fpga_bit_start --redefine-sym _binary____fpga_fpga_bit_end=_binary_fpga_bit_end --prefix-sections=fpga_bit $^ $@
\r
\r
$(OBJDIR)/fpga.o: fpga.bit
\r
$(OBJCOPY) -O elf32-littlearm -I binary -B arm --redefine-sym _binary____fpga_fpga_bit_start=_binary_fpga_bit_start --redefine-sym _binary____fpga_fpga_bit_end=_binary_fpga_bit_end --prefix-sections=fpga_bit $^ $@
\r
\r
-$(OBJDIR)/fullimage.elf: $(OBJDIR)/fpga.o $(THUMBOBJ) $(ARMOBJ) $(ARMLIB)/libgcc.a
\r
+$(OBJDIR)/fullimage.elf: $(
VERSIONOBJ) $(
OBJDIR)/fpga.o $(THUMBOBJ) $(ARMOBJ) $(ARMLIB)/libgcc.a
\r
$(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
\r
\r
$(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fullimage.elf
\r
$(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
\r
\r
$(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fullimage.elf
\r
- $(OBJCOPY) -F elf32-littlearm --only-section fpgaimage $^ $@
\r
+ $(OBJCOPY) -F elf32-littlearm --only-section
.
fpgaimage $^ $@
\r
\r
$(OBJDIR)/osimage.elf: $(OBJDIR)/fullimage.elf
\r
\r
$(OBJDIR)/osimage.elf: $(OBJDIR)/fullimage.elf
\r
- $(OBJCOPY) -F elf32-littlearm --remove-section fpgaimage $^ $@
\r
+ $(OBJCOPY) -F elf32-littlearm --remove-section
.
fpgaimage $^ $@
\r
\r
clean:
\r
$(DELETE) $(OBJDIR)$(PATHSEP)*.o
\r
\r
clean:
\r
$(DELETE) $(OBJDIR)$(PATHSEP)*.o
\r
@@
-43,6
+44,7
@@
clean:
$(DELETE) $(OBJDIR)$(PATHSEP)*.s19
\r
$(DELETE) $(OBJDIR)$(PATHSEP)*.map
\r
$(DELETE) $(OBJDIR)$(PATHSEP)*.d
\r
$(DELETE) $(OBJDIR)$(PATHSEP)*.s19
\r
$(DELETE) $(OBJDIR)$(PATHSEP)*.map
\r
$(DELETE) $(OBJDIR)$(PATHSEP)*.d
\r
+ $(DELETE) version.c
\r
\r
.PHONY: all clean help
\r
help:
\r
\r
.PHONY: all clean help
\r
help:
\r
Impressum
,
Datenschutz