F4: Fix linker script lookup. Specify some startup defines.

glowtape · glowtape · commit 53169e51d71d · 2018-01-05T19:52:53.000+01:00
Assuming we're going generally F405 all the way for the F4.

We don't clear the heap (yet?).
diff --git a/flight/PiOS/STM32F4xx/library_chibios.mk b/flight/PiOS/STM32F4xx/library_chibios.mk
@@ -10,14 +10,19 @@ PIOS_DEVLIB			:=	$(dir $(lastword $(MAKEFILE_LIST)))
 #
 # Linker script depending on STM32 type
 #
-ifneq "$(findstring STM32F40_41xxx,$(STM32_TYPE))" ""
+ifneq "$(findstring STM32F405xx,$(STM32_TYPE))" ""
 LINKER_SCRIPTS_APP	 =	$(PIOS_DEVLIB)/sections_chibios.ld
 else ifneq "$(findstring STM32F446xx,$(STM32_TYPE))" ""
 LINKER_SCRIPTS_APP	 =	$(PIOS_DEVLIB)/sections_chibios_STM32F446xx.ld
 else
 $(error No linker script found for $(STM32_TYPE))
 endif
 
+#
+# ChibiOS settings
+#
+CDEFS += -DCRT1_AREAS_NUMBER=0
+ADEFS += -DCRT0_INIT_RAM_AREAS=FALSE
 
 #
 # Compiler options implied by the F4xx

Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,19 @@ PIOS_DEVLIB := $(dir $(lastword $(MAKEFILE_LIST)))`
`10`	`10`	`#`
`11`	`11`	`# Linker script depending on STM32 type`
`12`	`12`	`#`
`13`		`-ifneq "$(findstring STM32F40_41xxx,$(STM32_TYPE))" ""`
	`13`	`+ifneq "$(findstring STM32F405xx,$(STM32_TYPE))" ""`
`14`	`14`	`LINKER_SCRIPTS_APP = $(PIOS_DEVLIB)/sections_chibios.ld`
`15`	`15`	`else ifneq "$(findstring STM32F446xx,$(STM32_TYPE))" ""`
`16`	`16`	`LINKER_SCRIPTS_APP = $(PIOS_DEVLIB)/sections_chibios_STM32F446xx.ld`
`17`	`17`	`else`
`18`	`18`	`$(error No linker script found for $(STM32_TYPE))`
`19`	`19`	`endif`
`20`	`20`
	`21`	`+#`
	`22`	`+# ChibiOS settings`
	`23`	`+#`
	`24`	`+CDEFS += -DCRT1_AREAS_NUMBER=0`
	`25`	`+ADEFS += -DCRT0_INIT_RAM_AREAS=FALSE`
`21`	`26`
`22`	`27`	`#`
`23`	`28`	`# Compiler options implied by the F4xx`