F4: Add the STM32_SUBTYPE stuff and fixed linker script lookup to boo…

…tloader makefiles.
d-ronin · Jan 5, 2018 · fdd82e6 · fdd82e6
1 parent 53169e5
commit fdd82e6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/flight/targets/bl/f4/Makefile b/flight/targets/bl/f4/Makefile
@@ -70,7 +70,7 @@ SRC += pios_usbhook.c
 SRC += startup.c
 SRC += vectors_stm32f4xx.c
 
-ifneq "$(findstring STM32F40_41xxx,$(STM32_TYPE))" ""
+ifneq "$(findstring STM32F405xx,$(STM32_TYPE))" ""
 LINKER_SCRIPTS_BL	 =	$(PIOS_DEVLIB)/link_STM32F4xx_BL_memory.ld \
                         $(PIOS_DEVLIB)/link_STM32F4xx_sections.ld
 else ifneq "$(findstring STM32F446xx,$(STM32_TYPE))" ""
@@ -140,6 +140,9 @@ ADEFS = -D__ASSEMBLY__
 #
 # Flags for C and C++ (arm-elf-gcc/arm-elf-g++)
 CFLAGS += -D$(STM32_TYPE)
+ifneq ($(STM32_SUBTYPE),)
+CFLAGS += -D$(STM32_SUBTYPE)
+endif
 
 CFLAGS += -gdwarf-2
 CFLAGS += -Os -fconserve-stack

diff --git a/flight/targets/bu/f4/Makefile b/flight/targets/bu/f4/Makefile
@@ -87,6 +87,9 @@ PAYLOAD_FILE = $(ROOT_DIR)/build/bl_$(BOARD_NAME)/bl_$(BOARD_NAME).bin
 # Place project-specific -D (define) and/or 
 # -U options for C here.
 CDEFS += -D$(STM32_TYPE)
+ifneq ($(STM32_SUBTYPE),)
+CDEFS += -D$(STM32_SUBTYPE)
+endif
 CDEFS += -DSYSCLK_FREQ=$(SYSCLK_FREQ)
 CDEFS += -DMEM_SIZE=$(FW_BANK_SIZE)
 CDEFS += -DUSE_$(BOARD)
@@ -156,7 +159,7 @@ LDFLAGS += -Wl,--warn-common
 LDFLAGS += -Wl,--fatal-warnings
 
 # Linker scripts
-ifneq "$(findstring STM32F40_41xxx,$(STM32_TYPE))" ""
+ifneq "$(findstring STM32F405xx,$(STM32_TYPE))" ""
 LINKER_SCRIPTS_APP	 =	$(PIOS_DEVLIB)/link_STM32F4xx_OP_memory.ld \
                         $(PIOS_DEVLIB)/link_STM32F4xx_sections.ld
 else ifneq "$(findstring STM32F446xx,$(STM32_TYPE))" ""