Added .mk as files with LF line ending. Converted a few files in the …

…make dir.

.gitattributes

@@ -8,6 +8,7 @@
 *.elf -crlf -diff
 *.ld text eol=lf
 Makefile text eol=lf
+*.mk text eol=lf
 *.bat eol=crlf
 *.txt text eol=lf
 *.sh text eol=lf

make/mcu/SITL.mk

@@ -1,68 +1,68 @@
-
-INCLUDE_DIRS    := $(INCLUDE_DIRS) \
-                   $(ROOT)/lib/main/dyad
-
-MCU_COMMON_SRC  := $(ROOT)/lib/main/dyad/dyad.c
-
-#Flags
-ARCH_FLAGS      =
-DEVICE_FLAGS    =
-LD_SCRIPT       = src/main/target/SITL/parameter_group.ld
-STARTUP_SRC     =
-
-TARGET_FLAGS    = -D$(TARGET)
-TARGET_FLASH   := 2048
-
-ARM_SDK_PREFIX  =
-
-MCU_EXCLUDES = \
-            drivers/adc.c \
-            drivers/bus_i2c.c \
-            drivers/bus_i2c_config.c \
-            drivers/bus_spi.c \
-            drivers/bus_spi_config.c \
-            drivers/bus_spi_pinconfig.c \
-            drivers/dma.c \
-            drivers/pwm_output.c \
-            drivers/timer.c \
-            drivers/system.c \
-            drivers/rcc.c \
-            drivers/serial_escserial.c \
-            drivers/serial_pinconfig.c \
-            drivers/serial_uart.c \
-            drivers/serial_uart_init.c \
-            drivers/serial_uart_pinconfig.c \
-            drivers/rx_xn297.c \
-            drivers/display_ug2864hsweg01.c \
-            telemetry/crsf.c \
-            telemetry/srxl.c \
-            io/displayport_oled.c
-
-TARGET_MAP  = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET).map
-
-LD_FLAGS    := \
-              -lm \
-              -lpthread \
-              -lc \
-              -lrt \
-              $(ARCH_FLAGS) \
-              $(LTO_FLAGS) \
-              $(DEBUG_FLAGS) \
-              -Wl,-gc-sections,-Map,$(TARGET_MAP) \
-              -Wl,-L$(LINKER_DIR) \
-              -Wl,--cref \
-              -T$(LD_SCRIPT)
-
-ifneq ($(filter SITL_STATIC,$(OPTIONS)),)
-LD_FLAGS     += \
-              -static \
-              -static-libgcc
-endif
-
-ifneq ($(DEBUG),GDB)
-OPTIMISE_DEFAULT    := -Ofast
-OPTIMISE_SPEED      := -Ofast
-OPTIMISE_SIZE       := -Os
-
-LTO_FLAGS           := $(OPTIMISATION_BASE) $(OPTIMISE_SPEED)
-endif
+
+INCLUDE_DIRS    := $(INCLUDE_DIRS) \
+                   $(ROOT)/lib/main/dyad
+
+MCU_COMMON_SRC  := $(ROOT)/lib/main/dyad/dyad.c
+
+#Flags
+ARCH_FLAGS      =
+DEVICE_FLAGS    =
+LD_SCRIPT       = src/main/target/SITL/parameter_group.ld
+STARTUP_SRC     =
+
+TARGET_FLAGS    = -D$(TARGET)
+TARGET_FLASH   := 2048
+
+ARM_SDK_PREFIX  =
+
+MCU_EXCLUDES = \
+            drivers/adc.c \
+            drivers/bus_i2c.c \
+            drivers/bus_i2c_config.c \
+            drivers/bus_spi.c \
+            drivers/bus_spi_config.c \
+            drivers/bus_spi_pinconfig.c \
+            drivers/dma.c \
+            drivers/pwm_output.c \
+            drivers/timer.c \
+            drivers/system.c \
+            drivers/rcc.c \
+            drivers/serial_escserial.c \
+            drivers/serial_pinconfig.c \
+            drivers/serial_uart.c \
+            drivers/serial_uart_init.c \
+            drivers/serial_uart_pinconfig.c \
+            drivers/rx_xn297.c \
+            drivers/display_ug2864hsweg01.c \
+            telemetry/crsf.c \
+            telemetry/srxl.c \
+            io/displayport_oled.c
+
+TARGET_MAP  = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET).map
+
+LD_FLAGS    := \
+              -lm \
+              -lpthread \
+              -lc \
+              -lrt \
+              $(ARCH_FLAGS) \
+              $(LTO_FLAGS) \
+              $(DEBUG_FLAGS) \
+              -Wl,-gc-sections,-Map,$(TARGET_MAP) \
+              -Wl,-L$(LINKER_DIR) \
+              -Wl,--cref \
+              -T$(LD_SCRIPT)
+
+ifneq ($(filter SITL_STATIC,$(OPTIONS)),)
+LD_FLAGS     += \
+              -static \
+              -static-libgcc
+endif
+
+ifneq ($(DEBUG),GDB)
+OPTIMISE_DEFAULT    := -Ofast
+OPTIMISE_SPEED      := -Ofast
+OPTIMISE_SIZE       := -Os
+
+LTO_FLAGS           := $(OPTIMISATION_BASE) $(OPTIMISE_SPEED)
+endif

make/mcu/STM32F1.mk

@@ -1,80 +1,80 @@
-#
-# F4 Make file include
-#
-
-ifeq ($(OPBL),yes)
-LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f103_$(FLASH_SIZE)k_opbl.ld
-endif
-
-TARGET_FLASH   := 128
-STDPERIPH_DIR   = $(ROOT)/lib/main/STM32F1/Drivers/STM32F10x_StdPeriph_Driver
-STDPERIPH_SRC   = $(notdir $(wildcard $(STDPERIPH_DIR)/src/*.c))
-EXCLUDES        = stm32f10x_crc.c \
-                  stm32f10x_cec.c \
-                  stm32f10x_can.c
-STARTUP_SRC     = startup_stm32f10x_md_gcc.S
-STDPERIPH_SRC   := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC))
-
-# Search path and source files for the CMSIS sources
-VPATH           := $(VPATH):$(CMSIS_DIR)/CM3/CoreSupport:$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x
-CMSIS_SRC       = $(notdir $(wildcard $(CMSIS_DIR)/CM3/CoreSupport/*.c \
-                  $(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x/*.c))
-
-INCLUDE_DIRS    := $(INCLUDE_DIRS) \
-                   $(STDPERIPH_DIR)/inc \
-                   $(CMSIS_DIR)/CM3/CoreSupport \
-                   $(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x
-
-DEVICE_STDPERIPH_SRC = $(STDPERIPH_SRC)
-
-ifneq ($(filter VCP, $(FEATURES)),)
-INCLUDE_DIRS    := $(INCLUDE_DIRS) \
-                   $(USBFS_DIR)/inc \
-                   $(ROOT)/src/main/vcp
-
-VPATH           := $(VPATH):$(USBFS_DIR)/src
-
-DEVICE_STDPERIPH_SRC := $(DEVICE_STDPERIPH_SRC) \
-                        $(USBPERIPH_SRC)
-
-endif
-
-LD_SCRIPT       = $(LINKER_DIR)/stm32_flash_f103_$(FLASH_SIZE)k.ld
-ARCH_FLAGS      = -mthumb -mcpu=cortex-m3
-
-ifeq ($(DEVICE_FLAGS),)
-DEVICE_FLAGS    = -DSTM32F10X_MD
-endif
-DEVICE_FLAGS   += -DSTM32F10X
-
-VCP_SRC = \
-            vcp/hw_config.c \
-            vcp/stm32_it.c \
-            vcp/usb_desc.c \
-            vcp/usb_endp.c \
-            vcp/usb_istr.c \
-            vcp/usb_prop.c \
-            vcp/usb_pwr.c \
-            drivers/serial_usb_vcp.c \
-            drivers/usb_io.c
-
-MCU_COMMON_SRC = \
-            drivers/adc_stm32f10x.c \
-            drivers/bus_i2c_stm32f10x.c \
-            drivers/dma.c \
-            drivers/inverter.c \
-            drivers/light_ws2811strip_stdperiph.c \
-            drivers/serial_uart_init.c \
-            drivers/serial_uart_stm32f10x.c \
-            drivers/system_stm32f10x.c \
-            drivers/timer_stm32f10x.c
-
-DSP_LIB :=
-
-ifneq ($(DEBUG),GDB)
-OPTIMISE_DEFAULT    := -Os
-OPTIMISE_SPEED      :=
-OPTIMISE_SIZE       :=
-
-LTO_FLAGS           := $(OPTIMISATION_BASE) $(OPTIMISE_DEFAULT)
-endif
+#
+# F4 Make file include
+#
+
+ifeq ($(OPBL),yes)
+LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f103_$(FLASH_SIZE)k_opbl.ld
+endif
+
+TARGET_FLASH   := 128
+STDPERIPH_DIR   = $(ROOT)/lib/main/STM32F1/Drivers/STM32F10x_StdPeriph_Driver
+STDPERIPH_SRC   = $(notdir $(wildcard $(STDPERIPH_DIR)/src/*.c))
+EXCLUDES        = stm32f10x_crc.c \
+                  stm32f10x_cec.c \
+                  stm32f10x_can.c
+STARTUP_SRC     = startup_stm32f10x_md_gcc.S
+STDPERIPH_SRC   := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC))
+
+# Search path and source files for the CMSIS sources
+VPATH           := $(VPATH):$(CMSIS_DIR)/CM3/CoreSupport:$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x
+CMSIS_SRC       = $(notdir $(wildcard $(CMSIS_DIR)/CM3/CoreSupport/*.c \
+                  $(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x/*.c))
+
+INCLUDE_DIRS    := $(INCLUDE_DIRS) \
+                   $(STDPERIPH_DIR)/inc \
+                   $(CMSIS_DIR)/CM3/CoreSupport \
+                   $(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x
+
+DEVICE_STDPERIPH_SRC = $(STDPERIPH_SRC)
+
+ifneq ($(filter VCP, $(FEATURES)),)
+INCLUDE_DIRS    := $(INCLUDE_DIRS) \
+                   $(USBFS_DIR)/inc \
+                   $(ROOT)/src/main/vcp
+
+VPATH           := $(VPATH):$(USBFS_DIR)/src
+
+DEVICE_STDPERIPH_SRC := $(DEVICE_STDPERIPH_SRC) \
+                        $(USBPERIPH_SRC)
+
+endif
+
+LD_SCRIPT       = $(LINKER_DIR)/stm32_flash_f103_$(FLASH_SIZE)k.ld
+ARCH_FLAGS      = -mthumb -mcpu=cortex-m3
+
+ifeq ($(DEVICE_FLAGS),)
+DEVICE_FLAGS    = -DSTM32F10X_MD
+endif
+DEVICE_FLAGS   += -DSTM32F10X
+
+VCP_SRC = \
+            vcp/hw_config.c \
+            vcp/stm32_it.c \
+            vcp/usb_desc.c \
+            vcp/usb_endp.c \
+            vcp/usb_istr.c \
+            vcp/usb_prop.c \
+            vcp/usb_pwr.c \
+            drivers/serial_usb_vcp.c \
+            drivers/usb_io.c
+
+MCU_COMMON_SRC = \
+            drivers/adc_stm32f10x.c \
+            drivers/bus_i2c_stm32f10x.c \
+            drivers/dma.c \
+            drivers/inverter.c \
+            drivers/light_ws2811strip_stdperiph.c \
+            drivers/serial_uart_init.c \
+            drivers/serial_uart_stm32f10x.c \
+            drivers/system_stm32f10x.c \
+            drivers/timer_stm32f10x.c
+
+DSP_LIB :=
+
+ifneq ($(DEBUG),GDB)
+OPTIMISE_DEFAULT    := -Os
+OPTIMISE_SPEED      :=
+OPTIMISE_SIZE       :=
+
+LTO_FLAGS           := $(OPTIMISATION_BASE) $(OPTIMISE_DEFAULT)
+endif