From 8241b0aef6738446a08e4296a7a6e28f0779e937 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Wed, 18 Nov 2020 13:22:19 -0800 Subject: [PATCH] consolidate to common (#1962) --- firmware/hw_layer/ports/stm32/stm32_common.mk | 12 ++++++++++++ .../hw_layer/ports/stm32/stm32f4/hw_ports.mk | 18 +++++------------- .../hw_layer/ports/stm32/stm32f7/hw_ports.mk | 17 ++++------------- 3 files changed, 21 insertions(+), 26 deletions(-) create mode 100644 firmware/hw_layer/ports/stm32/stm32_common.mk diff --git a/firmware/hw_layer/ports/stm32/stm32_common.mk b/firmware/hw_layer/ports/stm32/stm32_common.mk new file mode 100644 index 0000000000..7cea70241b --- /dev/null +++ b/firmware/hw_layer/ports/stm32/stm32_common.mk @@ -0,0 +1,12 @@ +HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb/usbcfg.c \ + $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb/usbconsole.c \ + $(PROJECT_DIR)/hw_layer/ports/stm32/flash_int.c \ + +HW_LAYER_EMS_CPP += \ + $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_pins.cpp \ + $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp \ + $(PROJECT_DIR)/hw_layer/ports/stm32/backup_ram.cpp + +RUSEFIASM = $(PROJECT_DIR)/hw_layer/ports/stm32/rusEfiStartup.S + +HW_INC += $(PROJECT_DIR)/hw_layer/ports/stm32 $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb diff --git a/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk b/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk index 4e18f2fb90..61d1d748c2 100644 --- a/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk +++ b/firmware/hw_layer/ports/stm32/stm32f4/hw_ports.mk @@ -1,14 +1,6 @@ -HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/ports/stm32/flash_int.c \ - $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/stm32f4xx_hal_flash.c \ +include $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.mk + +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/serial_over_usb/usbcfg.c \ - $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb/usbconsole.c - -HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/mpu_util.cpp \ - $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_pins.cpp \ - $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp \ - $(PROJECT_DIR)/hw_layer/ports/stm32/backup_ram.cpp - -RUSEFIASM = $(PROJECT_DIR)/hw_layer/ports/stm32/rusEfiStartup.S - -HW_INC += $(PROJECT_DIR)/hw_layer/ports/stm32 $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb + +HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/mpu_util.cpp diff --git a/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk b/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk index 2b40805f3f..9d50a17fe2 100644 --- a/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk +++ b/firmware/hw_layer/ports/stm32/stm32f7/hw_ports.mk @@ -1,15 +1,6 @@ -HW_LAYER_EGT = $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb/usbcfg.c \ - $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb/usbconsole.c \ - $(PROJECT_DIR)/hw_layer/ports/stm32/flash_int.c \ - $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/stm32f7xx_hal_flash.c \ +include $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.mk + +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 -HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/mpu_util.cpp \ - $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_pins.cpp \ - $(PROJECT_DIR)/hw_layer/ports/stm32/stm32_common.cpp \ - $(PROJECT_DIR)/hw_layer/ports/stm32/backup_ram.cpp - -RUSEFIASM = $(PROJECT_DIR)/hw_layer/ports/stm32/rusEfiStartup.S - -HW_INC += $(PROJECT_DIR)/hw_layer/ports/stm32 $(PROJECT_DIR)/hw_layer/ports/stm32/serial_over_usb - \ No newline at end of file +HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/mpu_util.cpp