X-Git-Url: http://git.linex4red.de/pub/USBaspLoader.git/blobdiff_plain/9e4373b9f467b2594c843aaaac9cdb16ab8fa391..ba52fbce443a159a16b8a04bb362eef9ee8a902f:/firmware/Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 79e8250..f6b9170 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -4,6 +4,7 @@
 # Creation Date: 2007-12-10
 # Author: Stephan Bärwolf
 # Improvement Date: 2012-07-31
+# Improvement Date: 2012-09-12
 # Tabsize: 4
 # Copyright: (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH
 # License: GNU GPL v2 (see License.txt)
@@ -15,179 +16,94 @@
 #     make flash   # to load the boot loader into flash
 #     make lock    # to protect the boot loader from overwriting
 
-F_CPU = 16000000
-DEVICE = atmega8
-
-# BOOTLOADER_ADDRESS is 1800 for 8k devices, 3800 for 16k and 7800 for 32k.
-BOOTLOADER_ADDRESS = 1800
-
-# PROGRAMMER contains AVRDUDE options to address your programmer
-# PROGRAMMER = -c pony-stk200
-PROGRAMMER = -c usbasp
-
-#  since USBaspLoader supports HAVE_BLB11_SOFTW_LOCKBIT...
-LOCKOPT = -U lock:w:0x3f:m
-FUSEOPT = $(FUSEOPT_8)
-
-
-# standard atmega8 needs BODLEVEL to be programed, since it is a 5V device
-# you may also want to UNprogram  SUT1 to get a SLOWER bootup (lfuse then would be 0x3f)
-FUSEOPT_8 = -U hfuse:w:0xc0:m -U lfuse:w:0x1f:m
-
-FUSEOPT_88 = -U hfuse:w:0xd6:m -U lfuse:w:0xdf:m -U efuse:w:0x00:m
-FUSEOPT_168 = -U hfuse:w:0xd6:m -U lfuse:w:0xdf:m -U efuse:w:0x00:m
-FUSEOPT_328 = -U lfuse:w:0xf7:m -U hfuse:w:0xda:m -U efuse:w:0x03:m
-# You may have to change the order of these -U commands.
-
-#---------------------------------------------------------------------
-# ATMega8
-#---------------------------------------------------------------------
-# Fuse high byte:
-# 0xc0 = 1 1 0 0   0 0 0 0 <-- BOOTRST (boot reset vector at 0x1800)
-#        ^ ^ ^ ^   ^ ^ ^------ BOOTSZ0
-#        | | | |   | +-------- BOOTSZ1
-#        | | | |   + --------- EESAVE (preserve EEPROM over chip erase)
-#        | | | +-------------- CKOPT (full output swing)
-#        | | +---------------- SPIEN (allow serial programming)
-#        | +------------------ WDTON (WDT not always on)
-#        +-------------------- RSTDISBL (reset pin is enabled)
-# Fuse low byte:
-# 0x9f = 1 0 0 1   1 1 1 1
-#        ^ ^ \ /   \--+--/
-#        | |  |       +------- CKSEL 3..0 (external >8M crystal)
-#        | |  +--------------- SUT 1..0 (crystal osc, BOD enabled)
-#        | +------------------ BODEN (BrownOut Detector enabled)
-#        +-------------------- BODLEVEL (2.7V)
-#---------------------------------------------------------------------
-# ATMega88, ATMega168
-#---------------------------------------------------------------------
-# Fuse extended byte:
-# 0x00 = 0 0 0 0   0 0 0 0 <-- BOOTRST (boot reset vector at 0x1800)
-#                    \+/
-#                     +------- BOOTSZ (00 = 2k bytes)
-# Fuse high byte:
-# 0xd6 = 1 1 0 1   0 1 1 0
-#        ^ ^ ^ ^   ^ \-+-/
-#        | | | |   |   +------ BODLEVEL 0..2 (110 = 1.8 V)
-#        | | | |   + --------- EESAVE (preserve EEPROM over chip erase)
-#        | | | +-------------- WDTON (if 0: watchdog always on)
-#        | | +---------------- SPIEN (allow serial programming)
-#        | +------------------ DWEN (debug wire enable)
-#        +-------------------- RSTDISBL (reset pin is enabled)
-# Fuse low byte:
-# 0xdf = 1 1 0 1   1 1 1 1
-#        ^ ^ \ /   \--+--/
-#        | |  |       +------- CKSEL 3..0 (external >8M crystal)
-#        | |  +--------------- SUT 1..0 (crystal osc, BOD enabled)
-#        | +------------------ CKOUT (if 0: Clock output enabled)
-#        +-------------------- CKDIV8 (if 0: divide by 8)
-#---------------------------------------------------------------------
-# ATMega328P
-#---------------------------------------------------------------------
-# Fuse extended byte:
-# 0x03 = - - - -   - 0 1 1
-#                    \-+-/
-#                      +------ BODLEVEL 0..2 (011 = 4.3V)
-# Fuse high byte:
-# 0xda = 1 1 0 1   1 0 1 0 <-- BOOTRST (0 = jump to bootloader at start)
-#        ^ ^ ^ ^   ^ \+/
-#        | | | |   |  +------- BOOTSZ 0..1 (01 = 2KB starting at 0x7800)
-#        | | | |   + --------- EESAVE (don't preserve EEPROM over chip erase)
-#        | | | +-------------- WDTON (1 = watchdog disabled at start)
-#        | | +---------------- SPIEN (0 = allow serial programming)
-#        | +------------------ DWEN (1 = debug wire disable)
-#        +-------------------- RSTDISBL (1 = reset pin is enabled)
-# Fuse low byte:
-# 0xf7 = 1 1 1 1   0 1 1 1
-#        ^ ^ \ /   \--+--/
-#        | |  |       +------- CKSEL 3..0 (0111 = external full-swing crystal)
-#        | |  +--------------- SUT 1..0 (11 = startup time 16K CK/14K + 65ms)
-#        | +------------------ CKOUT (1 = clock output disabled)
-#        +-------------------- CKDIV8 (1 = do not divide clock by 8)
+include ../Makefile.inc
 
-
-###############################################################################
-
-# Tools:
-AVRDUDE = @echo avrdude $(PROGRAMMER) -p $(DEVICE)
-CC = avr-gcc
-
-# 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=0x$(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
+DEPENDS =  bootloaderconfig.h ../Makefile.inc
 
 # symbolic targets:
-all: main.hex
+all: main.hex $(DEPENDS)
 
-.c.o:
-	$(CC) $(CFLAGS) -c $< -o $@
+usbdrv/usbdrvasm.o: usbdrv/usbdrvasm.S $(DEPENDS)
+	$(CC) -x assembler-with-cpp -c usbdrv/usbdrvasm.S -o usbdrv/usbdrvasm.o $(CFLAGS)
 
-.S.o:
-	$(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@
-# "-x assembler-with-cpp" should not be necessary since this is the default
-# file type for the .S (with capital S) extension. However, upper case
-# characters are not always preserved on Windows. To ensure WinAVR
-# compatibility define the file type manually.
+usbdrv/oddebug.o: usbdrv/oddebug.c $(DEPENDS)
+	$(CC) usbdrv/oddebug.c -c -o usbdrv/oddebug.o $(CFLAGS)
 
-.c.s:
-	$(CC) $(CFLAGS) -S $< -o $@
+main.o: main.c $(DEPENDS)
+	$(CC) main.c -c -o main.o $(CFLAGS)
 
 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
 
 deepclean: clean
-	rm -f *~
-
-clean:
-	rm -f main.hex main.bin *.o usbdrv/*.o main.s usbdrv/oddebug.s usbdrv/usbdrv.s
+	$(RM) *~
+
+clean: 
+	$(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.hex:	main.bin
-	rm -f main.hex main.eep.hex
-	avr-objcopy -j .text -j .data -O ihex main.bin main.hex
-	avr-size main.bin
-
-disasm:	main.bin
-	avr-objdump -d main.bin
-
-cpp:
+main.elf: usbdrv/usbdrvasm.o usbdrv/oddebug.o main.o $(DEPENDS)
+	$(CC) $(CFLAGS) -o main.elf usbdrv/usbdrvasm.o usbdrv/oddebug.o main.o -Wl,-Map,main.map $(LDFLAGS)
+
+main.asm: main.elf $(DEPENDS)
+	$(OBD) -Stdr main.elf > main.asm
+
+main.hex: main.elf main.asm $(DEPENDS)
+	$(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 $(DEPENDS)
+	$(OBD) -d main.elf
+
+cpp: $(DEPENDS)
 	$(CC) $(CFLAGS) -E main.c
-
-# Special rules for generating hex files for various devices and clock speeds
-ALLHEXFILES = hexfiles/mega8_12mhz.hex hexfiles/mega8_15mhz.hex hexfiles/mega8_16mhz.hex \
-	hexfiles/mega88_12mhz.hex hexfiles/mega88_15mhz.hex hexfiles/mega88_16mhz.hex hexfiles/mega88_20mhz.hex\
-	hexfiles/mega168_12mhz.hex hexfiles/mega168_15mhz.hex hexfiles/mega168_16mhz.hex hexfiles/mega168_20mhz.hex\
-	hexfiles/mega328p_12mhz.hex hexfiles/mega328p_15mhz.hex hexfiles/mega328p_16mhz.hex hexfiles/mega328p_20mhz.hex
-
-allhexfiles: $(ALLHEXFILES)
-	$(MAKE) clean
-	avr-size hexfiles/*.hex
-
-$(ALLHEXFILES):
-	@[ -d hexfiles ] || mkdir hexfiles
-	@device=`echo $@ | sed -e 's|.*/mega||g' -e 's|_.*||g'`; \
-	clock=`echo $@ | sed -e 's|.*_||g' -e 's|mhz.*||g'`; \
-	addr=`echo $$device | sed -e 's/\([0-9]\)8/\1/g' | awk '{printf("%x", ($$1 - 2) * 1024)}'`; \
-	echo "### Make with F_CPU=$${clock}000000 DEVICE=atmega$$device BOOTLOADER_ADDRESS=$$addr"; \
-	$(MAKE) clean; \
-	$(MAKE) main.hex F_CPU=$${clock}000000 DEVICE=atmega$$device BOOTLOADER_ADDRESS=$$addr DEFINES=-DUSE_AUTOCONFIG=1
-	mv main.hex $@