diff --git a/firmware/Makefile b/firmware/Makefile index b345464590..eeccc2f3e4 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -238,7 +238,7 @@ CSRC = check.c \ $(DEV_SRC) \ $(BOOTLOADERSRC) \ ${HW_MASS_STORAGE_SRC_C} \ - $(HW_LAYER_EMS) \ + $(HW_LAYER_PORT) \ $(HW_LAYER_DRIVERS_CORE) \ $(HW_LAYER_DRIVERS) \ $(RUSEFI_LIB_C) \ diff --git a/firmware/bootloader/src/Makefile b/firmware/bootloader/src/Makefile index f11a3abf82..6fdec21185 100644 --- a/firmware/bootloader/src/Makefile +++ b/firmware/bootloader/src/Makefile @@ -174,7 +174,7 @@ include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk CSRC = $(ALLCSRC) \ $(BOARDSRC) \ $(DEV_SRC) \ - $(HW_LAYER_EMS) \ + $(HW_LAYER_PORT) \ $(HW_LAYER_DRIVERS_CORE) \ $(FATFSSRC) \ @@ -182,7 +182,7 @@ CSRC = $(ALLCSRC) \ # todo: reduce code duplication with primary Makefile!!! # setting. CPPSRC = $(ALLCPPSRC) \ - $(HW_LAYER_EMS_CPP) \ + $(HW_LAYER_PORT_CPP) \ $(BOARDCPPSRC) \ $(HW_SENSORS_SRC) \ $(TUNERSTUDIO_SRC_CPP) \ diff --git a/firmware/common.mk b/firmware/common.mk index c43489ce61..03dc6e970c 100644 --- a/firmware/common.mk +++ b/firmware/common.mk @@ -19,7 +19,7 @@ ALLCPPSRC += \ $(CONTROLLERS_ALGO_SRC_CPP) \ $(CONTROLLERS_SENSORS_SRC_CPP) \ $(TUNERSTUDIO_SRC_CPP) \ - $(HW_LAYER_EMS_CPP) \ + $(HW_LAYER_PORT_CPP) \ $(HW_SENSORS_CPP) \ $(SYSTEMSRC_CPP) \ $(UTILSRC_CPP) \ diff --git a/firmware/hw_layer/hw_layer.mk b/firmware/hw_layer/hw_layer.mk index c051ff370e..156eda10eb 100644 --- a/firmware/hw_layer/hw_layer.mk +++ b/firmware/hw_layer/hw_layer.mk @@ -7,7 +7,7 @@ HW_LAYER_INC= $(PROJECT_DIR)/hw_layer $(PROJECT_DIR)/hw_layer/adc \ HW_INC = hw_layer/$(CPU_HWLAYER) \ $(PROJECT_DIR)/hw_layer/ports -HW_LAYER_EMS_CPP = \ +HW_LAYER_PORT_CPP = \ $(PROJECT_DIR)/hw_layer/pin_repository.cpp \ $(PROJECT_DIR)/hw_layer/microsecond_timer/microsecond_timer.cpp \ $(PROJECT_DIR)/hw_layer/digital_input/digital_input_exti.cpp \ @@ -32,7 +32,7 @@ HW_LAYER_EMS_CPP = \ $(PROJECT_DIR)/hw_layer/adc/mcp3208.cpp ifeq ($(USE_OPENBLT),yes) - HW_LAYER_EMS += \ + HW_LAYER_PORT += \ $(PROJECT_DIR)/hw_layer/openblt/shared_params.c endif diff --git a/firmware/hw_layer/ports/cypress/hw_ports.mk b/firmware/hw_layer/ports/cypress/hw_ports.mk index f99776dc3e..a22ee5bda3 100644 --- a/firmware/hw_layer/ports/cypress/hw_ports.mk +++ b/firmware/hw_layer/ports/cypress/hw_ports.mk @@ -2,7 +2,7 @@ ifeq ($(CYPRESS_CONTRIB),) CYPRESS_CONTRIB = $(CHIBIOS_CONTRIB) endif -HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/cypress/mpu_util.cpp \ +HW_LAYER_PORT_CPP += $(PROJECT_DIR)/hw_layer/ports/cypress/mpu_util.cpp \ $(PROJECT_DIR)/hw_layer/ports/cypress/cypress_pins.cpp \ $(PROJECT_DIR)/hw_layer/ports/cypress/cypress_common.cpp \ $(PROJECT_DIR)/hw_layer/ports/cypress/backup_ram.cpp \ diff --git a/firmware/hw_layer/ports/kinetis/hw_ports.mk b/firmware/hw_layer/ports/kinetis/hw_ports.mk index bb190f6214..e8419eea2a 100644 --- a/firmware/hw_layer/ports/kinetis/hw_ports.mk +++ b/firmware/hw_layer/ports/kinetis/hw_ports.mk @@ -2,10 +2,10 @@ ifeq ($(KINETIS_CONTRIB),) KINETIS_CONTRIB = $(CHIBIOS_CONTRIB) endif -HW_LAYER_EMS += $(KINETIS_CONTRIB)/os/hal/ports/KINETIS/KE1xF/fsl/fsl_ftfx_flexnvm.c \ +HW_LAYER_PORT += $(KINETIS_CONTRIB)/os/hal/ports/KINETIS/KE1xF/fsl/fsl_ftfx_flexnvm.c \ $(KINETIS_CONTRIB)/os/hal/ports/KINETIS/KE1xF/fsl/fsl_ftfx_controller.c -HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/kinetis/mpu_util.cpp \ +HW_LAYER_PORT_CPP += $(PROJECT_DIR)/hw_layer/ports/kinetis/mpu_util.cpp \ $(PROJECT_DIR)/hw_layer/ports/kinetis/kinetis_pins.cpp \ $(PROJECT_DIR)/hw_layer/ports/kinetis/backup_ram.cpp \ $(PROJECT_DIR)/hw_layer/ports/kinetis/kinetis_common.cpp \ diff --git a/firmware/hw_layer/ports/stm32/stm32_common.mk b/firmware/hw_layer/ports/stm32/stm32_common.mk index 3b8de03a58..5ecd7237f0 100644 --- a/firmware/hw_layer/ports/stm32/stm32_common.mk +++ b/firmware/hw_layer/ports/stm32/stm32_common.mk @@ -1,6 +1,6 @@ HW_STM32_PORT_DIR = $(PROJECT_DIR)/hw_layer/ports/stm32 -HW_LAYER_EMS_CPP += \ +HW_LAYER_PORT_CPP += \ $(HW_STM32_PORT_DIR)/serial_over_usb/usbconsole.cpp \ $(HW_STM32_PORT_DIR)/stm32_pins.cpp \ $(HW_STM32_PORT_DIR)/stm32_common.cpp \ diff --git a/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk b/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk index 906f3ea3a5..391fcc5ba2 100644 --- a/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk +++ b/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk @@ -1,9 +1,9 @@ include $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.mk -HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/stm32f4xx_hal_flash.c \ +HW_LAYER_PORT += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/stm32f4xx_hal_flash.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 \ +HW_LAYER_PORT_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/mpu_util.cpp \ $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_adc_v2.cpp MCU = cortex-m4 diff --git a/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk b/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk index 2f77f2a97f..6737733d5d 100644 --- a/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk +++ b/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk @@ -1,9 +1,9 @@ include $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.mk -HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/stm32f7xx_hal_flash.c \ +HW_LAYER_PORT += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/stm32f7xx_hal_flash.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 \ +HW_LAYER_PORT_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/mpu_util.cpp \ $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_adc_v2.cpp \ # This MCU has a cache, align functions to a cache line for maximum cache efficiency diff --git a/firmware/hw_layer/ports/stm32/stm32h7/hw_ports.mk b/firmware/hw_layer/ports/stm32/stm32h7/hw_ports.mk index d37aa244e7..a031c8f7c0 100644 --- a/firmware/hw_layer/ports/stm32/stm32h7/hw_ports.mk +++ b/firmware/hw_layer/ports/stm32/stm32h7/hw_ports.mk @@ -1,9 +1,9 @@ include $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.mk -HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32h7/stm32h7xx_hal_flash.c \ +HW_LAYER_PORT += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32h7/stm32h7xx_hal_flash.c \ $(PROJECT_DIR)/hw_layer/ports/stm32/stm32h7/stm32h7xx_hal_flash_ex.c -HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32h7/mpu_util.cpp \ +HW_LAYER_PORT_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32h7/mpu_util.cpp \ $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_adc_v4.cpp \ # This MCU has a cache, align functions to a cache line for maximum cache efficiency