From 7b5831247d9fbf2772d6440b47a38bba6c23f0a8 Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Tue, 28 Jun 2016 16:27:04 -0500 Subject: [PATCH] Make the efm32 targets use the common makefile template --- tools/export/gcc_arm_efm32_common.tmpl | 115 ---------------------- tools/export/gcc_arm_efm32gg_stk3700.tmpl | 9 +- tools/export/gcc_arm_efm32hg_stk3400.tmpl | 9 +- tools/export/gcc_arm_efm32lg_stk3600.tmpl | 9 +- tools/export/gcc_arm_efm32pg_stk3401.tmpl | 9 +- tools/export/gcc_arm_efm32wg_stk3800.tmpl | 9 +- tools/export/gcc_arm_efm32zg_stk3200.tmpl | 9 +- 7 files changed, 48 insertions(+), 121 deletions(-) delete mode 100644 tools/export/gcc_arm_efm32_common.tmpl diff --git a/tools/export/gcc_arm_efm32_common.tmpl b/tools/export/gcc_arm_efm32_common.tmpl deleted file mode 100644 index c73a8c3588..0000000000 --- a/tools/export/gcc_arm_efm32_common.tmpl +++ /dev/null @@ -1,115 +0,0 @@ -# This file was automagically generated by mbed.org. For more information, -# see http://mbed.org/handbook/Exporting-to-GCC-ARM-Embedded - -GCC_BIN = -PROJECT = {{name}} -OBJECTS = {% for f in to_be_compiled %}{{f}} {% endfor %} -SYS_OBJECTS = {% for f in object_files %}{{f}} {% endfor %} -INCLUDE_PATHS = {% for p in include_paths %}-I{{p}} {% endfor %} -LIBRARY_PATHS = {% for p in library_paths %}-L{{p}} {% endfor %} -LIBRARIES = {% for lib in libraries %}-l{{lib}} {% endfor %} -LINKER_SCRIPT = {{linker_script}} - -OUT_DIR = bin -OBJ_FOLDER = $(strip $(OUT_DIR))/ - -{%- block additional_variables -%}{% endblock %} - -############################################################################### -AS = $(GCC_BIN)arm-none-eabi-as -CC = $(GCC_BIN)arm-none-eabi-gcc -CPP = $(GCC_BIN)arm-none-eabi-g++ -LD = $(GCC_BIN)arm-none-eabi-gcc -OBJCOPY = $(GCC_BIN)arm-none-eabi-objcopy -OBJDUMP = $(GCC_BIN)arm-none-eabi-objdump -SIZE = $(GCC_BIN)arm-none-eabi-size -{%- block additional_executables -%}{% endblock %} - -{%- block flags -%} - -{% block hardfp %} -{% if "-mfloat-abi=softfp" in cpu_flags %} -ifeq ($(HARDFP),1) - FLOAT_ABI = hard -else - FLOAT_ABI = softfp -endif -{% endif %} -{%- endblock %} - -CPU = {% block cpu %}{% for cf in cpu_flags %}{{cf|replace("-mfloat-abi=softfp","-mfloat-abi=$(FLOAT_ABI)")}} {% endfor %}{% endblock %} -CC_FLAGS = {% block cc_flags %}$(CPU) -c -g -fno-common -fmessage-length=0 -Wall -Wextra -fno-exceptions -ffunction-sections -fdata-sections -fomit-frame-pointer -MMD -MP{% endblock %} -CC_SYMBOLS = {% block cc_symbols %}{% for s in symbols %}-D{{s}} {% endfor %}{% endblock %} - -ifeq ($(DEBUG), 1) - CC_FLAGS += -DDEBUG -O0 -else - CC_FLAGS += -DNDEBUG -Os -endif - -LD_FLAGS = {%- block ld_flags -%} -{%- if "-mcpu=cortex-m0" in cpu_flags or "-mcpu=cortex-m0plus" in cpu_flags -%} -{{ ' ' }}$(CPU) -Wl,--gc-sections --specs=nano.specs -Wl,--wrap,main -Wl,-Map=$(OBJ_FOLDER)$(PROJECT).map,--cref -#LD_FLAGS += -u _printf_float -u _scanf_float -{%- else -%} -{{ ' ' }}$(CPU) -Wl,--gc-sections --specs=nano.specs -u _printf_float -u _scanf_float -Wl,--wrap,main -Wl,-Map=$(OBJ_FOLDER)$(PROJECT).map,--cref -{%- endif -%} -{% endblock %} -LD_SYS_LIBS = {% block ld_sys_libs %}-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys{% endblock %} -{% endblock %} - -.PHONY: all clean lst size - -{% block target_all -%} -all: create_outputdir $(OBJ_FOLDER)$(PROJECT).bin $(OBJ_FOLDER)$(PROJECT).hex size -{% endblock %} - -{% block target_create_outputdir -%} -create_outputdir: - $(shell mkdir $(OBJ_FOLDER) 2>/dev/null) -{% endblock %} - -{% block target_clean -%} -clean: - rm -f $(OBJ_FOLDER)$(PROJECT).bin $(OBJ_FOLDER)$(PROJECT).axf $(OBJ_FOLDER)$(PROJECT).hex $(OBJ_FOLDER)$(PROJECT).map $(PROJECT).lst $(OBJECTS) $(DEPS) -{% endblock %} - -.s.o: - $(AS) $(CPU) -o $@ $< - -.c.o: - $(CC) $(CC_FLAGS) $(CC_SYMBOLS) -std=gnu99 $(INCLUDE_PATHS) -o $@ $< - -.cpp.o: - $(CPP) $(CC_FLAGS) $(CC_SYMBOLS) -std=gnu++98 -fno-rtti $(INCLUDE_PATHS) -o $@ $< - - -{% block target_project_axf %} -$(OBJ_FOLDER)$(PROJECT).axf: $(OBJECTS) $(SYS_OBJECTS) - $(LD) $(LD_FLAGS) -T$(LINKER_SCRIPT) $(LIBRARY_PATHS) -o $@ $^ $(LIBRARIES) $(LD_SYS_LIBS) $(LIBRARIES) $(LD_SYS_LIBS) - @echo "" - @echo "*****" - @echo "***** You must modify vector checksum value in *.bin and *.hex files." - @echo "*****" - @echo "" -{% endblock %} - -$(OBJ_FOLDER)$(PROJECT).bin: $(OBJ_FOLDER)$(PROJECT).axf - @$(OBJCOPY) -O binary $< $@ - -$(OBJ_FOLDER)$(PROJECT).hex: $(OBJ_FOLDER)$(PROJECT).axf - @$(OBJCOPY) -O ihex $< $@ - -$(OBJ_FOLDER)$(PROJECT).lst: $(OBJ_FOLDER)$(PROJECT).axf - @$(OBJDUMP) -Sdh $< > $@ - -lst: $(OBJ_FOLDER)$(PROJECT).lst - -size: $(OBJ_FOLDER)$(PROJECT).axf - $(SIZE) $(OBJ_FOLDER)$(PROJECT).axf - -DEPS = $(OBJECTS:.o=.d) $(SYS_OBJECTS:.o=.d) --include $(DEPS) - -{% block additional_targets %}{% endblock %} - diff --git a/tools/export/gcc_arm_efm32gg_stk3700.tmpl b/tools/export/gcc_arm_efm32gg_stk3700.tmpl index 7187abc9ca..aaec94c186 100644 --- a/tools/export/gcc_arm_efm32gg_stk3700.tmpl +++ b/tools/export/gcc_arm_efm32gg_stk3700.tmpl @@ -1 +1,8 @@ -{% extends "gcc_arm_efm32_common.tmpl" %} +{% extends "gcc_arm_common.tmpl" %} + +{% block target_project_elf %} {{ super() }} @echo "" + @echo "*****" + @echo "***** You must modify vector checksum value in *.bin and *.hex files." + @echo "*****" + @echo "" +{%- endblock %} diff --git a/tools/export/gcc_arm_efm32hg_stk3400.tmpl b/tools/export/gcc_arm_efm32hg_stk3400.tmpl index 7187abc9ca..aaec94c186 100644 --- a/tools/export/gcc_arm_efm32hg_stk3400.tmpl +++ b/tools/export/gcc_arm_efm32hg_stk3400.tmpl @@ -1 +1,8 @@ -{% extends "gcc_arm_efm32_common.tmpl" %} +{% extends "gcc_arm_common.tmpl" %} + +{% block target_project_elf %} {{ super() }} @echo "" + @echo "*****" + @echo "***** You must modify vector checksum value in *.bin and *.hex files." + @echo "*****" + @echo "" +{%- endblock %} diff --git a/tools/export/gcc_arm_efm32lg_stk3600.tmpl b/tools/export/gcc_arm_efm32lg_stk3600.tmpl index 7187abc9ca..aaec94c186 100644 --- a/tools/export/gcc_arm_efm32lg_stk3600.tmpl +++ b/tools/export/gcc_arm_efm32lg_stk3600.tmpl @@ -1 +1,8 @@ -{% extends "gcc_arm_efm32_common.tmpl" %} +{% extends "gcc_arm_common.tmpl" %} + +{% block target_project_elf %} {{ super() }} @echo "" + @echo "*****" + @echo "***** You must modify vector checksum value in *.bin and *.hex files." + @echo "*****" + @echo "" +{%- endblock %} diff --git a/tools/export/gcc_arm_efm32pg_stk3401.tmpl b/tools/export/gcc_arm_efm32pg_stk3401.tmpl index 7187abc9ca..aaec94c186 100644 --- a/tools/export/gcc_arm_efm32pg_stk3401.tmpl +++ b/tools/export/gcc_arm_efm32pg_stk3401.tmpl @@ -1 +1,8 @@ -{% extends "gcc_arm_efm32_common.tmpl" %} +{% extends "gcc_arm_common.tmpl" %} + +{% block target_project_elf %} {{ super() }} @echo "" + @echo "*****" + @echo "***** You must modify vector checksum value in *.bin and *.hex files." + @echo "*****" + @echo "" +{%- endblock %} diff --git a/tools/export/gcc_arm_efm32wg_stk3800.tmpl b/tools/export/gcc_arm_efm32wg_stk3800.tmpl index 7187abc9ca..aaec94c186 100644 --- a/tools/export/gcc_arm_efm32wg_stk3800.tmpl +++ b/tools/export/gcc_arm_efm32wg_stk3800.tmpl @@ -1 +1,8 @@ -{% extends "gcc_arm_efm32_common.tmpl" %} +{% extends "gcc_arm_common.tmpl" %} + +{% block target_project_elf %} {{ super() }} @echo "" + @echo "*****" + @echo "***** You must modify vector checksum value in *.bin and *.hex files." + @echo "*****" + @echo "" +{%- endblock %} diff --git a/tools/export/gcc_arm_efm32zg_stk3200.tmpl b/tools/export/gcc_arm_efm32zg_stk3200.tmpl index 7187abc9ca..aaec94c186 100644 --- a/tools/export/gcc_arm_efm32zg_stk3200.tmpl +++ b/tools/export/gcc_arm_efm32zg_stk3200.tmpl @@ -1 +1,8 @@ -{% extends "gcc_arm_efm32_common.tmpl" %} +{% extends "gcc_arm_common.tmpl" %} + +{% block target_project_elf %} {{ super() }} @echo "" + @echo "*****" + @echo "***** You must modify vector checksum value in *.bin and *.hex files." + @echo "*****" + @echo "" +{%- endblock %}