Skip to content

Commit 1f8c3e5

Browse files
authored
Merge pull request #3312 from xiangxistu/dev
[bsp][stm32] fix a problem that using gcc compile the chips of stm G4 series but chip doesn't work
2 parents 6765cf7 + ead5f07 commit 1f8c3e5

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

bsp/stm32/libraries/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/startup_stm32g431xx.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ LoopCopyDataInit:
7979
adds r4, r0, r3
8080
cmp r4, r1
8181
bcc CopyDataInit
82-
82+
8383
/* Zero fill the bss segment. */
8484
ldr r2, =_sbss
8585
ldr r4, =_ebss
@@ -97,9 +97,9 @@ LoopFillZerobss:
9797
/* Call the clock system intitialization function.*/
9898
bl SystemInit
9999
/* Call static constructors */
100-
bl __libc_init_array
100+
/* bl __libc_init_array */
101101
/* Call the application's entry point.*/
102-
bl main
102+
bl entry
103103

104104
LoopForever:
105105
b LoopForever

bsp/stm32/libraries/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/startup_stm32g441xx.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ LoopCopyDataInit:
7979
adds r4, r0, r3
8080
cmp r4, r1
8181
bcc CopyDataInit
82-
82+
8383
/* Zero fill the bss segment. */
8484
ldr r2, =_sbss
8585
ldr r4, =_ebss
@@ -97,9 +97,9 @@ LoopFillZerobss:
9797
/* Call the clock system intitialization function.*/
9898
bl SystemInit
9999
/* Call static constructors */
100-
bl __libc_init_array
100+
/* bl __libc_init_array */
101101
/* Call the application's entry point.*/
102-
bl main
102+
bl entry
103103

104104
LoopForever:
105105
b LoopForever

bsp/stm32/libraries/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/startup_stm32g471xx.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ LoopCopyDataInit:
7979
adds r4, r0, r3
8080
cmp r4, r1
8181
bcc CopyDataInit
82-
82+
8383
/* Zero fill the bss segment. */
8484
ldr r2, =_sbss
8585
ldr r4, =_ebss
@@ -97,9 +97,9 @@ LoopFillZerobss:
9797
/* Call the clock system intitialization function.*/
9898
bl SystemInit
9999
/* Call static constructors */
100-
bl __libc_init_array
100+
/* bl __libc_init_array */
101101
/* Call the application's entry point.*/
102-
bl main
102+
bl entry
103103

104104
LoopForever:
105105
b LoopForever

bsp/stm32/libraries/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/startup_stm32g473xx.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ LoopCopyDataInit:
7979
adds r4, r0, r3
8080
cmp r4, r1
8181
bcc CopyDataInit
82-
82+
8383
/* Zero fill the bss segment. */
8484
ldr r2, =_sbss
8585
ldr r4, =_ebss
@@ -97,9 +97,9 @@ LoopFillZerobss:
9797
/* Call the clock system intitialization function.*/
9898
bl SystemInit
9999
/* Call static constructors */
100-
bl __libc_init_array
100+
/* bl __libc_init_array */
101101
/* Call the application's entry point.*/
102-
bl main
102+
bl entry
103103

104104
LoopForever:
105105
b LoopForever

bsp/stm32/libraries/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/startup_stm32g474xx.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ LoopCopyDataInit:
7979
adds r4, r0, r3
8080
cmp r4, r1
8181
bcc CopyDataInit
82-
82+
8383
/* Zero fill the bss segment. */
8484
ldr r2, =_sbss
8585
ldr r4, =_ebss
@@ -97,9 +97,9 @@ LoopFillZerobss:
9797
/* Call the clock system intitialization function.*/
9898
bl SystemInit
9999
/* Call static constructors */
100-
bl __libc_init_array
100+
/* bl __libc_init_array */
101101
/* Call the application's entry point.*/
102-
bl main
102+
bl entry
103103

104104
LoopForever:
105105
b LoopForever

bsp/stm32/libraries/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/startup_stm32g483xx.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ LoopCopyDataInit:
7979
adds r4, r0, r3
8080
cmp r4, r1
8181
bcc CopyDataInit
82-
82+
8383
/* Zero fill the bss segment. */
8484
ldr r2, =_sbss
8585
ldr r4, =_ebss
@@ -97,9 +97,9 @@ LoopFillZerobss:
9797
/* Call the clock system intitialization function.*/
9898
bl SystemInit
9999
/* Call static constructors */
100-
bl __libc_init_array
100+
/* bl __libc_init_array */
101101
/* Call the application's entry point.*/
102-
bl main
102+
bl entry
103103

104104
LoopForever:
105105
b LoopForever

bsp/stm32/libraries/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/startup_stm32g484xx.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ LoopCopyDataInit:
7878
adds r4, r0, r3
7979
cmp r4, r1
8080
bcc CopyDataInit
81-
81+
8282
/* Zero fill the bss segment. */
8383
ldr r2, =_sbss
8484
ldr r4, =_ebss
@@ -96,9 +96,9 @@ LoopFillZerobss:
9696
/* Call the clock system intitialization function.*/
9797
bl SystemInit
9898
/* Call static constructors */
99-
bl __libc_init_array
99+
/* bl __libc_init_array */
100100
/* Call the application's entry point.*/
101-
bl main
101+
bl entry
102102

103103
LoopForever:
104104
b LoopForever

bsp/stm32/libraries/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/startup_stm32gbk1cb.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ LoopFillZerobss:
9393
/* Call the clock system intitialization function.*/
9494
bl SystemInit
9595
/* Call static constructors */
96-
bl __libc_init_array
96+
/* bl __libc_init_array */
9797
/* Call the application's entry point.*/
98-
bl main
98+
bl entry
9999

100100
LoopForever:
101101
b LoopForever

0 commit comments

Comments
 (0)