From 1bedb1b911b271f0a9e2501edeeca29a29e23c96 Mon Sep 17 00:00:00 2001
From: blckmn <blackman@xtra.com.au>
Date: Wed, 20 Feb 2019 18:24:16 +1100
Subject: [PATCH] Moved hal config headers etc to ./src/main/startup

---
 Makefile                                          | 3 ++-
 make/mcu/STM32F3.mk                               | 2 +-
 make/mcu/STM32F4.mk                               | 2 +-
 make/mcu/STM32F7.mk                               | 2 +-
 src/main/{target => startup}/stm32f1xx_hal_conf.h | 0
 src/main/{target => startup}/stm32f3xx_hal_conf.h | 0
 src/main/{target => startup}/stm32f4xx_hal_conf.h | 0
 src/main/{target => startup}/stm32f7xx_hal_conf.h | 0
 src/main/{target => startup}/system_stm32f30x.c   | 0
 src/main/{target => startup}/system_stm32f30x.h   | 0
 src/main/{target => startup}/system_stm32f4xx.c   | 0
 src/main/{target => startup}/system_stm32f4xx.h   | 0
 src/main/{target => startup}/system_stm32f7xx.c   | 0
 src/main/{target => startup}/system_stm32f7xx.h   | 0
 14 files changed, 5 insertions(+), 4 deletions(-)
 rename src/main/{target => startup}/stm32f1xx_hal_conf.h (100%)
 rename src/main/{target => startup}/stm32f3xx_hal_conf.h (100%)
 rename src/main/{target => startup}/stm32f4xx_hal_conf.h (100%)
 rename src/main/{target => startup}/stm32f7xx_hal_conf.h (100%)
 rename src/main/{target => startup}/system_stm32f30x.c (100%)
 rename src/main/{target => startup}/system_stm32f30x.h (100%)
 rename src/main/{target => startup}/system_stm32f4xx.c (100%)
 rename src/main/{target => startup}/system_stm32f4xx.h (100%)
 rename src/main/{target => startup}/system_stm32f7xx.c (100%)
 rename src/main/{target => startup}/system_stm32f7xx.h (100%)

diff --git a/Makefile b/Makefile
index 78d4e775d..360d8da32 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,8 @@ OBJECT_DIR      := $(ROOT)/obj/main
 BIN_DIR         := $(ROOT)/obj
 CMSIS_DIR       := $(ROOT)/lib/main/CMSIS
 INCLUDE_DIRS    := $(SRC_DIR) \
-                   $(ROOT)/src/main/target
+                   $(ROOT)/src/main/target \
+                   $(ROOT)/src/main/startup
 LINKER_DIR      := $(ROOT)/src/main/target/link
 
 ## V                 : Set verbosity level based on the V= parameter
diff --git a/make/mcu/STM32F3.mk b/make/mcu/STM32F3.mk
index 4b60e9172..6e197da33 100644
--- a/make/mcu/STM32F3.mk
+++ b/make/mcu/STM32F3.mk
@@ -75,7 +75,7 @@ VCP_SRC = \
 
 
 MCU_COMMON_SRC = \
-            target/system_stm32f30x.c \
+            startup/system_stm32f30x.c \
             drivers/adc_stm32f30x.c \
             drivers/bus_i2c_stm32f30x.c \
             drivers/bus_spi_stdperiph.c \
diff --git a/make/mcu/STM32F4.mk b/make/mcu/STM32F4.mk
index 206bb6d56..36008efcd 100644
--- a/make/mcu/STM32F4.mk
+++ b/make/mcu/STM32F4.mk
@@ -169,7 +169,7 @@ endif
 DEVICE_FLAGS    += -DHSE_VALUE=$(HSE_VALUE)
 
 MCU_COMMON_SRC = \
-            target/system_stm32f4xx.c \
+            startup/system_stm32f4xx.c \
             drivers/accgyro/accgyro_mpu.c \
             drivers/adc_stm32f4xx.c \
             drivers/bus_i2c_stm32f10x.c \
diff --git a/make/mcu/STM32F7.mk b/make/mcu/STM32F7.mk
index a76667fe0..84d866a8a 100644
--- a/make/mcu/STM32F7.mk
+++ b/make/mcu/STM32F7.mk
@@ -168,7 +168,7 @@ VCP_SRC = \
             drivers/usb_io.c
 
 MCU_COMMON_SRC = \
-            target/system_stm32f7xx.c \
+            startup/system_stm32f7xx.c \
             drivers/accgyro/accgyro_mpu.c \
             drivers/adc_stm32f7xx.c \
             drivers/audio_stm32f7xx.c \
diff --git a/src/main/target/stm32f1xx_hal_conf.h b/src/main/startup/stm32f1xx_hal_conf.h
similarity index 100%
rename from src/main/target/stm32f1xx_hal_conf.h
rename to src/main/startup/stm32f1xx_hal_conf.h
diff --git a/src/main/target/stm32f3xx_hal_conf.h b/src/main/startup/stm32f3xx_hal_conf.h
similarity index 100%
rename from src/main/target/stm32f3xx_hal_conf.h
rename to src/main/startup/stm32f3xx_hal_conf.h
diff --git a/src/main/target/stm32f4xx_hal_conf.h b/src/main/startup/stm32f4xx_hal_conf.h
similarity index 100%
rename from src/main/target/stm32f4xx_hal_conf.h
rename to src/main/startup/stm32f4xx_hal_conf.h
diff --git a/src/main/target/stm32f7xx_hal_conf.h b/src/main/startup/stm32f7xx_hal_conf.h
similarity index 100%
rename from src/main/target/stm32f7xx_hal_conf.h
rename to src/main/startup/stm32f7xx_hal_conf.h
diff --git a/src/main/target/system_stm32f30x.c b/src/main/startup/system_stm32f30x.c
similarity index 100%
rename from src/main/target/system_stm32f30x.c
rename to src/main/startup/system_stm32f30x.c
diff --git a/src/main/target/system_stm32f30x.h b/src/main/startup/system_stm32f30x.h
similarity index 100%
rename from src/main/target/system_stm32f30x.h
rename to src/main/startup/system_stm32f30x.h
diff --git a/src/main/target/system_stm32f4xx.c b/src/main/startup/system_stm32f4xx.c
similarity index 100%
rename from src/main/target/system_stm32f4xx.c
rename to src/main/startup/system_stm32f4xx.c
diff --git a/src/main/target/system_stm32f4xx.h b/src/main/startup/system_stm32f4xx.h
similarity index 100%
rename from src/main/target/system_stm32f4xx.h
rename to src/main/startup/system_stm32f4xx.h
diff --git a/src/main/target/system_stm32f7xx.c b/src/main/startup/system_stm32f7xx.c
similarity index 100%
rename from src/main/target/system_stm32f7xx.c
rename to src/main/startup/system_stm32f7xx.c
diff --git a/src/main/target/system_stm32f7xx.h b/src/main/startup/system_stm32f7xx.h
similarity index 100%
rename from src/main/target/system_stm32f7xx.h
rename to src/main/startup/system_stm32f7xx.h
-- 
2.11.4.GIT