X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6658905f18a1eebc148836f26c731dea9c1377dc..7db5f1ca25c2e451eac0f11e4e7eb9b1a9939ce3:/bootrom/Makefile?ds=sidebyside

diff --git a/bootrom/Makefile b/bootrom/Makefile
index e18737c3..92373995 100644
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -1,58 +1,50 @@
-CC	  = arm-elf-gcc
-AS	  = arm-elf-as
-LD	  = arm-elf-ld
-OBJCOPY = arm-elf-objcopy
-
-OBJDIR  = obj
-
-INCLUDE = -I../include
-
-INCLUDES = ../include/proxmark3.h ../include/at91sam7s128.h ../include/config_gpio.h ../include/usb_cmd.h
-
-CFLAGS  = -g -c $(INCLUDE) -Wall
-
-OBJJTAG = $(OBJDIR)/bootrom.o $(OBJDIR)/ram-reset.o $(OBJDIR)/usb.o
-
-OBJFLASH = $(OBJDIR)/flash-reset.o $(OBJDIR)/fromflash.o
-
-all: bootrom.s19
-
-bootrom.s19: $(OBJDIR)/bootrom.s19 $(OBJDIR)/bootrom-forjtag.s19
-    @echo bootrom.s19
-	@perl ..\tools\merge-srec.pl $(OBJDIR)\bootrom.s19 $(OBJDIR)\bootrom-forjtag.s19 > $(OBJDIR)\bootrom-merged.s19
-	@perl ..\tools\srecswap.pl $(OBJDIR)\bootrom-forjtag.s19 > $(OBJDIR)\bootrom-forjtag-swapped.s19
-
-$(OBJDIR)/bootrom.s19: $(OBJFLASH)
-    @echo obj/bootrom.s19
-	@$(LD) -g -Tldscript-flash --oformat elf32-littlearm -o $(OBJDIR)/bootrom.elf $(OBJFLASH)
-	@$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/bootrom.elf $(OBJDIR)/bootrom.s19
-
-$(OBJDIR)/bootrom-forjtag.s19: $(OBJJTAG)
-    @echo obj/bootrom-forjtag.s19
-	@$(LD) -g -Tldscript-ram-jtag --oformat elf32-littlearm -o $(OBJDIR)/bootrom-forjtag.elf $(OBJJTAG)
-	@$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/bootrom-forjtag.elf $(OBJDIR)/bootrom-forjtag.s19
-
-$(OBJDIR)/bootrom.o: bootrom.c $(INCLUDES)
-    @echo $(@B).c
-	@$(CC) $(CFLAGS) -mthumb -mthumb-interwork bootrom.c -o $(OBJDIR)/bootrom.o
-
-$(OBJDIR)/fromflash.o: fromflash.c $(INCLUDES)
-    @echo $(@B).c
-	@$(CC) $(CFLAGS) -mthumb -mthumb-interwork fromflash.c -o $(OBJDIR)/fromflash.o
-
-$(OBJDIR)/usb.o: ../common/usb.c $(INCLUDES)
-    @echo $(@B).c
-	@$(CC) $(CFLAGS) -mthumb -mthumb-interwork ../common/usb.c -o $(OBJDIR)/usb.o
-
-$(OBJDIR)/ram-reset.o: ram-reset.s
-    @echo $(@B).s
-	@$(CC) $(CFLAGS) -mthumb-interwork -o $(OBJDIR)/ram-reset.o ram-reset.s
-
-$(OBJDIR)/flash-reset.o: flash-reset.s
-    @echo $(@B).s
-	@$(CC) $(CFLAGS) -mthumb-interwork -o $(OBJDIR)/flash-reset.o flash-reset.s
-
-clean:
-	del /q obj\*.o
-	del /q obj\*.elf
-	del /q obj\*.s19
+#-----------------------------------------------------------------------------
+# 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)