Make the bootrom correctly nack in case of flash write error (e.g. due to lock bits)

[proxmark3-svn] / bootrom / Makefile

diff --git a/bootrom/Makefile b/bootrom/Makefile
index e18737c3d0b269be150a3911c46b37f9cd036c26..f88b3cdd2598609f5d5150cf1352cfcac8f658bc 100644 (file)
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -1,58 +1,36 @@
-CC       = arm-elf-gcc\r
-AS       = arm-elf-as\r
-LD       = arm-elf-ld\r
-OBJCOPY = arm-elf-objcopy\r
+# Makefile for bootrom, see ../common/Makefile.common for common settings\r
 \r
-OBJDIR  = obj\r
+# DO NOT use thumb mode in the phase 1 bootloader since that generates a section with glue code\r
+ARMSRC = fromflash.c \r
+THUMBSRC = usb.c bootrom.c\r
+ASMSRC = ram-reset.s flash-reset.s\r
 \r
-INCLUDE = -I../include\r
+## There is a strange bug with the linker: Sometimes it will not emit the glue to call\r
+## BootROM from ARM mode. The symbol is emitted, but the section will be filled with\r
+## zeroes. As a temporary workaround, do not use thumb for the phase 2 bootloader\r
+## -- Henryk Plötz <henryk@ploetzli.ch> 2009-09-01\r
+ARMSRC := $(ARMSRC) $(THUMBSRC)\r
+THUMBSRC := \r
 \r
-INCLUDES = ../include/proxmark3.h ../include/at91sam7s128.h ../include/config_gpio.h ../include/usb_cmd.h\r
+# Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC\r
+include ../common/Makefile.common\r
 \r
-CFLAGS  = -g -c $(INCLUDE) -Wall\r
+all: $(OBJDIR)/bootrom.s19\r
 \r
-OBJJTAG = $(OBJDIR)/bootrom.o $(OBJDIR)/ram-reset.o $(OBJDIR)/usb.o\r
-\r
-OBJFLASH = $(OBJDIR)/flash-reset.o $(OBJDIR)/fromflash.o\r
-\r
-all: bootrom.s19\r
-\r
-bootrom.s19: $(OBJDIR)/bootrom.s19 $(OBJDIR)/bootrom-forjtag.s19\r
-    @echo bootrom.s19\r
-       @perl ..\tools\merge-srec.pl $(OBJDIR)\bootrom.s19 $(OBJDIR)\bootrom-forjtag.s19 > $(OBJDIR)\bootrom-merged.s19\r
-       @perl ..\tools\srecswap.pl $(OBJDIR)\bootrom-forjtag.s19 > $(OBJDIR)\bootrom-forjtag-swapped.s19\r
-\r
-$(OBJDIR)/bootrom.s19: $(OBJFLASH)\r
-    @echo obj/bootrom.s19\r
-       @$(LD) -g -Tldscript-flash --oformat elf32-littlearm -o $(OBJDIR)/bootrom.elf $(OBJFLASH)\r
-       @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/bootrom.elf $(OBJDIR)/bootrom.s19\r
-\r
-$(OBJDIR)/bootrom-forjtag.s19: $(OBJJTAG)\r
-    @echo obj/bootrom-forjtag.s19\r
-       @$(LD) -g -Tldscript-ram-jtag --oformat elf32-littlearm -o $(OBJDIR)/bootrom-forjtag.elf $(OBJJTAG)\r
-       @$(OBJCOPY) -Osrec --srec-forceS3 $(OBJDIR)/bootrom-forjtag.elf $(OBJDIR)/bootrom-forjtag.s19\r
-\r
-$(OBJDIR)/bootrom.o: bootrom.c $(INCLUDES)\r
-    @echo $(@B).c\r
-       @$(CC) $(CFLAGS) -mthumb -mthumb-interwork bootrom.c -o $(OBJDIR)/bootrom.o\r
-\r
-$(OBJDIR)/fromflash.o: fromflash.c $(INCLUDES)\r
-    @echo $(@B).c\r
-       @$(CC) $(CFLAGS) -mthumb -mthumb-interwork fromflash.c -o $(OBJDIR)/fromflash.o\r
-\r
-$(OBJDIR)/usb.o: ../common/usb.c $(INCLUDES)\r
-    @echo $(@B).c\r
-       @$(CC) $(CFLAGS) -mthumb -mthumb-interwork ../common/usb.c -o $(OBJDIR)/usb.o\r
-\r
-$(OBJDIR)/ram-reset.o: ram-reset.s\r
-    @echo $(@B).s\r
-       @$(CC) $(CFLAGS) -mthumb-interwork -o $(OBJDIR)/ram-reset.o ram-reset.s\r
-\r
-$(OBJDIR)/flash-reset.o: flash-reset.s\r
-    @echo $(@B).s\r
-       @$(CC) $(CFLAGS) -mthumb-interwork -o $(OBJDIR)/flash-reset.o flash-reset.s\r
+$(OBJDIR)/bootrom.elf: $(VERSIONOBJ) $(ASMOBJ) $(ARMOBJ) $(THUMBOBJ)\r
+       $(LD) -g -Tldscript-flash --oformat elf32-littlearm -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
 \r
 clean:\r
-       del /q obj\*.o\r
-       del /q obj\*.elf\r
-       del /q obj\*.s19\r
+       $(DELETE) $(OBJDIR)$(PATHSEP)*.o\r
+       $(DELETE) $(OBJDIR)$(PATHSEP)*.elf\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
+       @echo Multi-OS Makefile, you are running on $(DETECTED_OS)\r
+       @echo Possible targets:\r
+       @echo + all   - Make $(OBJDIR)/bootrom.s19, the main bootrom\r
+       @echo + clean - Clean $(OBJDIR)\r