Subversion Repositories EDIS_Ignition

Rev

Rev 18 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 18 Rev 19
Line 18... Line 18...
18 
 
 18 
 
19 
######################################
 19 
######################################
20 
# building variables
 20 
# building variables
21 
######################################
 21 
######################################
22 
# debug build?
 22 
# debug build?
23 
DEBUG = 0
 23 
DEBUG = 1
24 
# optimization
 24 
# optimization
25 
OPT = -Os
 25 
OPT = -Os
26 
 
 26 
 
27 
#######################################
 27 
#######################################
28 
# paths
 28 
# paths
Line 61... Line 61...
61 
User/Src/nvram.c \
 61 
User/Src/nvram.c \
62 
User/Src/saveTiming.c
 62 
User/Src/saveTiming.c
63 
 
 63 
 
64 
# ASM sources
 64 
# ASM sources
65 
ASM_SOURCES =  \
 65 
ASM_SOURCES =  \
66 
startup_stm32f103xb.s
 66 
startup_stm32f103x6.s
67 
 
 67 
 
68 
 
 68 
 
69 
#######################################
 69 
#######################################
70 
# binaries
 70 
# binaries
71 
#######################################
 71 
#######################################
Line 124... Line 124...
124 
-IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \
 124 
-IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \
125 
-IDrivers/CMSIS/Device/ST/STM32F1xx/Include \
 125 
-IDrivers/CMSIS/Device/ST/STM32F1xx/Include \
126 
-IDrivers/CMSIS/Include \
 126 
-IDrivers/CMSIS/Include \
127 
-IUser/Inc \
 127 
-IUser/Inc \
128 
-IUser
 128 
-IUser
- 
 
 129 
#######################################
- 
 
 130 
# LDFLAGS
- 
 
 131 
#######################################
- 
 
 132 
# link script
- 
 
 133 
LDSCRIPT = STM32F103C6Tx_FLASH.ld
- 
 
 134 
 
- 
 
 135 
# libraries
- 
 
 136 
LIBS = -lc -lm -lnosys
- 
 
 137 
LIBDIR =
129 
 
 138 
 
130 
#############################################
 139 
#############################################
131 
# User added
140 
# User added
132 
# CPP_SOURCES += user/Src/splash.cpp
 141 
# CPP_SOURCES += user/Src/splash.cpp
133 
CPP_SOURCES += user/Src/display.cpp
 142 
CPP_SOURCES += user/Src/display.cpp
Line 173... Line 182...
173 
 
 182 
 
174 
# Generate dependency information
 183 
# Generate dependency information
175 
CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)"
 184 
CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)"
176 
 
 185 
 
177 
 
 186 
 
178 
#######################################
 - 
 
179 
# LDFLAGS
 - 
 
180 
#######################################
 - 
 
181 
# link script
 - 
 
182 
LDSCRIPT = STM32F103C6Tx_FLASH.ld
 - 
 
183 
 
 - 
 
184 
# libraries
 - 
 
185 
LIBS = -lc -lm -lnosys
- 
 
186 
LIBDIR =
- 
 
187 
LDFLAGS = $(MCU) -specs=nano.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections
 187 
LDFLAGS = $(MCU) -specs=nano.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections
188 
 
 188 
 
189 
# default action: build all
 189 
# default action: build all
190 
all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin
 190 
all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin
191 
 
 191 
 
Line 201... Line 201...
201 
vpath %.s $(sort $(dir $(ASM_SOURCES)))
 201 
vpath %.s $(sort $(dir $(ASM_SOURCES)))
202 
## User added List of C++ compiled objects
202 
## User added List of C++ compiled objects
203 
OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(CPP_SOURCES:.cpp=.o)))
 203 
OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(CPP_SOURCES:.cpp=.o)))
204 
vpath %.cpp $(sort $(dir $(CPP_SOURCES)))
 204 
vpath %.cpp $(sort $(dir $(CPP_SOURCES)))
205 
 
 205 
 
- 
 
 206 
 
206 
## User added C++ compilation rule
 207 
## User added C++ compilation rule
207 
$(BUILD_DIR)/%.o: %.cpp Makefile | $(BUILD_DIR)
208 
$(BUILD_DIR)/%.o: %.cpp Makefile | $(BUILD_DIR)
208 
	$(CXX) -c $(CXXFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
 209 
	$(CXX) -c $(CXXFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
209 
 
 210 
 
210 
$(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
211 
$(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)