rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bootloader (#717) 

* Use hw_stm32.mk

* Fix bootloader
This commit is contained in:
andreika-git 2019-03-29 07:46:48 +02:00 committed by rusefi
parent e53abbe6e5
commit d6ff361743
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/bootloader/!compile_bootloader_405.bat
View File

@ -5,7 +5,7 @@ echo Starting compilation for Prometheus-405
set PROJECT_BOARD=Prometheus set PROJECT_BOARD=Prometheus
set PROMETHEUS_BOARD=405 set PROMETHEUS_BOARD=405
set EXTRA_PARAMS=-DDUMMY -DSTM32F405xx -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_TRACE=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE set EXTRA_PARAMS=-DDUMMY -DSTM32F405xx -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_TRACE=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE
set BOOTLOADER_CODE_DESTINATION_PATH="../Prometheus/469" set BOOTLOADER_CODE_DESTINATION_PATH="../Prometheus/405"
set DEBUG_LEVEL_OPT="-O2" set DEBUG_LEVEL_OPT="-O2"
call !compile_bootloader.bat -r call !compile_bootloader.bat -r

1
firmware/bootloader/src/Makefile
View File

@ -171,7 +171,6 @@ CPPSRC = $(CHCPPSRC) \
$(ENGINES_SRC_CPP) \ $(ENGINES_SRC_CPP) \
$(HW_LAYER_EMS_CPP) \ $(HW_LAYER_EMS_CPP) \
$(HW_SENSORS_SRC) \ $(HW_SENSORS_SRC) \
$(HW_STM32_SRC_CPP) \
$(TUNERSTUDIO_SRC_CPP) \ $(TUNERSTUDIO_SRC_CPP) \
$(CONSOLE_SRC_CPP) \ $(CONSOLE_SRC_CPP) \
$(CONTROLLERS_SENSORS_SRC_CPP) \ $(CONTROLLERS_SENSORS_SRC_CPP) \

9
firmware/hw_layer/hw_layer.mk
View File

@ -36,19 +36,16 @@ HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \
ifeq ($(PROJECT_CPU),ST_STM32F7) ifeq ($(PROJECT_CPU),ST_STM32F7)
HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/stm32f7xx_hal_flash.c \ HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/stm32f7xx_hal_flash.c \
$(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/stm32f7xx_hal_flash_ex.c $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/stm32f7xx_hal_flash_ex.c
HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/mpu_util.cpp \ include $(PROJECT_DIR)/hw_layer/$(CPU_HWLAYER)/hw_stm32.mk
$(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp
endif endif
ifeq ($(PROJECT_CPU),ST_STM32F4) ifeq ($(PROJECT_CPU),ST_STM32F4)
HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/stm32f4xx_hal_flash.c \ HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/stm32f4xx_hal_flash.c \
$(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/stm32f4xx_hal_flash_ex.c $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/stm32f4xx_hal_flash_ex.c
HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/mpu_util.cpp \ include $(PROJECT_DIR)/hw_layer/$(CPU_HWLAYER)/hw_stm32.mk
$(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp
endif endif
ifeq ($(PROJECT_CPU),ST_STM32F1) ifeq ($(PROJECT_CPU),ST_STM32F1)
HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f1/mpu_util.cpp \ include $(PROJECT_DIR)/hw_layer/$(CPU_HWLAYER)/hw_stm32.mk
$(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp
endif endif

3
firmware/hw_layer/ports/stm32/stm32f1/hw_stm32.mk Normal file
View File

@ -0,0 +1,3 @@
HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f1/mpu_util.cpp \
$(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp

4
firmware/hw_layer/ports/stm32/stm32f4/hw_stm32.mk
View File

@ -1,4 +1,4 @@
HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/mpu_util.cpp \
HW_STM32_SRC_CPP = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/mpu_util.cpp $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp

4
firmware/hw_layer/ports/stm32/stm32f7/hw_stm32.mk
View File

@ -1,4 +1,4 @@
HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/mpu_util.cpp \
HW_STM32_SRC_CPP = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/mpu_util.cpp $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp