|
2 | 2 | ******************************************************************************
|
3 | 3 | * @file system_stm32f4xx.c
|
4 | 4 | * @author MCD Application Team
|
5 |
| - * @version V2.4.3 |
6 |
| - * @date 22-January-2016 |
| 5 | + * @version V2.5.0 |
| 6 | + * @date 22-April-2016 |
7 | 7 | * @brief CMSIS Cortex-M4 Device Peripheral Access Layer System Source File.
|
8 | 8 | *
|
9 | 9 | * This file provides two functions and one global variable to be called from
|
|
108 | 108 | /*!< Uncomment the following line if you need to use external SRAM or SDRAM as data memory */
|
109 | 109 | #if defined(STM32F405xx) || defined(STM32F415xx) || defined(STM32F407xx) || defined(STM32F417xx)\
|
110 | 110 | || defined(STM32F427xx) || defined(STM32F437xx) || defined(STM32F429xx) || defined(STM32F439xx)\
|
111 |
| - || defined(STM32F469xx) || defined(STM32F479xx) |
| 111 | + || defined(STM32F469xx) || defined(STM32F479xx) || defined(STM32F412Zx) || defined(STM32F412Vx) |
112 | 112 | /* #define DATA_IN_ExtSRAM */
|
113 |
| -#endif /* STM32F40xxx || STM32F41xxx || STM32F42xxx || STM32F43xxx || STM32F469xx || STM32F479xx */ |
| 113 | +#endif /* STM32F40xxx || STM32F41xxx || STM32F42xxx || STM32F43xxx || STM32F469xx || STM32F479xx ||\ |
| 114 | + STM32F412Zx || STM32F412Vx */ |
114 | 115 |
|
115 | 116 | #if defined(STM32F427xx) || defined(STM32F437xx) || defined(STM32F429xx) || defined(STM32F439xx)\
|
116 | 117 | || defined(STM32F446xx) || defined(STM32F469xx) || defined(STM32F479xx)
|
@@ -341,7 +342,7 @@ void SystemInit_ExtMemCtl(void)
|
341 | 342 | __IO uint32_t tmp = 0x00;
|
342 | 343 |
|
343 | 344 | register uint32_t tmpreg = 0, timeout = 0xFFFF;
|
344 |
| - register uint32_t index; |
| 345 | + register __IO uint32_t index; |
345 | 346 |
|
346 | 347 | /* Enable GPIOC, GPIOD, GPIOE, GPIOF, GPIOG, GPIOH and GPIOI interface clock */
|
347 | 348 | RCC->AHB1ENR |= 0x000001F8;
|
@@ -506,7 +507,7 @@ void SystemInit_ExtMemCtl(void)
|
506 | 507 | || defined(STM32F446xx) || defined(STM32F469xx) || defined(STM32F479xx)
|
507 | 508 | #if defined (DATA_IN_ExtSDRAM)
|
508 | 509 | register uint32_t tmpreg = 0, timeout = 0xFFFF;
|
509 |
| - register uint32_t index; |
| 510 | + register __IO uint32_t index; |
510 | 511 |
|
511 | 512 | #if defined(STM32F446xx)
|
512 | 513 | /* Enable GPIOA, GPIOC, GPIOD, GPIOE, GPIOF, GPIOG interface
|
@@ -695,7 +696,7 @@ void SystemInit_ExtMemCtl(void)
|
695 | 696 |
|
696 | 697 | #if defined(STM32F405xx) || defined(STM32F415xx) || defined(STM32F407xx) || defined(STM32F417xx)\
|
697 | 698 | || defined(STM32F427xx) || defined(STM32F437xx) || defined(STM32F429xx) || defined(STM32F439xx)\
|
698 |
| - || defined(STM32F469xx) || defined(STM32F479xx) |
| 699 | + || defined(STM32F469xx) || defined(STM32F479xx) || defined(STM32F412Zx) || defined(STM32F412Vx) |
699 | 700 |
|
700 | 701 | #if defined(DATA_IN_ExtSRAM)
|
701 | 702 | /*-- GPIOs Configuration -----------------------------------------------------*/
|
@@ -772,18 +773,19 @@ void SystemInit_ExtMemCtl(void)
|
772 | 773 | FMC_Bank1->BTCR[3] = 0x00110212;
|
773 | 774 | FMC_Bank1E->BWTR[2] = 0x0fffffff;
|
774 | 775 | #endif /* STM32F469xx || STM32F479xx */
|
775 |
| -#if defined(STM32F405xx) || defined(STM32F415xx) || defined(STM32F407xx)|| defined(STM32F417xx) |
| 776 | +#if defined(STM32F405xx) || defined(STM32F415xx) || defined(STM32F407xx)|| defined(STM32F417xx)\ |
| 777 | + || defined(STM32F412Zx) || defined(STM32F412Vx) |
776 | 778 | /* Delay after an RCC peripheral clock enabling */
|
777 | 779 | tmp = READ_BIT(RCC->AHB3ENR, RCC_AHB3ENR_FSMCEN);
|
778 | 780 | /* Configure and enable Bank1_SRAM2 */
|
779 | 781 | FSMC_Bank1->BTCR[2] = 0x00001011;
|
780 | 782 | FSMC_Bank1->BTCR[3] = 0x00000201;
|
781 | 783 | FSMC_Bank1E->BWTR[2] = 0x0FFFFFFF;
|
782 |
| -#endif /* STM32F405xx || STM32F415xx || STM32F407xx || STM32F417xx */ |
| 784 | +#endif /* STM32F405xx || STM32F415xx || STM32F407xx || STM32F417xx || STM32F412Zx || STM32F412Vx */ |
783 | 785 |
|
784 | 786 | #endif /* DATA_IN_ExtSRAM */
|
785 | 787 | #endif /* STM32F405xx || STM32F415xx || STM32F407xx || STM32F417xx || STM32F427xx || STM32F437xx ||\
|
786 |
| - STM32F429xx || STM32F439xx || STM32F469xx || STM32F479xx */ |
| 788 | + STM32F429xx || STM32F439xx || STM32F469xx || STM32F479xx || STM32F412Zx || STM32F412Vx */ |
787 | 789 | (void)(tmp);
|
788 | 790 | }
|
789 | 791 | #endif /* DATA_IN_ExtSRAM && DATA_IN_ExtSDRAM */
|
|
0 commit comments