From 588bda5553773bc40054d98503637d5cc302d332 Mon Sep 17 00:00:00 2001 From: gyd0317 Date: Wed, 18 Mar 2020 21:42:13 +0800 Subject: [PATCH] change gcc statup files --- .../Templates/gcc/startup_stm32l100xb.s | 4 +-- .../Templates/gcc/startup_stm32l100xba.s | 4 +-- .../Templates/gcc/startup_stm32l100xc.s | 4 +-- .../Templates/gcc/startup_stm32l151xb.s | 4 +-- .../Templates/gcc/startup_stm32l151xba.s | 4 +-- .../Templates/gcc/startup_stm32l151xc.s | 4 +-- .../Templates/gcc/startup_stm32l151xca.s | 4 +-- .../Templates/gcc/startup_stm32l151xd.s | 4 +-- .../Templates/gcc/startup_stm32l151xdx.s | 4 +-- .../Templates/gcc/startup_stm32l151xe.s | 4 +-- .../Templates/gcc/startup_stm32l152xb.s | 4 +-- .../Templates/gcc/startup_stm32l152xba.s | 4 +-- .../Templates/gcc/startup_stm32l152xc.s | 4 +-- .../Templates/gcc/startup_stm32l152xca.s | 4 +-- .../Templates/gcc/startup_stm32l152xd.s | 4 +-- .../Templates/gcc/startup_stm32l152xdx.s | 4 +-- .../Templates/gcc/startup_stm32l152xe.s | 4 +-- .../Templates/gcc/startup_stm32l162xc.s | 4 +-- .../Templates/gcc/startup_stm32l162xca.s | 4 +-- .../Templates/gcc/startup_stm32l162xd.s | 4 +-- .../Templates/gcc/startup_stm32l162xdx.s | 5 ++- .../Templates/gcc/startup_stm32l162xe.s | 4 +-- .../stm32l1xx/board/linker_scripts/link.icf | 2 +- .../stm32l1xx/board/linker_scripts/link.lds | 4 +-- .../templates/stm32l1xx/board/ports/fal_cfg.h | 34 ------------------- .../stm32l1xx/board/ports/spi_flash_init.c | 31 ----------------- 26 files changed, 47 insertions(+), 113 deletions(-) delete mode 100644 bsp/stm32/libraries/templates/stm32l1xx/board/ports/fal_cfg.h delete mode 100644 bsp/stm32/libraries/templates/stm32l1xx/board/ports/spi_flash_init.c diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l100xb.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l100xb.s index a4500a4eed..af8a6326db 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l100xb.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l100xb.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/*bl __libc_init_array */ /* Call the application's entry point.*/ bl entry diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l100xba.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l100xba.s index 39dbb1b5a2..9b3538b605 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l100xba.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l100xba.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l100xc.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l100xc.s index 41b388b25e..d0d926a76e 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l100xc.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l100xc.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xb.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xb.s index b01eca7ee0..5178b1a587 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xb.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xb.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xba.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xba.s index 0df55057c0..4a6bbccbe4 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xba.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xba.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xc.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xc.s index bc550fb45f..dabf8069b1 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xc.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xc.s @@ -90,8 +90,8 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit -/* bl __libc_init_array */ + bl SystemInit +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xca.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xca.s index 0c19090b1c..732c86062f 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xca.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xca.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xd.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xd.s index 290e0bb8e2..39e1a93326 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xd.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xd.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xdx.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xdx.s index 5b7383b0d9..6eda2f61f3 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xdx.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xdx.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xe.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xe.s index b8008a446e..0de5cf69d0 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xe.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l151xe.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xb.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xb.s index d62b54661b..943a4ae2a8 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xb.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xb.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xba.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xba.s index 3930caf729..6b907c6104 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xba.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xba.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xc.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xc.s index 1e46fc4463..f8e1bb75e1 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xc.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xc.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xca.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xca.s index 9e9696b457..317ca9e12a 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xca.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xca.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/*bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xd.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xd.s index b6d94235ad..46f334a61d 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xd.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xd.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/*bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xdx.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xdx.s index e557509222..49df661a96 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xdx.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xdx.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xe.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xe.s index ac34bc7e7a..7449b88ac3 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xe.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l152xe.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xc.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xc.s index c4312070a4..79da79aab8 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xc.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xc.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xca.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xca.s index 12776a5194..378928873d 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xca.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xca.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point. */ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xd.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xd.s index a494a4c1d4..9b3b8f4b37 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xd.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xd.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xdx.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xdx.s index 1a18d40ea3..6fc9cede70 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xdx.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xdx.s @@ -90,10 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ - bl __libc_init_array -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xe.s b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xe.s index a3ef6271ae..d32f80d8ce 100644 --- a/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xe.s +++ b/bsp/stm32/libraries/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32l162xe.s @@ -90,9 +90,9 @@ LoopFillZerobss: bcc FillZerobss /* Call the clock system intitialization function.*/ - bl SystemInit + bl SystemInit /* Call static constructors */ -/* bl __libc_init_array */ +/* bl __libc_init_array */ /* Call the application's entry point.*/ bl entry .size Reset_Handler, .-Reset_Handler diff --git a/bsp/stm32/libraries/templates/stm32l1xx/board/linker_scripts/link.icf b/bsp/stm32/libraries/templates/stm32l1xx/board/linker_scripts/link.icf index e2714da9d8..63ea0d85b4 100644 --- a/bsp/stm32/libraries/templates/stm32l1xx/board/linker_scripts/link.icf +++ b/bsp/stm32/libraries/templates/stm32l1xx/board/linker_scripts/link.icf @@ -25,4 +25,4 @@ do not initialize { section .noinit }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec }; place in ROM_region { readonly }; -place in RAM_region { readwrite, last block CSTACK}; \ No newline at end of file +place in RAM_region { readwrite, last block CSTACK}; diff --git a/bsp/stm32/libraries/templates/stm32l1xx/board/linker_scripts/link.lds b/bsp/stm32/libraries/templates/stm32l1xx/board/linker_scripts/link.lds index 0e0b902c74..61f3b1bb4e 100644 --- a/bsp/stm32/libraries/templates/stm32l1xx/board/linker_scripts/link.lds +++ b/bsp/stm32/libraries/templates/stm32l1xx/board/linker_scripts/link.lds @@ -1,12 +1,12 @@ /* - * linker script for STM32F10x with GNU ld + * linker script for STM32L1XX with GNU ld */ /* Program Entry, set to mark it as "used" and avoid gc */ MEMORY { ROM (rx) : ORIGIN = 0x08000000, LENGTH = 128k /* 128KB flash */ - RAM (rw) : ORIGIN = 0x20000000, LENGTH = 16k /* 20K sram */ + RAM (rw) : ORIGIN = 0x20000000, LENGTH = 16k /* 16K sram */ } ENTRY(Reset_Handler) _system_stack_size = 0x200; diff --git a/bsp/stm32/libraries/templates/stm32l1xx/board/ports/fal_cfg.h b/bsp/stm32/libraries/templates/stm32l1xx/board/ports/fal_cfg.h deleted file mode 100644 index 0ca9acb3ea..0000000000 --- a/bsp/stm32/libraries/templates/stm32l1xx/board/ports/fal_cfg.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2006-2018, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2018-12-8 zylx first version - */ - -#ifndef _FAL_CFG_H_ -#define _FAL_CFG_H_ - -#include -#include - -extern const struct fal_flash_dev stm32_onchip_flash; - -/* flash device table */ -#define FAL_FLASH_DEV_TABLE \ -{ \ - &stm32_onchip_flash, \ -} -/* ====================== Partition Configuration ========================== */ -#ifdef FAL_PART_HAS_TABLE_CFG - -/* partition table */ -#define FAL_PART_TABLE \ -{ \ - {FAL_PART_MAGIC_WROD, "app", "onchip_flash", 0, 112 * 1024, 0}, \ - {FAL_PART_MAGIC_WROD, "param", "onchip_flash", 112* 1024 , 16 * 1024, 0}, \ -} -#endif /* FAL_PART_HAS_TABLE_CFG */ -#endif /* _FAL_CFG_H_ */ diff --git a/bsp/stm32/libraries/templates/stm32l1xx/board/ports/spi_flash_init.c b/bsp/stm32/libraries/templates/stm32l1xx/board/ports/spi_flash_init.c deleted file mode 100644 index 43f726525b..0000000000 --- a/bsp/stm32/libraries/templates/stm32l1xx/board/ports/spi_flash_init.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2006-2018, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2018-11-27 SummerGift add spi flash port file - */ - -#include -#include "spi_flash.h" -#include "spi_flash_sfud.h" -#include "drv_spi.h" - -#if defined(BSP_USING_SPI_FLASH) -static int rt_hw_spi_flash_init(void) -{ - __HAL_RCC_GPIOB_CLK_ENABLE(); - rt_hw_spi_device_attach("spi2", "spi20", GPIOB, GPIO_PIN_12); - - if (RT_NULL == rt_sfud_flash_probe("W25Q16", "spi20")) - { - return -RT_ERROR; - }; - - return RT_EOK; -} -INIT_COMPONENT_EXPORT(rt_hw_spi_flash_init); -#endif - -- GitLab