Now that the MCU directory needs to be included in the search path fo…

…r includes, no need for target.h entry if filenaming is consistent.
betaflight · Feb 21, 2023 · 3e1b4c1 · 3e1b4c1
1 parent da0dea9
commit 3e1b4c1
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 21 deletions.
diff --git a/src/main/drivers/at32/dma_reqmap_mcu.h b/src/main/drivers/at32/dma_reqmap_mcu.h
@@ -24,4 +24,4 @@
 #define MAX_PERIPHERAL_DMA_OPTIONS  14
 #define MAX_TIMER_DMA_OPTIONS       22
 
-#define USE_DMA_MUX
+#define USE_DMA_MUX
diff --git a/src/main/drivers/at32/platform_at32.h → src/main/drivers/at32/platform_mcu.h b/src/main/drivers/at32/platform_at32.h → src/main/drivers/at32/platform_mcu.h
diff --git a/src/main/drivers/stm32/platform_stm32.h → src/main/drivers/stm32/platform_mcu.h b/src/main/drivers/stm32/platform_stm32.h → src/main/drivers/stm32/platform_mcu.h
diff --git a/src/main/platform.h b/src/main/platform.h
@@ -32,6 +32,9 @@
 #include "config.h"
 #endif
 
+// MCU specific platform from drivers/XX
+#include "platform_mcu.h"
+
 #include "target.h"
 #include "target/common_post.h"
 #include "target/common_defaults_post.h"
diff --git a/src/main/target/AT32F435/target.h b/src/main/target/AT32F435/target.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "drivers/at32/platform_at32.h"
-
 #define TARGET_BOARD_IDENTIFIER "A435"
 
 #define USBD_PRODUCT_STRING     "Betaflight AT32F435"

diff --git a/src/main/target/STM32F405/target.h b/src/main/target/STM32F405/target.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "drivers/stm32/platform_stm32.h"
-
 #define TARGET_BOARD_IDENTIFIER "S405"
 
 #define USBD_PRODUCT_STRING     "Betaflight STM32F405"

diff --git a/src/main/target/STM32F411/target.h b/src/main/target/STM32F411/target.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "drivers/stm32/platform_stm32.h"
-
 #define TARGET_BOARD_IDENTIFIER "S411"
 
 #define USBD_PRODUCT_STRING     "Betaflight STM32F411"

diff --git a/src/main/target/STM32F745/target.h b/src/main/target/STM32F745/target.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "drivers/stm32/platform_stm32.h"
-
 #define TARGET_BOARD_IDENTIFIER "S745"
 
 #define USBD_PRODUCT_STRING     "Betaflight STM32F745"

diff --git a/src/main/target/STM32F7X2/target.h b/src/main/target/STM32F7X2/target.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "drivers/stm32/platform_stm32.h"
-
 #define TARGET_BOARD_IDENTIFIER "S7X2"
 
 #define USBD_PRODUCT_STRING     "Betaflight STM32F7x2"

diff --git a/src/main/target/STM32G47X/target.h b/src/main/target/STM32G47X/target.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "drivers/stm32/platform_stm32.h"
-
 #define TARGET_BOARD_IDENTIFIER "SG47"
 
 #define USBD_PRODUCT_STRING     "Betaflight STM32G47x"

diff --git a/src/main/target/STM32H723/target.h b/src/main/target/STM32H723/target.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "drivers/stm32/platform_stm32.h"
-
 #ifndef TARGET_BOARD_IDENTIFIER
 #define TARGET_BOARD_IDENTIFIER "SH72"
 #endif

diff --git a/src/main/target/STM32H730/target.h b/src/main/target/STM32H730/target.h
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include "drivers/stm32/platform_stm32.h"
-
 #ifndef TARGET_BOARD_IDENTIFIER
 #define TARGET_BOARD_IDENTIFIER "S730"
 #endif

diff --git a/src/main/target/STM32H743/target.h b/src/main/target/STM32H743/target.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "drivers/stm32/platform_stm32.h"
-
 #define TARGET_BOARD_IDENTIFIER "SH74"
 
 #define USBD_PRODUCT_STRING     "Betaflight STM32H743"

diff --git a/src/main/target/STM32H750/target.h b/src/main/target/STM32H750/target.h
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include "drivers/stm32/platform_stm32.h"
-
 #ifndef TARGET_BOARD_IDENTIFIER
 #define TARGET_BOARD_IDENTIFIER "S750"
 #endif