CHG: Updated the CHANGELOG.md

[proxmark3-svn] / bootrom / Makefile

diff --git a/bootrom/Makefile b/bootrom/Makefile
index 652e0ae2587a7fe2a4434fe4a960704f79a0b468..146bfe4f61f8d926750b8411830a870b9f49e46b 100644 (file)
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -1,45 +1,52 @@
-# Makefile for bootrom, see ../common/Makefile.common for common settings\r
-include ../common/Makefile.common\r
-\r
-OBJJTAG = $(OBJDIR)/bootrom.o $(OBJDIR)/ram-reset.o $(OBJDIR)/usb.o\r
-OBJFLASH = $(OBJDIR)/flash-reset.o $(OBJDIR)/fromflash.o\r
-\r
-THUMBSRC = usb.c fromflash.c bootrom.c\r
-ASMSRC   = ram-reset.s flash-reset.s\r
-\r
-THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))\r
-ASMOBJ   = $(patsubst %.s,$(OBJDIR)/%.o,$(ASMSRC))\r
-\r
-all: bootrom-merged.s19\r
-\r
-bootrom-merged.s19: $(OBJDIR)/bootrom.s19 $(OBJDIR)/bootrom-forjtag.s19\r
-       perl ../tools/merge-srec.pl $(OBJDIR)/bootrom.s19 $(OBJDIR)/bootrom-forjtag.s19 > bootrom-merged.s19\r
-\r
-$(OBJDIR)/bootrom.elf: $(OBJFLASH)\r
-       $(LD) -g -Tldscript-flash --oformat elf32-littlearm -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
-\r
-$(OBJDIR)/bootrom-forjtag.elf: $(OBJJTAG)\r
-       $(LD) -g -Tldscript-ram-jtag --oformat elf32-littlearm -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
-\r
-$(OBJDIR)/%.s19: $(OBJDIR)/%.elf\r
-       $(OBJCOPY) -Osrec --srec-forceS3 $^ $@\r
-\r
-$(THUMBOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)\r
-       $(CC) $(CFLAGS) -mthumb -mthumb-interwork -o $@ $< \r
-\r
-$(ASMOBJ): $(OBJDIR)/%.o: %.s\r
-       $(CC) $(CFLAGS) -mthumb-interwork -o $@ $<\r
-\r
-clean:\r
-       $(DELETE) $(OBJDIR)$(PATHSEP)*.o\r
-       $(DELETE) $(OBJDIR)$(PATHSEP)*.elf\r
-       $(DELETE) $(OBJDIR)$(PATHSEP)*.s19\r
-       $(DELETE) $(OBJDIR)$(PATHSEP)*.map\r
-       $(DELETE) bootrom-merged.s19\r
-\r
-.PHONY: all clean help\r
-help:\r
-       @echo Multi-OS Makefile, you are running on $(DETECTED_OS)\r
-       @echo Possible targets:\r
-       @echo + all   - Make bootrom-merged.s19, the main bootrom\r
-       @echo + clean - Clean $(OBJDIR)\r
+#-----------------------------------------------------------------------------
+# This code is licensed to you under the terms of the GNU GPL, version 2 or,
+# at your option, any later version. See the LICENSE.txt file for the text of
+# the license.
+#-----------------------------------------------------------------------------
+# Makefile for bootrom, see ../common/Makefile.common for common settings
+#-----------------------------------------------------------------------------
+
+# DO NOT use thumb mode in the phase 1 bootloader since that generates a section with glue code
+ARMSRC = 
+THUMBSRC = cmd.c \
+       usb_cdc.c \
+       bootrom.c
+ASMSRC = ram-reset.s flash-reset.s
+
+## There is a strange bug with the linker: Sometimes it will not emit the glue to call
+## BootROM from ARM mode. The symbol is emitted, but the section will be filled with
+## zeroes. As a temporary workaround, do not use thumb for the phase 2 bootloader
+## -- Henryk Plötz <henryk@ploetzli.ch> 2009-09-01
+# ARMSRC := $(ARMSRC) $(THUMBSRC)
+# THUMBSRC := 
+
+# stdint.h provided locally until GCC 4.5 becomes C99 compliant
+APP_CFLAGS = -I.
+
+# Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
+include ../common/Makefile.common
+
+OBJS = $(OBJDIR)/bootrom.s19
+
+all: $(OBJS)
+
+tarbin: $(OBJS)
+       $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(OBJS:%=bootrom/%) $(OBJS:%.s19=bootrom/%.elf)
+
+$(OBJDIR)/bootrom.elf: $(VERSIONOBJ) $(ASMOBJ) $(ARMOBJ) $(THUMBOBJ)
+       $(CC) $(LDFLAGS) -Wl,-T,ldscript-flash,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^ $(LIBS)
+
+clean:
+       $(DELETE) $(OBJDIR)$(PATHSEP)*.o
+       $(DELETE) $(OBJDIR)$(PATHSEP)*.elf
+       $(DELETE) $(OBJDIR)$(PATHSEP)*.s19
+       $(DELETE) $(OBJDIR)$(PATHSEP)*.map
+       $(DELETE) $(OBJDIR)$(PATHSEP)*.d
+       $(DELETE) version.c
+
+.PHONY: all clean help 
+help:
+       @echo Multi-OS Makefile, you are running on $(DETECTED_OS)
+       @echo Possible targets:
+       @echo + all   - Make $(OBJDIR)/bootrom.s19, the main bootrom
+       @echo + clean - Clean $(OBJDIR)