feat: use official STM32 submodules

This commit is contained in:
Michal Moskal 2020-12-16 17:15:57 +01:00
Родитель 3e3ccee8b6
Коммит 0fc2c66349
8 изменённых файлов: 18 добавлений и 12 удалений

12
.gitmodules поставляемый
Просмотреть файл

@ -1,6 +1,12 @@
[submodule "STM32CubeF0"]
path = stm32/STM32CubeF0
url = https://github.com/mmoskal/STM32CubeF0
[submodule "jacdac-c"]
path = jacdac-c
url = https://github.com/microsoft/jacdac-c
[submodule "stm32/stm32f0xx_hal_driver"]
path = stm32/stm32f0xx_hal_driver
url = https://github.com/STMicroelectronics/stm32f0xx_hal_driver
[submodule "stm32/cmsis_core"]
path = stm32/cmsis_core
url = https://github.com/STMicroelectronics/cmsis_core
[submodule "stm32/cmsis_device_f0"]
path = stm32/cmsis_device_f0
url = https://github.com/STMicroelectronics/cmsis_device_f0

@ -1 +0,0 @@
Subproject commit c6697cddf692b2937bd83f2fde372f25d5dbf16c

1
stm32/cmsis_core Submodule

@ -0,0 +1 @@
Subproject commit 96d6da4e252b06dcfdc041e7df23e86161c33007

1
stm32/cmsis_device_f0 Submodule

@ -0,0 +1 @@
Subproject commit 20e23a96fe294368389655878c44813c989b7a9c

Просмотреть файл

@ -4,4 +4,4 @@ BL_SIZE ?= 3
PAGE_SIZE = 1024
# STM32Cube requires x6 to be defined on x4 devices
DEFINES += -DSTM32F030x6
STARTUP_FILE = $(DRV)/CMSIS/Device/ST/STM32F0xx/Source/Templates/gcc/startup_stm32f030x6.s
STARTUP_FILE = stm32/cmsis_device_f0/Source/Templates/gcc/startup_stm32f030x6.s

Просмотреть файл

@ -2,4 +2,4 @@ RAM_SIZE = 4
FLASH_SIZE ?= 32
BL_SIZE ?= 4
PAGE_SIZE = 1024
STARTUP_FILE = $(DRV)/CMSIS/Device/ST/STM32F0xx/Source/Templates/gcc/startup_stm32f031x6.s
STARTUP_FILE = stm32/cmsis_device_f0/Source/Templates/gcc/startup_stm32f031x6.s

Просмотреть файл

@ -5,7 +5,7 @@ CFLAGS += -mcpu=cortex-m0
#OPENOCD ?= ./scripts/openocd -s ./scripts -f cmsis-dap.cfg -f stm32f0x.cfg
OPENOCD ?= openocd -f interface/cmsis-dap.cfg -f target/stm32f0x.cfg
HALPREF = $(DRV)/STM32F0xx_HAL_Driver/Src
HALPREF = stm32/stm32f0xx_hal_driver/Src
HALSRC = \
$(HALPREF)/stm32f0xx_ll_adc.c \
$(HALPREF)/stm32f0xx_ll_comp.c \
@ -32,12 +32,10 @@ LD_FLASH_SIZE ?= $(FLASH_SIZE)
# TODO move some of this to common stm32.mk
AS_SRC = $(STARTUP_FILE)
CUBE = stm32/STM32Cube$(SERIES)
DRV = $(CUBE)/Drivers
CPPFLAGS += \
-I$(DRV)/STM32$(SERIES)xx_HAL_Driver/Inc \
-I$(DRV)/CMSIS/Device/ST/STM32$(SERIES)xx/Include \
-I$(DRV)/CMSIS/Include
-Istm32/stm32f0xx_hal_driver/Inc \
-Istm32/cmsis_device_f0/Include \
-Istm32/cmsis_core/Include
DEFINES += -DUSE_FULL_LL_DRIVER -DSTM32$(SERIES)
DEFINES += -D$(MCU) -DFLASH_SIZE="1024*$(FLASH_SIZE)" -DFLASH_PAGE_SIZE=$(PAGE_SIZE) -DBL_SIZE="1024*$(BL_SIZE)"

@ -0,0 +1 @@
Subproject commit 5eeaad10dc3816830abd9b3bfd74c6974453e907