forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AppConfigHeaders: Merge in latest trunk.

Browse Source
pull/1469/head
Dean Camera 13 years ago
parent c3dd6ac781 b017b41e91
commit 0389288e27
10 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File

4
BuildTests/BoardDriverTest/makefile.avr8
Unescape View File

@ -321,7 +321,7 @@ EXTMEMOPTS =
# -Wl,...: tell GCC to pass this to linker. # -Wl,...: tell GCC to pass this to linker.
# -Map: create map file # -Map: create map file
# --cref: add cross reference to map file # --cref: add cross reference to map file
LDFLAGS = -Wl,-Map=$(TARGET).map,--cref #LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
LDFLAGS += -Wl,--relax LDFLAGS += -Wl,--relax
LDFLAGS += -Wl,--gc-sections LDFLAGS += -Wl,--gc-sections
LDFLAGS += $(EXTMEMOPTS) LDFLAGS += $(EXTMEMOPTS)
@ -445,7 +445,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
# Compiler flags to generate dependency files. # Compiler flags to generate dependency files.
GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d #GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
# Combine all necessary flags and optional flags. # Combine all necessary flags and optional flags.

4
BuildTests/BoardDriverTest/makefile.uc3
Unescape View File

@ -230,7 +230,7 @@ ASFLAGS = $(ADEFS)
# -Wl,...: tell GCC to pass this to linker. # -Wl,...: tell GCC to pass this to linker.
# -Map: create map file # -Map: create map file
# --cref: add cross reference to map file # --cref: add cross reference to map file
LDFLAGS = -Wl,-Map=$(TARGET).map,--cref #LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
LDFLAGS += -Wl,--gc-sections --rodata-writable LDFLAGS += -Wl,--gc-sections --rodata-writable
LDFLAGS += -Wl,--direct-data LDFLAGS += -Wl,--direct-data
#LDFLAGS += -T linker_script.x #LDFLAGS += -T linker_script.x
@ -283,7 +283,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
# Compiler flags to generate dependency files. # Compiler flags to generate dependency files.
GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d #GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
# Combine all necessary flags and optional flags. # Combine all necessary flags and optional flags.

4
BuildTests/BoardDriverTest/makefile.xmega
Unescape View File

@ -303,7 +303,7 @@ EXTMEMOPTS =
# -Wl,...: tell GCC to pass this to linker. # -Wl,...: tell GCC to pass this to linker.
# -Map: create map file # -Map: create map file
# --cref: add cross reference to map file # --cref: add cross reference to map file
LDFLAGS = -Wl,-Map=$(TARGET).map,--cref #LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
LDFLAGS += -Wl,--relax LDFLAGS += -Wl,--relax
LDFLAGS += -Wl,--gc-sections LDFLAGS += -Wl,--gc-sections
LDFLAGS += $(EXTMEMOPTS) LDFLAGS += $(EXTMEMOPTS)
@ -427,7 +427,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
# Compiler flags to generate dependency files. # Compiler flags to generate dependency files.
GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d #GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
# Combine all necessary flags and optional flags. # Combine all necessary flags and optional flags.

4
BuildTests/ModuleTest/makefile.avr8
Unescape View File

@ -339,7 +339,7 @@ EXTMEMOPTS =
# -Wl,...: tell GCC to pass this to linker. # -Wl,...: tell GCC to pass this to linker.
# -Map: create map file # -Map: create map file
# --cref: add cross reference to map file # --cref: add cross reference to map file
LDFLAGS = -Wl,-Map=$(TARGET).map,--cref #LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
LDFLAGS += -Wl,--relax LDFLAGS += -Wl,--relax
LDFLAGS += -Wl,--gc-sections LDFLAGS += -Wl,--gc-sections
LDFLAGS += $(EXTMEMOPTS) LDFLAGS += $(EXTMEMOPTS)
@ -463,7 +463,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
# Compiler flags to generate dependency files. # Compiler flags to generate dependency files.
GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d #GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
# Combine all necessary flags and optional flags. # Combine all necessary flags and optional flags.

4
BuildTests/ModuleTest/makefile.uc3
Unescape View File

@ -257,7 +257,7 @@ ASFLAGS = $(ADEFS)
# -Wl,...: tell GCC to pass this to linker. # -Wl,...: tell GCC to pass this to linker.
# -Map: create map file # -Map: create map file
# --cref: add cross reference to map file # --cref: add cross reference to map file
LDFLAGS = -Wl,-Map=$(TARGET).map,--cref #LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
LDFLAGS += -Wl,--gc-sections --rodata-writable LDFLAGS += -Wl,--gc-sections --rodata-writable
LDFLAGS += -Wl,--direct-data LDFLAGS += -Wl,--direct-data
#LDFLAGS += -T linker_script.x #LDFLAGS += -T linker_script.x
@ -310,7 +310,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
# Compiler flags to generate dependency files. # Compiler flags to generate dependency files.
GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d #GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
# Combine all necessary flags and optional flags. # Combine all necessary flags and optional flags.

4
BuildTests/ModuleTest/makefile.xmega
Unescape View File

@ -331,7 +331,7 @@ EXTMEMOPTS =
# -Wl,...: tell GCC to pass this to linker. # -Wl,...: tell GCC to pass this to linker.
# -Map: create map file # -Map: create map file
# --cref: add cross reference to map file # --cref: add cross reference to map file
LDFLAGS = -Wl,-Map=$(TARGET).map,--cref #LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
LDFLAGS += -Wl,--relax LDFLAGS += -Wl,--relax
LDFLAGS += -Wl,--gc-sections LDFLAGS += -Wl,--gc-sections
LDFLAGS += $(EXTMEMOPTS) LDFLAGS += $(EXTMEMOPTS)
@ -455,7 +455,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
# Compiler flags to generate dependency files. # Compiler flags to generate dependency files.
GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d #GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
# Combine all necessary flags and optional flags. # Combine all necessary flags and optional flags.

4
BuildTests/SingleUSBModeTest/makefile.avr8
Unescape View File

@ -322,7 +322,7 @@ EXTMEMOPTS =
# -Wl,...: tell GCC to pass this to linker. # -Wl,...: tell GCC to pass this to linker.
# -Map: create map file # -Map: create map file
# --cref: add cross reference to map file # --cref: add cross reference to map file
LDFLAGS = -Wl,-Map=$(TARGET).map,--cref #LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
LDFLAGS += -Wl,--relax LDFLAGS += -Wl,--relax
LDFLAGS += -Wl,--gc-sections LDFLAGS += -Wl,--gc-sections
LDFLAGS += $(EXTMEMOPTS) LDFLAGS += $(EXTMEMOPTS)
@ -446,7 +446,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
# Compiler flags to generate dependency files. # Compiler flags to generate dependency files.
GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d #GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
# Combine all necessary flags and optional flags. # Combine all necessary flags and optional flags.

4
BuildTests/SingleUSBModeTest/makefile.uc3
Unescape View File

@ -231,7 +231,7 @@ ASFLAGS = $(ADEFS)
# -Wl,...: tell GCC to pass this to linker. # -Wl,...: tell GCC to pass this to linker.
# -Map: create map file # -Map: create map file
# --cref: add cross reference to map file # --cref: add cross reference to map file
LDFLAGS = -Wl,-Map=$(TARGET).map,--cref #LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
LDFLAGS += -Wl,--gc-sections --rodata-writable LDFLAGS += -Wl,--gc-sections --rodata-writable
LDFLAGS += -Wl,--direct-data LDFLAGS += -Wl,--direct-data
#LDFLAGS += -T linker_script.x #LDFLAGS += -T linker_script.x
@ -284,7 +284,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
# Compiler flags to generate dependency files. # Compiler flags to generate dependency files.
GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d #GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
# Combine all necessary flags and optional flags. # Combine all necessary flags and optional flags.

4
BuildTests/SingleUSBModeTest/makefile.xmega
Unescape View File

@ -304,7 +304,7 @@ EXTMEMOPTS =
# -Wl,...: tell GCC to pass this to linker. # -Wl,...: tell GCC to pass this to linker.
# -Map: create map file # -Map: create map file
# --cref: add cross reference to map file # --cref: add cross reference to map file
LDFLAGS = -Wl,-Map=$(TARGET).map,--cref #LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
LDFLAGS += -Wl,--relax LDFLAGS += -Wl,--relax
LDFLAGS += -Wl,--gc-sections LDFLAGS += -Wl,--gc-sections
LDFLAGS += $(EXTMEMOPTS) LDFLAGS += $(EXTMEMOPTS)
@ -428,7 +428,7 @@ LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OB
# Compiler flags to generate dependency files. # Compiler flags to generate dependency files.
GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d #GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
# Combine all necessary flags and optional flags. # Combine all necessary flags and optional flags.

12
Maintenance/makefile
Unescape View File

@ -40,16 +40,16 @@ make-as4-projects:
source_files="<OTHERFILE>`basename $$project_makefile`<\/OTHERFILE>"; \ source_files="<OTHERFILE>`basename $$project_makefile`<\/OTHERFILE>"; \
gcc_source_files=""; \ gcc_source_files=""; \
for c_source_file in `find $$target_folder -name *.c`; do \ for c_source_file in `find $$target_folder -name *.c`; do \
source_files+="<SOURCEFILE>`basename $$c_source_file`<\/SOURCEFILE>"; \ source_files="$$source_files<SOURCEFILE>`basename $$c_source_file`<\/SOURCEFILE>"; \
gcc_source_files+="<Name>`basename $$c_source_file`<\/Name>"; \ gcc_source_files="$$gcc_source_files<Name>`basename $$c_source_file`<\/Name>"; \
done; \ done; \
for c_header_file in `find $$target_folder -name *.h`; do \ for c_header_file in `find $$target_folder -name *.h`; do \
source_files+="<HEADERFILE>`basename $$c_header_file`<\/HEADERFILE>"; \ source_files="$$source_files<HEADERFILE>`basename $$c_header_file`<\/HEADERFILE>"; \
gcc_source_files+="<Name>`basename $$c_header_file`<\/Name>"; \ gcc_source_files="$$gcc_source_files<Name>`basename $$c_header_file`<\/Name>"; \
done; \ done; \
for assembly_file in `find $$target_folder -name *.S`; do \ for assembly_file in `find $$target_folder -name *.S`; do \
source_files+="<OTHERFILE>`basename $$assembly_file`<\/OTHERFILE>"; \ source_files="$$source_files<OTHERFILE>`basename $$assembly_file`<\/OTHERFILE>"; \
gcc_source_files+="<Name>`basename $$assembly_file`<\/Name>"; \ gcc_source_files="$$gcc_source_files<Name>`basename $$assembly_file`<\/Name>"; \
done; \ done; \
\ \
sed "s/%TARGET%/$$target_name/g" AS4Template.aps > $$target_folder/$$target_name.aps.new; \ sed "s/%TARGET%/$$target_name/g" AS4Template.aps > $$target_folder/$$target_name.aps.new; \

Write Preview
Loading…
Cancel
Save