Commit 4b1f6cac authored by Dean Camera's avatar Dean Camera

Slight cleanups to the architecture specific makefile templates to make the...

Slight cleanups to the architecture specific makefile templates to make the common configuration sections as identical as possible.
parent e009aafe
...@@ -133,6 +133,7 @@ SRC = $(TARGET).c \ ...@@ -133,6 +133,7 @@ SRC = $(TARGET).c \
$(LUFA_SRC_USBCLASS) $(LUFA_SRC_USBCLASS)
### INSERT ADDITIONAL PROJECT SOURCE FILENAMES OR LUFA MODULE NAMES HERE ### ### INSERT ADDITIONAL PROJECT SOURCE FILENAMES OR LUFA MODULE NAMES HERE ###
# List C++ source files here. (C dependencies are automatically generated.) # List C++ source files here. (C dependencies are automatically generated.)
CPPSRC = CPPSRC =
...@@ -153,13 +154,6 @@ ASRC = ...@@ -153,13 +154,6 @@ ASRC =
OPT = s OPT = s
# Debugging format.
# Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.
# AVR Studio 4.10 requires dwarf-2.
# AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
DEBUG = dwarf-2
# List any extra directories to look for include files here. # List any extra directories to look for include files here.
# Each directory must be seperated by a space. # Each directory must be seperated by a space.
# Use forward slashes for directory separators. # Use forward slashes for directory separators.
...@@ -172,7 +166,7 @@ EXTRAINCDIRS = $(LUFA_PATH)/ ...@@ -172,7 +166,7 @@ EXTRAINCDIRS = $(LUFA_PATH)/
# gnu89 = c89 plus GCC extensions # gnu89 = c89 plus GCC extensions
# c99 = ISO C99 standard (not yet fully implemented) # c99 = ISO C99 standard (not yet fully implemented)
# gnu99 = c99 plus GCC extensions # gnu99 = c99 plus GCC extensions
CSTANDARD = -std=c99 CSTANDARD = -std=gnu99
# Place -D or -U options here for C sources # Place -D or -U options here for C sources
...@@ -196,10 +190,14 @@ CPPDEFS += -DF_USB=$(F_USB)UL ...@@ -196,10 +190,14 @@ CPPDEFS += -DF_USB=$(F_USB)UL
CPPDEFS += -DBOARD=BOARD_$(BOARD) CPPDEFS += -DBOARD=BOARD_$(BOARD)
CPPDEFS += -DARCH=ARCH_$(ARCH) CPPDEFS += -DARCH=ARCH_$(ARCH)
CPPDEFS += $(LUFA_OPTS) CPPDEFS += $(LUFA_OPTS)
#CPPDEFS += -D__STDC_LIMIT_MACROS
#CPPDEFS += -D__STDC_CONSTANT_MACROS
# Debugging format.
# Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.
# AVR Studio 4.10 requires dwarf-2.
# AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
DEBUG = dwarf-2
#---------------- Compiler Options C ---------------- #---------------- Compiler Options C ----------------
# -g*: generate debugging information # -g*: generate debugging information
......
...@@ -76,7 +76,7 @@ F_CPU = ### INSERT PRESCALED SYSTEM CLOCK SPEED HERE, IN HZ ### ...@@ -76,7 +76,7 @@ F_CPU = ### INSERT PRESCALED SYSTEM CLOCK SPEED HERE, IN HZ ###
# clock rate. # clock rate.
# #
# For the UC3 chips, this should be equal to 48MHz or 96MHz. # For the UC3 chips, this should be equal to 48MHz or 96MHz.
F_USB = 48000000 F_USB = ### INSERT CLOCK TO USB MODULE HERE, IN HZ ###
# Output format. (can be srec, ihex, binary) # Output format. (can be srec, ihex, binary)
...@@ -132,10 +132,6 @@ ASRC = ...@@ -132,10 +132,6 @@ ASRC =
OPT = s OPT = s
# Debugging level.
DEBUG = 3
# List any extra directories to look for include files here. # List any extra directories to look for include files here.
# Each directory must be seperated by a space. # Each directory must be seperated by a space.
# Use forward slashes for directory separators. # Use forward slashes for directory separators.
...@@ -174,6 +170,9 @@ CPPDEFS += -DARCH=ARCH_$(ARCH) ...@@ -174,6 +170,9 @@ CPPDEFS += -DARCH=ARCH_$(ARCH)
CPPDEFS += $(LUFA_OPTS) CPPDEFS += $(LUFA_OPTS)
# Debugging level.
DEBUG = 3
#---------------- Compiler Options C ---------------- #---------------- Compiler Options C ----------------
# -g*: generate debugging information # -g*: generate debugging information
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment