aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gravekamp <me@thomas-gravekamp.nl>2019-03-08 20:23:14 +0100
committerThomas Gravekamp <me@thomas-gravekamp.nl>2019-03-08 20:23:14 +0100
commitd4e7c2c1d53fd4aaa47fd370e8b4cc3c981cb12e (patch)
treefba6300b17b51363386c85421d557cefc6391511
parentd65e3ffe8f135ea884a5e3f51dfbe8d35399f653 (diff)
Make this template use the standard CMSIS
-rw-r--r--Makefile2
-rw-r--r--src/STM32F0xx_init.c108
-rw-r--r--src/main.c2
3 files changed, 3 insertions, 109 deletions
diff --git a/Makefile b/Makefile
index 4a84ce2..819c74b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
DEVICE = STM32F030x4
FLASH = 0x08000000
+USE_ST_CMSIS = true
+
# Include the main makefile
include ./STM32-base/make/common.mk
diff --git a/src/STM32F0xx_init.c b/src/STM32F0xx_init.c
deleted file mode 100644
index 47c81d4..0000000
--- a/src/STM32F0xx_init.c
+++ /dev/null
@@ -1,108 +0,0 @@
-#include "STM32F0xx.h"
-#include "common.h"
-
-/**
- * Initialize the HSI clock source and reset the PLL configuration. This
- * function is called by the startup_common.s file, just before calling the
- * main() function.
- *
- * You can adapt this function to fit your needs, however, do not change its
- * name! It is called in the startup code.
- */
-void SystemInit (void) {
- // Set HSION bit
- RCC->CR |= (uint32_t)0x00000001U;
-
-#if defined (STM32F051x8) || \
- defined (STM32F058x8)
- // Reset SW[1:0], HPRE[3:0], PPRE[2:0], ADCPRE and MCOSEL[2:0] bits
- RCC->CFGR &= (uint32_t)0xF8FFB80CU;
-#else
- // Reset SW[1:0], HPRE[3:0], PPRE[2:0], ADCPRE, MCOSEL[2:0], MCOPRE[2:0] and PLLNODIV bits
- RCC->CFGR &= (uint32_t)0x08FFB80CU;
-#endif
-
- // Reset HSEON, CSSON and PLLON bits
- RCC->CR &= (uint32_t)0xFEF6FFFFU;
-
- // Reset HSEBYP bit
- RCC->CR &= (uint32_t)0xFFFBFFFFU;
-
- // Reset PLLSRC, PLLXTPRE and PLLMUL[3:0] bits
- RCC->CFGR &= (uint32_t)0xFFC0FFFFU;
-
- // Reset PREDIV[3:0] bits
- RCC->CFGR2 &= (uint32_t)0xFFFFFFF0U;
-
-#if defined (STM32F072xB) || \
- defined (STM32F078xx)
- // Reset USART2SW[1:0], USART1SW[1:0], I2C1SW, CECSW, USBSW and ADCSW bits
- RCC->CFGR3 &= (uint32_t)0xFFFCFE2CU;
-
-#elif defined (STM32F071xB)
- // Reset USART2SW[1:0], USART1SW[1:0], I2C1SW, CECSW and ADCSW bits
- RCC->CFGR3 &= (uint32_t)0xFFFFCEACU;
-
-#elif defined (STM32F091xC) || \
- defined (STM32F098xx)
- // Reset USART3SW[1:0], USART2SW[1:0], USART1SW[1:0], I2C1SW, CECSW and ADCSW bits
- RCC->CFGR3 &= (uint32_t)0xFFF0FEACU;
-
-#elif defined (STM32F030x6) || \
- defined (STM32F030x8) || \
- defined (STM32F031x6) || \
- defined (STM32F038xx) || \
- defined (STM32F030xC)
- // Reset USART1SW[1:0], I2C1SW and ADCSW bits
- RCC->CFGR3 &= (uint32_t)0xFFFFFEECU;
-
-#elif defined (STM32F051x8) || \
- defined (STM32F058xx)
- // Reset USART1SW[1:0], I2C1SW, CECSW and ADCSW bits
- RCC->CFGR3 &= (uint32_t)0xFFFFFEACU;
-
-#elif defined (STM32F042x6) || \
- defined (STM32F048xx)
- // Reset USART1SW[1:0], I2C1SW, CECSW, USBSW and ADCSW bits
- RCC->CFGR3 &= (uint32_t)0xFFFFFE2CU;
-
-#elif defined (STM32F070x6) || \
- defined (STM32F070xB)
- // Reset USART1SW[1:0], I2C1SW, USBSW and ADCSW bits
- RCC->CFGR3 &= (uint32_t)0xFFFFFE6CU;
- // Set default USB clock to PLLCLK, since there is no HSI48
- RCC->CFGR3 |= (uint32_t)0x00000080U;
-
-#else
- #warning "No target selected"
-#endif
-
- // Reset HSI14 bit
- RCC->CR2 &= (uint32_t)0xFFFFFFFEU;
-
- // Disable all interrupts
- RCC->CIR = 0x00000000U;
-}
-
-// These symbols are provided by the linker
-extern void (*__preinit_array_start[])();
-extern void (*__preinit_array_end[])();
-extern void (*__init_array_start[])();
-extern void (*__init_array_end[])();
-
-/**
- * Calls the functions in the preinit and init arrays. The start and end
- * addresses of these arrays are provided by the linker.
- *
- * You can adapt this function to fit your needs, however, do not change its
- * name! It is called in the startup code.
- */
-void __main () {
- for (void (**f)() = __preinit_array_start; f < __preinit_array_end; ++f) {
- (*f)();
- }
-
- for (void (**f)() = __init_array_start; f < __init_array_end; ++f) {
- (*f)();
- }
-}
diff --git a/src/main.c b/src/main.c
index 16d2409..0365c80 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,4 @@
-#include "STM32F0xx.h"
+#include "stm32f0xx.h"
// Quick and dirty delay
static void delay (unsigned int time) {