Fix up small error in main osc startup delay and replace more custom defines with...

[proxmark3-svn] / bootrom / Makefile

diff --git a/bootrom/Makefile b/bootrom/Makefile
index f6b16ba3b771b990a10ca9fd3c72f0619bdbdcb3..0f661a8f3984727ce5d2a597f27db1cff9115007 100644 (file)
--- a/bootrom/Makefile
+++ b/bootrom/Makefile
@@ -1,7 +1,13 @@
+#-----------------------------------------------------------------------------
+# 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
 # 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
 
 # DO NOT use thumb mode in the phase 1 bootloader since that generates a section with glue code

-ARMSRC = fromflash.c 
+ARMSRC = 

 THUMBSRC = usb.c bootrom.c
 ASMSRC = ram-reset.s flash-reset.s
 
 THUMBSRC = usb.c bootrom.c
 ASMSRC = ram-reset.s flash-reset.s
 


@@ -21,7 +27,7 @@ include ../common/Makefile.common
 all: $(OBJDIR)/bootrom.s19
 
 $(OBJDIR)/bootrom.elf: $(VERSIONOBJ) $(ASMOBJ) $(ARMOBJ) $(THUMBOBJ)
 all: $(OBJDIR)/bootrom.s19
 
 $(OBJDIR)/bootrom.elf: $(VERSIONOBJ) $(ASMOBJ) $(ARMOBJ) $(THUMBOBJ)

-       $(LD) -g -Tldscript-flash --oformat elf32-littlearm -Map=$(patsubst %.elf,%.map,$@) -o $@ $^
+       $(CC) $(LDFLAGS) -Wl,-T,ldscript-flash,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^ $(LIBS)

 
 clean:
        $(DELETE) $(OBJDIR)$(PATHSEP)*.o
 
 clean:
        $(DELETE) $(OBJDIR)$(PATHSEP)*.o