X-Git-Url: http://git.linex4red.de/pub/USBaspLoader.git/blobdiff_plain/e818fbb5f39d790ab62316ab5800c9c9c0b46ac3..40fa0566e149b4f384454b4f1ab07d366ea4ab7e:/firmware/Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 75eeacf..486003f 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -17,11 +17,9 @@
 
 include ../Makefile.inc
 
-# Options:
-DEFINES = #-DDEBUG_LEVEL=2
 # Remove the -fno-* options when you use gcc 3, it does not understand them
-CFLAGS = -Wall -Os -fno-move-loop-invariants -fno-tree-scev-cprop -fno-inline-small-functions -I. -mmcu=$(DEVICE) -DBOOTLOADER_ADDRESS=$(BOOTLOADER_ADDRESS) -DF_CPU=$(F_CPU) $(DEFINES)
-LDFLAGS = -Wl,--relax,--gc-sections -Wl,--section-start=.text=$(BOOTLOADER_ADDRESS)
+CFLAGS = -Wall -Os -g3 -ggdb -fno-move-loop-invariants -fno-tree-scev-cprop -fno-inline-small-functions -I. -mmcu=$(DEVICE) -DBOOTLOADER_ADDRESS=$(BOOTLOADER_ADDRESS) -DF_CPU=$(F_CPU) $(DEFINES)
+LDFLAGS = -Wl,--relax,--gc-sections -Wl,--section-start=.text=$(BOOTLOADER_ADDRESS) -Wl,--defsym=nullVector=0
 
 OBJECTS =  usbdrv/usbdrvasm.o usbdrv/oddebug.o main.o
 
@@ -42,16 +40,31 @@ all: main.hex
 	$(CC) $(CFLAGS) -S $< -o $@
 
 flash:	all
+	$(ECHO) "."
 	$(AVRDUDE) -U flash:w:main.hex:i
+	$(ECHO) "."
+	$(ECHO) "."
 
 readflash:
+	$(ECHO) "."
 	$(AVRDUDE) -U flash:r:read.hex:i
+	$(ECHO) "."
+	$(ECHO) "."
+
 
 fuse:
+	$(ECHO) "."
 	$(AVRDUDE) $(FUSEOPT)
+	$(ECHO) "."
+	$(ECHO) "."
+
 
 lock:
+	$(ECHO) "."
 	$(AVRDUDE) $(LOCKOPT)
+	$(ECHO) "."
+	$(ECHO) "."
+
 
 read_fuses:
 	$(UISP) --rd_fuses
@@ -60,19 +73,40 @@ deepclean: clean
 	$(RM) *~
 
 clean:
-	$(RM) main.hex main.bin *.o usbdrv/*.o main.s usbdrv/oddebug.s usbdrv/usbdrv.s
+	$(RM) main.hex
+	$(RM) main.asm
+	$(RM) main.map
+	$(RM) main.elf
+	$(RM) main.o
+	$(RM) main.s
+	$(RM) usbdrv/usbdrvasm.o
+	$(RM) usbdrv/oddebug.o
+	$(RM) usbdrv/oddebug.s
+	$(RM) usbdrv/usbdrv.s
 
 # file targets:
-main.bin:	$(OBJECTS)
-	$(CC) $(CFLAGS) -o main.bin $(OBJECTS) $(LDFLAGS)
+main.elf:	$(OBJECTS) bootloaderconfig.h
+	$(CC) $(CFLAGS) -o main.elf $(OBJECTS) -Wl,-Map,main.map $(LDFLAGS)
 
-main.hex:	main.bin
-	$(RM) main.hex main.eep.hex
-	$(OBC) -j .text -j .data -O ihex main.bin main.hex
-	$(SIZ) main.bin
+main.asm: main.elf
+	$(OBD) -Stdr main.elf > main.asm
 
-disasm:	main.bin
-	$(OBD) -d main.bin
+main.hex: main.elf main.asm
+	$(RM) main.hex main.eep.hex
+	$(OBC) -j .text -j .data -O ihex main.elf main.hex
+	$(ECHO) "."
+	$(ECHO) "."
+	$(ECHO) "."
+	$(ECHO) "!!!ATTANTION!!!"
+	$(ECHO) "(data+text) MUST fit into your MCUs bootloader section"
+	$(ECHO) "."
+	$(SIZ) --mcu $(DEVICE) main.elf
+	$(ECHO) "."
+	$(ECHO) "."
+	$(ECHO) "."
+
+disasm:	main.elf
+	$(OBD) -d main.elf
 
 cpp:
 	$(CC) $(CFLAGS) -E main.c