Update architecture specific makefile templates so that they are as close to one...

[pub/USBasp.git] / LUFA / CodeTemplates / makefile_template.avr8

diff --git a/LUFA/CodeTemplates/makefile_template.avr8 b/LUFA/CodeTemplates/makefile_template.avr8
index 5cfacb4..be1e684 100644 (file)
--- a/LUFA/CodeTemplates/makefile_template.avr8
+++ b/LUFA/CodeTemplates/makefile_template.avr8
@@ -63,7 +63,7 @@
 MCU = ### INSERT NAME OF MICROCONTROLLER MODEL HERE ###\r
 \r
 \r
 MCU = ### INSERT NAME OF MICROCONTROLLER MODEL HERE ###\r
 \r
 \r

-# Target architecture (see library "Board Types" documentation).\r
+# Targeted chip architecture (see library "Architectures" documentation)\r

 ARCH = AVR8\r
 \r
 \r
 ARCH = AVR8\r
 \r
 \r


@@ -177,21 +177,24 @@ CSTANDARD = -std=c99
 \r
 # Place -D or -U options here for C sources\r
 CDEFS  = -DF_CPU=$(F_CPU)UL\r
 \r
 # Place -D or -U options here for C sources\r
 CDEFS  = -DF_CPU=$(F_CPU)UL\r

-CDEFS += -DF_CLOCK=$(F_CLOCK)UL\r
+CDEFS += -DF_USB=$(F_USB)UL\r

 CDEFS += -DBOARD=BOARD_$(BOARD)\r
 CDEFS += -DBOARD=BOARD_$(BOARD)\r

+CDEFS += -DARCH=ARCH_$(ARCH)\r

 CDEFS += $(LUFA_OPTS)\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r
 ADEFS  = -DF_CPU=$(F_CPU)\r
 CDEFS += $(LUFA_OPTS)\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r
 ADEFS  = -DF_CPU=$(F_CPU)\r

-ADEFS += -DF_CLOCK=$(F_CLOCK)UL\r
+ADEFS += -DF_USB=$(F_USB)UL\r

 ADEFS += -DBOARD=BOARD_$(BOARD)\r
 ADEFS += -DBOARD=BOARD_$(BOARD)\r

+ADEFS += -DARCH=ARCH_$(ARCH)\r

 ADEFS += $(LUFA_OPTS)\r
 \r
 # Place -D or -U options here for C++ sources\r
 CPPDEFS  = -DF_CPU=$(F_CPU)UL\r
 ADEFS += $(LUFA_OPTS)\r
 \r
 # Place -D or -U options here for C++ sources\r
 CPPDEFS  = -DF_CPU=$(F_CPU)UL\r

-CPPDEFS += -DF_CLOCK=$(F_CLOCK)UL\r
+CPPDEFS += -DF_USB=$(F_USB)UL\r

 CPPDEFS += -DBOARD=BOARD_$(BOARD)\r
 CPPDEFS += -DBOARD=BOARD_$(BOARD)\r

+CPPDEFS += -DARCH=ARCH_$(ARCH)\r

 CPPDEFS += $(LUFA_OPTS)\r
 #CPPDEFS += -D__STDC_LIMIT_MACROS\r
 #CPPDEFS += -D__STDC_CONSTANT_MACROS\r
 CPPDEFS += $(LUFA_OPTS)\r
 #CPPDEFS += -D__STDC_LIMIT_MACROS\r
 #CPPDEFS += -D__STDC_CONSTANT_MACROS\r


@@ -217,11 +220,6 @@ CFLAGS += -fshort-enums
 CFLAGS += -fno-strict-aliasing\r
 CFLAGS += -Wall\r
 CFLAGS += -Wstrict-prototypes\r
 CFLAGS += -fno-strict-aliasing\r
 CFLAGS += -Wall\r
 CFLAGS += -Wstrict-prototypes\r

-#CFLAGS += -mshort-calls\r
-#CFLAGS += -fno-unit-at-a-time\r
-#CFLAGS += -Wundef\r
-#CFLAGS += -Wunreachable-code\r
-#CFLAGS += -Wsign-compare\r

 CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)\r
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))\r
 CFLAGS += $(CSTANDARD)\r
 CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)\r
 CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))\r
 CFLAGS += $(CSTANDARD)\r


@@ -241,14 +239,11 @@ CPPFLAGS += -funsigned-char
 CPPFLAGS += -funsigned-bitfields\r
 CPPFLAGS += -fpack-struct\r
 CPPFLAGS += -fshort-enums\r
 CPPFLAGS += -funsigned-bitfields\r
 CPPFLAGS += -fpack-struct\r
 CPPFLAGS += -fshort-enums\r

+CPPFLAGS += -ffunction-sections\r
+CPPFLAGS += -fno-strict-aliasing\r

 CPPFLAGS += -fno-exceptions\r
 CPPFLAGS += -Wall\r
 CPPFLAGS += -Wundef\r
 CPPFLAGS += -fno-exceptions\r
 CPPFLAGS += -Wall\r
 CPPFLAGS += -Wundef\r

-#CPPFLAGS += -mshort-calls\r
-#CPPFLAGS += -fno-unit-at-a-time\r
-#CPPFLAGS += -Wstrict-prototypes\r
-#CPPFLAGS += -Wunreachable-code\r
-#CPPFLAGS += -Wsign-compare\r

 CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)\r
 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))\r
 #CPPFLAGS += $(CSTANDARD)\r
 CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)\r
 CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))\r
 #CPPFLAGS += $(CSTANDARD)\r


@@ -592,7 +587,7 @@ extcoff: $(TARGET).elf
 %.hex: %.elf\r
        @echo\r
        @echo $(MSG_FLASH) $@\r
 %.hex: %.elf\r
        @echo\r
        @echo $(MSG_FLASH) $@\r

-       $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock $< $@\r
+       $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature $< $@\r

 \r
 %.eep: %.elf\r
        @echo\r
 \r
 %.eep: %.elf\r
        @echo\r