Skip to content

Commit b5ef7a6

Browse files
jeromecoutantjeromecoutant
committed
Add the correct startup s file in TARGET_STM32F767
1 parent b89fd03 commit b5ef7a6

File tree

3 files changed

+41
-38
lines changed

3 files changed

+41
-38
lines changed

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/device/TOOLCHAIN_ARM_MICRO/startup_stm32f769xx.S renamed to ‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/device/TOOLCHAIN_ARM_MICRO/startup_stm32f767xx.S

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
;******************** (C) COPYRIGHT 2016 STMicroelectronics ********************
2-
;* File Name : startup_stm32f769xx.s
2+
;* File Name : startup_stm32f767xx.s
33
;* Author : MCD Application Team
4-
;* Version : V1.1.0
5-
;* Date : 22-April-2016
6-
;* Description : STM32F769xx devices vector table for MDK-ARM toolchain.
4+
;* Version : V1.2.0
5+
;* Date : 30-December-2016
6+
;* Description : STM32F767xx devices vector table for MDK-ARM toolchain.
77
;* This module performs:
88
;* - Set the initial SP
99
;* - Set the initial PC == Reset_Handler
@@ -145,7 +145,7 @@ __Vectors DCD __initial_sp ; Top of Stack
145145
DCD TIM8_CC_IRQHandler ; TIM8 Capture Compare
146146
DCD DMA1_Stream7_IRQHandler ; DMA1 Stream7
147147
DCD FMC_IRQHandler ; FMC
148-
DCD SDMMC1_IRQHandler ; SDMMC1
148+
DCD SDMMC1_IRQHandler ; SDMMC1
149149
DCD TIM5_IRQHandler ; TIM5
150150
DCD SPI3_IRQHandler ; SPI3
151151
DCD UART4_IRQHandler ; UART4
@@ -194,7 +194,7 @@ __Vectors DCD __initial_sp ; Top of Stack
194194
DCD I2C4_EV_IRQHandler ; I2C4 Event
195195
DCD I2C4_ER_IRQHandler ; I2C4 Error
196196
DCD SPDIF_RX_IRQHandler ; SPDIF_RX
197-
DCD DSI_IRQHandler ; DSI
197+
DCD 0 ; Reserved
198198
DCD DFSDM1_FLT0_IRQHandler ; DFSDM1 Filter 0 global Interrupt
199199
DCD DFSDM1_FLT1_IRQHandler ; DFSDM1 Filter 1 global Interrupt
200200
DCD DFSDM1_FLT2_IRQHandler ; DFSDM1 Filter 2 global Interrupt
@@ -367,7 +367,6 @@ Default_Handler PROC
367367
EXPORT I2C4_EV_IRQHandler [WEAK]
368368
EXPORT I2C4_ER_IRQHandler [WEAK]
369369
EXPORT SPDIF_RX_IRQHandler [WEAK]
370-
EXPORT DSI_IRQHandler [WEAK]
371370
EXPORT DFSDM1_FLT0_IRQHandler [WEAK]
372371
EXPORT DFSDM1_FLT1_IRQHandler [WEAK]
373372
EXPORT DFSDM1_FLT2_IRQHandler [WEAK]
@@ -466,9 +465,9 @@ UART8_IRQHandler
466465
SPI4_IRQHandler
467466
SPI5_IRQHandler
468467
SPI6_IRQHandler
469-
SAI1_IRQHandler
470-
LTDC_IRQHandler
471-
LTDC_ER_IRQHandler
468+
SAI1_IRQHandler
469+
LTDC_IRQHandler
470+
LTDC_ER_IRQHandler
472471
DMA2D_IRQHandler
473472
SAI2_IRQHandler
474473
QUADSPI_IRQHandler
@@ -477,7 +476,6 @@ CEC_IRQHandler
477476
I2C4_EV_IRQHandler
478477
I2C4_ER_IRQHandler
479478
SPDIF_RX_IRQHandler
480-
DSI_IRQHandler
481479
DFSDM1_FLT0_IRQHandler
482480
DFSDM1_FLT1_IRQHandler
483481
DFSDM1_FLT2_IRQHandler

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/device/TOOLCHAIN_ARM_STD/startup_stm32f769xx.S renamed to ‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/device/TOOLCHAIN_ARM_STD/startup_stm32f767xx.S

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
;******************** (C) COPYRIGHT 2016 STMicroelectronics ********************
2-
;* File Name : startup_stm32f769xx.s
2+
;* File Name : startup_stm32f767xx.s
33
;* Author : MCD Application Team
4-
;* Version : V1.1.0
5-
;* Date : 22-April-2016
6-
;* Description : STM32F769xx devices vector table for MDK-ARM toolchain.
4+
;* Version : V1.2.0
5+
;* Date : 30-December-2016
6+
;* Description : STM32F767xx devices vector table for MDK-ARM toolchain.
77
;* This module performs:
88
;* - Set the initial SP
99
;* - Set the initial PC == Reset_Handler
@@ -124,7 +124,7 @@ __Vectors DCD __initial_sp ; Top of Stack
124124
DCD TIM8_CC_IRQHandler ; TIM8 Capture Compare
125125
DCD DMA1_Stream7_IRQHandler ; DMA1 Stream7
126126
DCD FMC_IRQHandler ; FMC
127-
DCD SDMMC1_IRQHandler ; SDMMC1
127+
DCD SDMMC1_IRQHandler ; SDMMC1
128128
DCD TIM5_IRQHandler ; TIM5
129129
DCD SPI3_IRQHandler ; SPI3
130130
DCD UART4_IRQHandler ; UART4
@@ -173,7 +173,7 @@ __Vectors DCD __initial_sp ; Top of Stack
173173
DCD I2C4_EV_IRQHandler ; I2C4 Event
174174
DCD I2C4_ER_IRQHandler ; I2C4 Error
175175
DCD SPDIF_RX_IRQHandler ; SPDIF_RX
176-
DCD DSI_IRQHandler ; DSI
176+
DCD 0 ; Reserved
177177
DCD DFSDM1_FLT0_IRQHandler ; DFSDM1 Filter 0 global Interrupt
178178
DCD DFSDM1_FLT1_IRQHandler ; DFSDM1 Filter 1 global Interrupt
179179
DCD DFSDM1_FLT2_IRQHandler ; DFSDM1 Filter 2 global Interrupt
@@ -346,7 +346,6 @@ Default_Handler PROC
346346
EXPORT I2C4_EV_IRQHandler [WEAK]
347347
EXPORT I2C4_ER_IRQHandler [WEAK]
348348
EXPORT SPDIF_RX_IRQHandler [WEAK]
349-
EXPORT DSI_IRQHandler [WEAK]
350349
EXPORT DFSDM1_FLT0_IRQHandler [WEAK]
351350
EXPORT DFSDM1_FLT1_IRQHandler [WEAK]
352351
EXPORT DFSDM1_FLT2_IRQHandler [WEAK]
@@ -445,9 +444,9 @@ UART8_IRQHandler
445444
SPI4_IRQHandler
446445
SPI5_IRQHandler
447446
SPI6_IRQHandler
448-
SAI1_IRQHandler
449-
LTDC_IRQHandler
450-
LTDC_ER_IRQHandler
447+
SAI1_IRQHandler
448+
LTDC_IRQHandler
449+
LTDC_ER_IRQHandler
451450
DMA2D_IRQHandler
452451
SAI2_IRQHandler
453452
QUADSPI_IRQHandler
@@ -456,7 +455,6 @@ CEC_IRQHandler
456455
I2C4_EV_IRQHandler
457456
I2C4_ER_IRQHandler
458457
SPDIF_RX_IRQHandler
459-
DSI_IRQHandler
460458
DFSDM1_FLT0_IRQHandler
461459
DFSDM1_FLT1_IRQHandler
462460
DFSDM1_FLT2_IRQHandler

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/device/TOOLCHAIN_GCC_ARM/startup_stm32f769xx.S renamed to ‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/device/TOOLCHAIN_GCC_ARM/startup_stm32f767xx.S

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
******************************************************************************
3-
* @file startup_stm32f769xx.s
3+
* @file startup_stm32f767xx.s
44
* @author MCD Application Team
5-
* @version V1.1.0
6-
* @date 22-April-2016
7-
* @brief STM32F769xx Devices vector table for GCC based toolchain.
5+
* @version V1.2.0
6+
* @date 30-December-2016
7+
* @brief STM32F767xx Devices vector table for GCC based toolchain.
88
* This module performs:
99
* - Set the initial SP
1010
* - Set the initial PC == Reset_Handler,
@@ -58,6 +58,10 @@ defined in linker script */
5858
.word _sdata
5959
/* end address for the .data section. defined in linker script */
6060
.word _edata
61+
/* start address for the .bss section. defined in linker script */
62+
.word _sbss
63+
/* end address for the .bss section. defined in linker script */
64+
.word _ebss
6165
/* stack used for SystemInit_ExtMemCtl; always internal RAM used */
6266

6367
/**
@@ -91,18 +95,24 @@ LoopCopyDataInit:
9195
adds r2, r0, r1
9296
cmp r2, r3
9397
bcc CopyDataInit
98+
ldr r2, =_sbss
99+
b LoopFillZerobss
100+
/* Zero fill the bss segment. */
101+
FillZerobss:
102+
movs r3, #0
103+
str r3, [r2], #4
104+
105+
LoopFillZerobss:
106+
ldr r3, = _ebss
107+
cmp r2, r3
108+
bcc FillZerobss
94109

95110
/* Call the clock system initialization function.*/
96111
bl SystemInit
97112
/* Call static constructors */
98-
//bl __libc_init_array
113+
bl __libc_init_array
99114
/* Call the application's entry point.*/
100-
//bl main
101-
// Calling the crt0 'cold-start' entry point. There __libc_init_array is called
102-
// and when existing hardware_init_hook() and software_init_hook() before
103-
// starting main(). software_init_hook() is available and has to be called due
104-
// to initializsation when using rtos.
105-
bl _start
115+
bl main
106116
bx lr
107117
.size Reset_Handler, .-Reset_Handler
108118

@@ -248,7 +258,7 @@ g_pfnVectors:
248258
.word I2C4_EV_IRQHandler /* I2C4 Event */
249259
.word I2C4_ER_IRQHandler /* I2C4 Error */
250260
.word SPDIF_RX_IRQHandler /* SPDIF_RX */
251-
.word DSI_IRQHandler /* DSI */
261+
.word 0 /* Reserved */
252262
.word DFSDM1_FLT0_IRQHandler /* DFSDM1 Filter 0 global Interrupt */
253263
.word DFSDM1_FLT1_IRQHandler /* DFSDM1 Filter 1 global Interrupt */
254264
.word DFSDM1_FLT2_IRQHandler /* DFSDM1 Filter 2 global Interrupt */
@@ -589,9 +599,6 @@ g_pfnVectors:
589599
.weak SPDIF_RX_IRQHandler
590600
.thumb_set SPDIF_RX_IRQHandler,Default_Handler
591601

592-
.weak DSI_IRQHandler
593-
.thumb_set DSI_IRQHandler,Default_Handler
594-
595602
.weak DFSDM1_FLT0_IRQHandler
596603
.thumb_set DFSDM1_FLT0_IRQHandler,Default_Handler
597604

@@ -625,5 +632,5 @@ g_pfnVectors:
625632
.weak MDIOS_IRQHandler
626633
.thumb_set MDIOS_IRQHandler,Default_Handler
627634

628-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
635+
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
629636

0 commit comments

Comments
 (0)