Commit182fdf4

authored

Merge pull request#353 from fpistm/custom_startup

Allow use of a custom startup file

2 parents891d9fb +c3d12c6 commit182fdf4Copy full SHA for 182fdf4

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include"stm32_def_build.h"`
`2`	`2`
	`3`	`+#if defined(CMSIS_STARTUP_FILE)`
`3`	`4`	`#include CMSIS_STARTUP_FILE`
`4`		`-`
	`5`	`+#endif`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#ifndef_STM32_DEF_BUILD_`
`2`	`2`	`#define_STM32_DEF_BUILD_`
`3`	`3`
	`4`	`+#if !defined(CMSIS_STARTUP_FILE)&& !defined(CUSTOM_STARTUP_FILE)`
`4`	`5`	`#if defined(STM32F030x6)`
`5`	`6`	`#defineCMSIS_STARTUP_FILE "startup_stm32f030x6.s"`
`6`	`7`	`#elif defined(STM32F030x8)`
`@@ -296,4 +297,7 @@`
`296`	`297`	`#else`
`297`	`298`	`#error UNKNOWN CHIP`
`298`	`299`	`#endif`
`299`		`-#endif//_STM32_DEF_BUILD_`
	`300`	`+#else`
	`301`	`+#warning "No CMSIS startup file defined, custom one should be used"`
	`302`	`+#endif/* !CMSIS_STARTUP_FILE && !CUSTOM_STARTUP_FILE */`
	`303`	`+#endif/* _STM32_DEF_BUILD_ */`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ compiler.c.extra_flags=`
`59`	`59`	`compiler.c.elf.extra_flags=`
`60`	`60`	`compiler.cpp.extra_flags=`
`61`	`61`	`compiler.cpp.std=gnu++14`
`62`		`-compiler.S.extra_flags=`
	`62`	`+compiler.S.extra_flags={build.startup_file}`
`63`	`63`	`compiler.ar.extra_flags=`
`64`	`64`	`compiler.elf2bin.extra_flags=`
`65`	`65`	`compiler.elf2hex.extra_flags=`
`@@ -81,6 +81,7 @@ build.info.flags=-D{build.series} -DARDUINO={runtime.ide.version} -DARDUINO_{bui`
`81`	`81`	`# Defaults config`
`82`	`82`	`build.xSerial=-DHAL_UART_MODULE_ENABLED`
`83`	`83`	`build.enable_usb=`
	`84`	`+build.startup_file=`
`84`	`85`	`build.flags.optimize=-Os`
`85`	`86`	`build.flags.ldspecs=--specs=nano.specs`
`86`	`87`

Comments

(0)