fix OS detection, libgcc detection

[proxmark3-svn] / bootrom / Makefile

diff --git a/bootrom/Makefile b/bootrom/Makefile
index 2ab91286d90fde201ef02d661e1ab5efea707009..f88b3cdd2598609f5d5150cf1352cfcac8f658bc 100644 (file)
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -1,36 +1,36 @@
 # Makefile for bootrom, see ../common/Makefile.common for common settings\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
-# Do not move this inclusion before the definition of {THUMB,ASM,ARM}{OBJ,SRC}\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
+## 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
+# Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC\r
 include ../common/Makefile.common\r
 \r
-all: bootrom-merged.s19\r
+all: $(OBJDIR)/bootrom.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
+$(OBJDIR)/bootrom.elf: $(VERSIONOBJ) $(ASMOBJ) $(ARMOBJ) $(THUMBOBJ)\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
 clean:\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) bootrom-merged.s19\r
+       $(DELETE) version.c\r
 \r
-.PHONY: all clean help\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 + all   - Make $(OBJDIR)/bootrom.s19, the main bootrom\r
        @echo + clean - Clean $(OBJDIR)\r