Skip to content

Commit 24a282a

Browse files
AndersHoglundAndersHoglund
committed
Added .mk as files with LF line ending. Converted a few files in the make dir.
1 parent bee8689 commit 24a282a

File tree

8 files changed

+1100
-1099
lines changed

8 files changed

+1100
-1099
lines changed

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*.elf -crlf -diff
99
*.ld text eol=lf
1010
Makefile text eol=lf
11+
*.mk text eol=lf
1112
*.bat eol=crlf
1213
*.txt text eol=lf
1314
*.sh text eol=lf

‎make/mcu/SITL.mk

+68-68
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
1-
2-
INCLUDE_DIRS := $(INCLUDE_DIRS) \
3-
$(ROOT)/lib/main/dyad
4-
5-
MCU_COMMON_SRC := $(ROOT)/lib/main/dyad/dyad.c
6-
7-
#Flags
8-
ARCH_FLAGS =
9-
DEVICE_FLAGS =
10-
LD_SCRIPT = src/main/target/SITL/parameter_group.ld
11-
STARTUP_SRC =
12-
13-
TARGET_FLAGS = -D$(TARGET)
14-
TARGET_FLASH := 2048
15-
16-
ARM_SDK_PREFIX =
17-
18-
MCU_EXCLUDES = \
19-
drivers/adc.c \
20-
drivers/bus_i2c.c \
21-
drivers/bus_i2c_config.c \
22-
drivers/bus_spi.c \
23-
drivers/bus_spi_config.c \
24-
drivers/bus_spi_pinconfig.c \
25-
drivers/dma.c \
26-
drivers/pwm_output.c \
27-
drivers/timer.c \
28-
drivers/system.c \
29-
drivers/rcc.c \
30-
drivers/serial_escserial.c \
31-
drivers/serial_pinconfig.c \
32-
drivers/serial_uart.c \
33-
drivers/serial_uart_init.c \
34-
drivers/serial_uart_pinconfig.c \
35-
drivers/rx_xn297.c \
36-
drivers/display_ug2864hsweg01.c \
37-
telemetry/crsf.c \
38-
telemetry/srxl.c \
39-
io/displayport_oled.c
40-
41-
TARGET_MAP = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET).map
42-
43-
LD_FLAGS := \
44-
-lm \
45-
-lpthread \
46-
-lc \
47-
-lrt \
48-
$(ARCH_FLAGS) \
49-
$(LTO_FLAGS) \
50-
$(DEBUG_FLAGS) \
51-
-Wl,-gc-sections,-Map,$(TARGET_MAP) \
52-
-Wl,-L$(LINKER_DIR) \
53-
-Wl,--cref \
54-
-T$(LD_SCRIPT)
55-
56-
ifneq ($(filter SITL_STATIC,$(OPTIONS)),)
57-
LD_FLAGS += \
58-
-static \
59-
-static-libgcc
60-
endif
61-
62-
ifneq ($(DEBUG),GDB)
63-
OPTIMISE_DEFAULT := -Ofast
64-
OPTIMISE_SPEED := -Ofast
65-
OPTIMISE_SIZE := -Os
66-
67-
LTO_FLAGS := $(OPTIMISATION_BASE) $(OPTIMISE_SPEED)
68-
endif
1+
2+
INCLUDE_DIRS := $(INCLUDE_DIRS) \
3+
$(ROOT)/lib/main/dyad
4+
5+
MCU_COMMON_SRC := $(ROOT)/lib/main/dyad/dyad.c
6+
7+
#Flags
8+
ARCH_FLAGS =
9+
DEVICE_FLAGS =
10+
LD_SCRIPT = src/main/target/SITL/parameter_group.ld
11+
STARTUP_SRC =
12+
13+
TARGET_FLAGS = -D$(TARGET)
14+
TARGET_FLASH := 2048
15+
16+
ARM_SDK_PREFIX =
17+
18+
MCU_EXCLUDES = \
19+
drivers/adc.c \
20+
drivers/bus_i2c.c \
21+
drivers/bus_i2c_config.c \
22+
drivers/bus_spi.c \
23+
drivers/bus_spi_config.c \
24+
drivers/bus_spi_pinconfig.c \
25+
drivers/dma.c \
26+
drivers/pwm_output.c \
27+
drivers/timer.c \
28+
drivers/system.c \
29+
drivers/rcc.c \
30+
drivers/serial_escserial.c \
31+
drivers/serial_pinconfig.c \
32+
drivers/serial_uart.c \
33+
drivers/serial_uart_init.c \
34+
drivers/serial_uart_pinconfig.c \
35+
drivers/rx_xn297.c \
36+
drivers/display_ug2864hsweg01.c \
37+
telemetry/crsf.c \
38+
telemetry/srxl.c \
39+
io/displayport_oled.c
40+
41+
TARGET_MAP = $(OBJECT_DIR)/$(FORKNAME)_$(TARGET).map
42+
43+
LD_FLAGS := \
44+
-lm \
45+
-lpthread \
46+
-lc \
47+
-lrt \
48+
$(ARCH_FLAGS) \
49+
$(LTO_FLAGS) \
50+
$(DEBUG_FLAGS) \
51+
-Wl,-gc-sections,-Map,$(TARGET_MAP) \
52+
-Wl,-L$(LINKER_DIR) \
53+
-Wl,--cref \
54+
-T$(LD_SCRIPT)
55+
56+
ifneq ($(filter SITL_STATIC,$(OPTIONS)),)
57+
LD_FLAGS += \
58+
-static \
59+
-static-libgcc
60+
endif
61+
62+
ifneq ($(DEBUG),GDB)
63+
OPTIMISE_DEFAULT := -Ofast
64+
OPTIMISE_SPEED := -Ofast
65+
OPTIMISE_SIZE := -Os
66+
67+
LTO_FLAGS := $(OPTIMISATION_BASE) $(OPTIMISE_SPEED)
68+
endif

‎make/mcu/STM32F1.mk

+80-80
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
1-
#
2-
# F4 Make file include
3-
#
4-
5-
ifeq ($(OPBL),yes)
6-
LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f103_$(FLASH_SIZE)k_opbl.ld
7-
endif
8-
9-
TARGET_FLASH := 128
10-
STDPERIPH_DIR = $(ROOT)/lib/main/STM32F1/Drivers/STM32F10x_StdPeriph_Driver
11-
STDPERIPH_SRC = $(notdir $(wildcard $(STDPERIPH_DIR)/src/*.c))
12-
EXCLUDES = stm32f10x_crc.c \
13-
stm32f10x_cec.c \
14-
stm32f10x_can.c
15-
STARTUP_SRC = startup_stm32f10x_md_gcc.S
16-
STDPERIPH_SRC := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC))
17-
18-
# Search path and source files for the CMSIS sources
19-
VPATH := $(VPATH):$(CMSIS_DIR)/CM3/CoreSupport:$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x
20-
CMSIS_SRC = $(notdir $(wildcard $(CMSIS_DIR)/CM3/CoreSupport/*.c \
21-
$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x/*.c))
22-
23-
INCLUDE_DIRS := $(INCLUDE_DIRS) \
24-
$(STDPERIPH_DIR)/inc \
25-
$(CMSIS_DIR)/CM3/CoreSupport \
26-
$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x
27-
28-
DEVICE_STDPERIPH_SRC = $(STDPERIPH_SRC)
29-
30-
ifneq ($(filter VCP, $(FEATURES)),)
31-
INCLUDE_DIRS := $(INCLUDE_DIRS) \
32-
$(USBFS_DIR)/inc \
33-
$(ROOT)/src/main/vcp
34-
35-
VPATH := $(VPATH):$(USBFS_DIR)/src
36-
37-
DEVICE_STDPERIPH_SRC := $(DEVICE_STDPERIPH_SRC) \
38-
$(USBPERIPH_SRC)
39-
40-
endif
41-
42-
LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f103_$(FLASH_SIZE)k.ld
43-
ARCH_FLAGS = -mthumb -mcpu=cortex-m3
44-
45-
ifeq ($(DEVICE_FLAGS),)
46-
DEVICE_FLAGS = -DSTM32F10X_MD
47-
endif
48-
DEVICE_FLAGS += -DSTM32F10X
49-
50-
VCP_SRC = \
51-
vcp/hw_config.c \
52-
vcp/stm32_it.c \
53-
vcp/usb_desc.c \
54-
vcp/usb_endp.c \
55-
vcp/usb_istr.c \
56-
vcp/usb_prop.c \
57-
vcp/usb_pwr.c \
58-
drivers/serial_usb_vcp.c \
59-
drivers/usb_io.c
60-
61-
MCU_COMMON_SRC = \
62-
drivers/adc_stm32f10x.c \
63-
drivers/bus_i2c_stm32f10x.c \
64-
drivers/dma.c \
65-
drivers/inverter.c \
66-
drivers/light_ws2811strip_stdperiph.c \
67-
drivers/serial_uart_init.c \
68-
drivers/serial_uart_stm32f10x.c \
69-
drivers/system_stm32f10x.c \
70-
drivers/timer_stm32f10x.c
71-
72-
DSP_LIB :=
73-
74-
ifneq ($(DEBUG),GDB)
75-
OPTIMISE_DEFAULT := -Os
76-
OPTIMISE_SPEED :=
77-
OPTIMISE_SIZE :=
78-
79-
LTO_FLAGS := $(OPTIMISATION_BASE) $(OPTIMISE_DEFAULT)
80-
endif
1+
#
2+
# F4 Make file include
3+
#
4+
5+
ifeq ($(OPBL),yes)
6+
LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f103_$(FLASH_SIZE)k_opbl.ld
7+
endif
8+
9+
TARGET_FLASH := 128
10+
STDPERIPH_DIR = $(ROOT)/lib/main/STM32F1/Drivers/STM32F10x_StdPeriph_Driver
11+
STDPERIPH_SRC = $(notdir $(wildcard $(STDPERIPH_DIR)/src/*.c))
12+
EXCLUDES = stm32f10x_crc.c \
13+
stm32f10x_cec.c \
14+
stm32f10x_can.c
15+
STARTUP_SRC = startup_stm32f10x_md_gcc.S
16+
STDPERIPH_SRC := $(filter-out ${EXCLUDES}, $(STDPERIPH_SRC))
17+
18+
# Search path and source files for the CMSIS sources
19+
VPATH := $(VPATH):$(CMSIS_DIR)/CM3/CoreSupport:$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x
20+
CMSIS_SRC = $(notdir $(wildcard $(CMSIS_DIR)/CM3/CoreSupport/*.c \
21+
$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x/*.c))
22+
23+
INCLUDE_DIRS := $(INCLUDE_DIRS) \
24+
$(STDPERIPH_DIR)/inc \
25+
$(CMSIS_DIR)/CM3/CoreSupport \
26+
$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x
27+
28+
DEVICE_STDPERIPH_SRC = $(STDPERIPH_SRC)
29+
30+
ifneq ($(filter VCP, $(FEATURES)),)
31+
INCLUDE_DIRS := $(INCLUDE_DIRS) \
32+
$(USBFS_DIR)/inc \
33+
$(ROOT)/src/main/vcp
34+
35+
VPATH := $(VPATH):$(USBFS_DIR)/src
36+
37+
DEVICE_STDPERIPH_SRC := $(DEVICE_STDPERIPH_SRC) \
38+
$(USBPERIPH_SRC)
39+
40+
endif
41+
42+
LD_SCRIPT = $(LINKER_DIR)/stm32_flash_f103_$(FLASH_SIZE)k.ld
43+
ARCH_FLAGS = -mthumb -mcpu=cortex-m3
44+
45+
ifeq ($(DEVICE_FLAGS),)
46+
DEVICE_FLAGS = -DSTM32F10X_MD
47+
endif
48+
DEVICE_FLAGS += -DSTM32F10X
49+
50+
VCP_SRC = \
51+
vcp/hw_config.c \
52+
vcp/stm32_it.c \
53+
vcp/usb_desc.c \
54+
vcp/usb_endp.c \
55+
vcp/usb_istr.c \
56+
vcp/usb_prop.c \
57+
vcp/usb_pwr.c \
58+
drivers/serial_usb_vcp.c \
59+
drivers/usb_io.c
60+
61+
MCU_COMMON_SRC = \
62+
drivers/adc_stm32f10x.c \
63+
drivers/bus_i2c_stm32f10x.c \
64+
drivers/dma.c \
65+
drivers/inverter.c \
66+
drivers/light_ws2811strip_stdperiph.c \
67+
drivers/serial_uart_init.c \
68+
drivers/serial_uart_stm32f10x.c \
69+
drivers/system_stm32f10x.c \
70+
drivers/timer_stm32f10x.c
71+
72+
DSP_LIB :=
73+
74+
ifneq ($(DEBUG),GDB)
75+
OPTIMISE_DEFAULT := -Os
76+
OPTIMISE_SPEED :=
77+
OPTIMISE_SIZE :=
78+
79+
LTO_FLAGS := $(OPTIMISATION_BASE) $(OPTIMISE_DEFAULT)
80+
endif

0 commit comments

Comments
 (0)