put some extra (pre-)configuration into Makefile.inc

[pub/USBaspLoader.git] / firmware / Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 6808086..486003f 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -17,11 +17,9 @@
 
 include ../Makefile.inc
 
 
 include ../Makefile.inc
 

-# Options:
-DEFINES = #-DDEBUG_LEVEL=2

 # Remove the -fno-* options when you use gcc 3, it does not understand them
 # 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
 
 
 OBJECTS =  usbdrv/usbdrvasm.o usbdrv/oddebug.o main.o
 


@@ -42,16 +40,31 @@ all: main.hex
        $(CC) $(CFLAGS) -S $< -o $@
 
 flash: all
        $(CC) $(CFLAGS) -S $< -o $@
 
 flash: all

+       $(ECHO) "."

        $(AVRDUDE) -U flash:w:main.hex:i
        $(AVRDUDE) -U flash:w:main.hex:i

+       $(ECHO) "."
+       $(ECHO) "."

 
 readflash:
 
 readflash:

+       $(ECHO) "."

        $(AVRDUDE) -U flash:r:read.hex:i
        $(AVRDUDE) -U flash:r:read.hex:i

+       $(ECHO) "."
+       $(ECHO) "."
+

 
 fuse:
 
 fuse:

+       $(ECHO) "."

        $(AVRDUDE) $(FUSEOPT)
        $(AVRDUDE) $(FUSEOPT)

+       $(ECHO) "."
+       $(ECHO) "."
+

 
 lock:
 
 lock:

+       $(ECHO) "."

        $(AVRDUDE) $(LOCKOPT)
        $(AVRDUDE) $(LOCKOPT)

+       $(ECHO) "."
+       $(ECHO) "."
+

 
 read_fuses:
        $(UISP) --rd_fuses
 
 read_fuses:
        $(UISP) --rd_fuses


@@ -61,7 +74,9 @@ deepclean: clean
 
 clean:
        $(RM) main.hex
 
 clean:
        $(RM) main.hex

-       $(RM) main.bin
+       $(RM) main.asm
+       $(RM) main.map
+       $(RM) main.elf

        $(RM) main.o
        $(RM) main.s
        $(RM) usbdrv/usbdrvasm.o
        $(RM) main.o
        $(RM) main.s
        $(RM) usbdrv/usbdrvasm.o


@@ -70,25 +85,28 @@ clean:
        $(RM) usbdrv/usbdrv.s
 
 # file targets:
        $(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.asm: main.elf
+       $(OBD) -Stdr main.elf > main.asm

 
 

-main.hex:      main.bin
+main.hex: main.elf main.asm

        $(RM) main.hex main.eep.hex
        $(RM) main.hex main.eep.hex

-       $(OBC) -j .text -j .data -O ihex main.bin main.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) "."
        $(ECHO) "."
        $(ECHO) "."
        $(ECHO) "."
        $(ECHO) "!!!ATTANTION!!!"
        $(ECHO) "(data+text) MUST fit into your MCUs bootloader section"
        $(ECHO) "."

-       $(SIZ) --mcu $(DEVICE) main.bin
+       $(SIZ) --mcu $(DEVICE) main.elf

        $(ECHO) "."
        $(ECHO) "."
        $(ECHO) "."
 
        $(ECHO) "."
        $(ECHO) "."
        $(ECHO) "."
 

-disasm:        main.bin
-       $(OBD) -d main.bin
+disasm:        main.elf
+       $(OBD) -d main.elf

 
 cpp:
        $(CC) $(CFLAGS) -E main.c
 
 cpp:
        $(CC) $(CFLAGS) -E main.c