From 1b0dae2bb0c522941184f9d17bf54d65455c6ab4 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Mon, 4 Dec 2023 00:11:29 +0800 Subject: [PATCH] [stm32] support nano version - G0 - G4 - L0 - L4 --- bsp/stm32/libraries/HAL_Drivers/drivers/drv_pm.c | 1 + bsp/stm32/stm32g070-st-nucleo/Kconfig | 7 +++++++ bsp/stm32/stm32g070-st-nucleo/applications/main.c | 8 ++++++-- bsp/stm32/stm32g070-st-nucleo/board/Kconfig | 7 ------- bsp/stm32/stm32g070-st-nucleo/board/board.c | 3 ++- bsp/stm32/stm32g070-st-nucleo/board/board.h | 3 --- bsp/stm32/stm32g071-st-nucleo/Kconfig | 7 +++++++ bsp/stm32/stm32g071-st-nucleo/applications/main.c | 8 ++++++-- bsp/stm32/stm32g071-st-nucleo/board/Kconfig | 7 ------- bsp/stm32/stm32g071-st-nucleo/board/board.c | 3 ++- bsp/stm32/stm32g071-st-nucleo/board/board.h | 3 --- bsp/stm32/stm32g431-st-nucleo/Kconfig | 7 +++++++ bsp/stm32/stm32g431-st-nucleo/applications/main.c | 8 ++++++-- bsp/stm32/stm32g431-st-nucleo/board/Kconfig | 7 ------- bsp/stm32/stm32g431-st-nucleo/board/board.c | 3 ++- bsp/stm32/stm32g431-st-nucleo/board/board.h | 3 --- bsp/stm32/stm32g474-st-nucleo/Kconfig | 7 +++++++ bsp/stm32/stm32g474-st-nucleo/applications/main.c | 8 ++++++-- bsp/stm32/stm32g474-st-nucleo/board/Kconfig | 7 ------- bsp/stm32/stm32g474-st-nucleo/board/board.c | 3 ++- bsp/stm32/stm32g474-st-nucleo/board/board.h | 3 --- bsp/stm32/stm32g491-st-nucleo/Kconfig | 7 +++++++ bsp/stm32/stm32g491-st-nucleo/applications/main.c | 8 ++++++-- bsp/stm32/stm32g491-st-nucleo/board/Kconfig | 7 ------- bsp/stm32/stm32g491-st-nucleo/board/board.c | 3 ++- bsp/stm32/stm32g491-st-nucleo/board/board.h | 3 --- bsp/stm32/stm32l010-st-nucleo/Kconfig | 7 +++++++ bsp/stm32/stm32l010-st-nucleo/applications/main.c | 8 ++++++-- bsp/stm32/stm32l010-st-nucleo/board/Kconfig | 7 ------- bsp/stm32/stm32l010-st-nucleo/board/board.c | 3 ++- bsp/stm32/stm32l010-st-nucleo/board/board.h | 3 --- bsp/stm32/stm32l053-st-nucleo/Kconfig | 7 +++++++ bsp/stm32/stm32l053-st-nucleo/applications/main.c | 8 ++++++-- bsp/stm32/stm32l053-st-nucleo/board/Kconfig | 7 ------- bsp/stm32/stm32l053-st-nucleo/board/board.c | 3 ++- bsp/stm32/stm32l053-st-nucleo/board/board.h | 3 --- bsp/stm32/stm32l412-st-nucleo/Kconfig | 7 +++++++ bsp/stm32/stm32l412-st-nucleo/applications/main.c | 8 ++++++-- bsp/stm32/stm32l412-st-nucleo/board/Kconfig | 7 ------- bsp/stm32/stm32l412-st-nucleo/board/board.c | 3 ++- bsp/stm32/stm32l412-st-nucleo/board/board.h | 3 --- bsp/stm32/stm32l431-BearPi/Kconfig | 7 +++++++ bsp/stm32/stm32l431-BearPi/applications/main.c | 8 ++++++-- bsp/stm32/stm32l431-BearPi/board/Kconfig | 7 ------- bsp/stm32/stm32l431-BearPi/board/board.c | 3 ++- bsp/stm32/stm32l431-BearPi/board/board.h | 3 --- bsp/stm32/stm32l432-st-nucleo/Kconfig | 7 +++++++ bsp/stm32/stm32l432-st-nucleo/applications/main.c | 8 ++++++-- bsp/stm32/stm32l432-st-nucleo/board/Kconfig | 7 ------- bsp/stm32/stm32l432-st-nucleo/board/board.c | 3 ++- bsp/stm32/stm32l432-st-nucleo/board/board.h | 3 --- bsp/stm32/stm32l433-ali-startkit/Kconfig | 7 +++++++ bsp/stm32/stm32l433-ali-startkit/applications/main.c | 8 ++++++-- bsp/stm32/stm32l433-ali-startkit/board/Kconfig | 7 ------- bsp/stm32/stm32l433-ali-startkit/board/board.c | 1 + bsp/stm32/stm32l433-ali-startkit/board/board.h | 2 -- bsp/stm32/stm32l433-st-nucleo/Kconfig | 7 +++++++ bsp/stm32/stm32l433-st-nucleo/applications/main.c | 8 ++++++-- bsp/stm32/stm32l433-st-nucleo/board/Kconfig | 7 ------- bsp/stm32/stm32l433-st-nucleo/board/board.c | 3 ++- bsp/stm32/stm32l433-st-nucleo/board/board.h | 3 --- bsp/stm32/stm32l452-st-nucleo/Kconfig | 7 +++++++ bsp/stm32/stm32l452-st-nucleo/applications/main.c | 8 ++++++-- bsp/stm32/stm32l452-st-nucleo/board/Kconfig | 7 ------- bsp/stm32/stm32l452-st-nucleo/board/board.c | 3 ++- bsp/stm32/stm32l452-st-nucleo/board/board.h | 3 --- bsp/stm32/stm32l475-st-discovery/Kconfig | 7 +++++++ bsp/stm32/stm32l475-st-discovery/applications/main.c | 8 ++++++-- bsp/stm32/stm32l475-st-discovery/board/Kconfig | 7 ------- bsp/stm32/stm32l475-st-discovery/board/board.c | 1 + bsp/stm32/stm32l475-st-discovery/board/board.h | 3 --- bsp/stm32/stm32l476-st-nucleo/Kconfig | 7 +++++++ bsp/stm32/stm32l476-st-nucleo/applications/main.c | 10 +++++++--- bsp/stm32/stm32l476-st-nucleo/board/Kconfig | 7 ------- bsp/stm32/stm32l476-st-nucleo/board/board.c | 2 ++ bsp/stm32/stm32l476-st-nucleo/board/board.h | 4 +--- bsp/stm32/stm32l496-ali-developer/Kconfig | 7 +++++++ bsp/stm32/stm32l496-ali-developer/applications/main.c | 8 ++++++-- bsp/stm32/stm32l496-ali-developer/board/Kconfig | 7 ------- bsp/stm32/stm32l496-ali-developer/board/board.c | 1 + bsp/stm32/stm32l496-ali-developer/board/board.h | 2 -- bsp/stm32/stm32l496-st-discovery/Kconfig | 7 +++++++ bsp/stm32/stm32l496-st-discovery/applications/main.c | 8 ++++++-- bsp/stm32/stm32l496-st-discovery/board/Kconfig | 7 ------- bsp/stm32/stm32l496-st-discovery/board/board.c | 3 ++- bsp/stm32/stm32l496-st-discovery/board/board.h | 3 --- bsp/stm32/stm32l496-st-nucleo/Kconfig | 7 +++++++ bsp/stm32/stm32l496-st-nucleo/applications/main.c | 8 ++++++-- bsp/stm32/stm32l496-st-nucleo/board/Kconfig | 7 ------- bsp/stm32/stm32l496-st-nucleo/board/board.c | 2 +- bsp/stm32/stm32l496-st-nucleo/board/board.h | 3 --- bsp/stm32/stm32l4r5-st-nucleo/Kconfig | 7 +++++++ bsp/stm32/stm32l4r5-st-nucleo/applications/main.c | 8 ++++++-- bsp/stm32/stm32l4r5-st-nucleo/board/Kconfig | 7 ------- bsp/stm32/stm32l4r5-st-nucleo/board/board.c | 3 ++- bsp/stm32/stm32l4r5-st-nucleo/board/board.h | 3 --- bsp/stm32/stm32l4r9-st-eval/Kconfig | 7 +++++++ bsp/stm32/stm32l4r9-st-eval/applications/main.c | 11 +++++++---- bsp/stm32/stm32l4r9-st-eval/board/Kconfig | 7 ------- bsp/stm32/stm32l4r9-st-eval/board/board.c | 3 ++- bsp/stm32/stm32l4r9-st-eval/board/board.h | 3 --- bsp/stm32/stm32l4r9-st-sensortile-box/Kconfig | 7 +++++++ .../stm32l4r9-st-sensortile-box/applications/main.c | 8 ++++++-- bsp/stm32/stm32l4r9-st-sensortile-box/board/Kconfig | 8 -------- bsp/stm32/stm32l4r9-st-sensortile-box/board/board.c | 3 ++- bsp/stm32/stm32l4r9-st-sensortile-box/board/board.h | 3 --- 106 files changed, 315 insertions(+), 271 deletions(-) diff --git a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_pm.c b/bsp/stm32/libraries/HAL_Drivers/drivers/drv_pm.c index e559b22cc3..9d336a3429 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_pm.c +++ b/bsp/stm32/libraries/HAL_Drivers/drivers/drv_pm.c @@ -10,6 +10,7 @@ #include #include +#include static void uart_console_reconfig(void) { diff --git a/bsp/stm32/stm32g070-st-nucleo/Kconfig b/bsp/stm32/stm32g070-st-nucleo/Kconfig index 362bdfbed8..b5af5bec2a 100644 --- a/bsp/stm32/stm32g070-st-nucleo/Kconfig +++ b/bsp/stm32/stm32g070-st-nucleo/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32G070RB + bool + select SOC_SERIES_STM32G0 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32g070-st-nucleo/applications/main.c b/bsp/stm32/stm32g070-st-nucleo/applications/main.c index a438b9e67d..ec9c789e0b 100644 --- a/bsp/stm32/stm32g070-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32g070-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED pin: PA5 */ #define LED0_PIN GET_PIN(A, 5) diff --git a/bsp/stm32/stm32g070-st-nucleo/board/Kconfig b/bsp/stm32/stm32g070-st-nucleo/board/Kconfig index be468b410e..b7c1acb497 100644 --- a/bsp/stm32/stm32g070-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32g070-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32G070RB - bool - select SOC_SERIES_STM32G0 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_UART diff --git a/bsp/stm32/stm32g070-st-nucleo/board/board.c b/bsp/stm32/stm32g070-st-nucleo/board/board.c index 101f483d27..10cf2b7805 100644 --- a/bsp/stm32/stm32g070-st-nucleo/board/board.c +++ b/bsp/stm32/stm32g070-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2020-7-1 NU-LL first version */ -#include "board.h" +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32g070-st-nucleo/board/board.h b/bsp/stm32/stm32g070-st-nucleo/board/board.h index d492da1eb9..5bb83536dc 100644 --- a/bsp/stm32/stm32g070-st-nucleo/board/board.h +++ b/bsp/stm32/stm32g070-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32g071-st-nucleo/Kconfig b/bsp/stm32/stm32g071-st-nucleo/Kconfig index 362bdfbed8..24e68bbeef 100644 --- a/bsp/stm32/stm32g071-st-nucleo/Kconfig +++ b/bsp/stm32/stm32g071-st-nucleo/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32G071RB + bool + select SOC_SERIES_STM32G0 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32g071-st-nucleo/applications/main.c b/bsp/stm32/stm32g071-st-nucleo/applications/main.c index a438b9e67d..ec9c789e0b 100644 --- a/bsp/stm32/stm32g071-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32g071-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED pin: PA5 */ #define LED0_PIN GET_PIN(A, 5) diff --git a/bsp/stm32/stm32g071-st-nucleo/board/Kconfig b/bsp/stm32/stm32g071-st-nucleo/board/Kconfig index f6641f010c..ce1783adfd 100644 --- a/bsp/stm32/stm32g071-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32g071-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32G071RB - bool - select SOC_SERIES_STM32G0 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART diff --git a/bsp/stm32/stm32g071-st-nucleo/board/board.c b/bsp/stm32/stm32g071-st-nucleo/board/board.c index 28d4e56e46..38a749b73e 100644 --- a/bsp/stm32/stm32g071-st-nucleo/board/board.c +++ b/bsp/stm32/stm32g071-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32g071-st-nucleo/board/board.h b/bsp/stm32/stm32g071-st-nucleo/board/board.h index d492da1eb9..5bb83536dc 100644 --- a/bsp/stm32/stm32g071-st-nucleo/board/board.h +++ b/bsp/stm32/stm32g071-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32g431-st-nucleo/Kconfig b/bsp/stm32/stm32g431-st-nucleo/Kconfig index 362bdfbed8..aff70779c8 100644 --- a/bsp/stm32/stm32g431-st-nucleo/Kconfig +++ b/bsp/stm32/stm32g431-st-nucleo/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32G431RB + bool + select SOC_SERIES_STM32G4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32g431-st-nucleo/applications/main.c b/bsp/stm32/stm32g431-st-nucleo/applications/main.c index 5524d24935..f3e9307edf 100644 --- a/bsp/stm32/stm32g431-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32g431-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift first version + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED2 pin: PA5 */ #define LED2_PIN GET_PIN(A, 5) diff --git a/bsp/stm32/stm32g431-st-nucleo/board/Kconfig b/bsp/stm32/stm32g431-st-nucleo/board/Kconfig index 8635d18300..42c5cc6eb9 100644 --- a/bsp/stm32/stm32g431-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32g431-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32G431RB - bool - select SOC_SERIES_STM32G4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu diff --git a/bsp/stm32/stm32g431-st-nucleo/board/board.c b/bsp/stm32/stm32g431-st-nucleo/board/board.c index 7aeb088632..1f5dcd13e4 100644 --- a/bsp/stm32/stm32g431-st-nucleo/board/board.c +++ b/bsp/stm32/stm32g431-st-nucleo/board/board.c @@ -9,7 +9,8 @@ * 2019-10-03 xuzhuoyi add stm32g431-st-nucleo bsp */ -#include "board.h" +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32g431-st-nucleo/board/board.h b/bsp/stm32/stm32g431-st-nucleo/board/board.h index d7d48a2db7..82699ae065 100644 --- a/bsp/stm32/stm32g431-st-nucleo/board/board.h +++ b/bsp/stm32/stm32g431-st-nucleo/board/board.h @@ -12,10 +12,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #define STM32_FLASH_START_ADRESS ((uint32_t)0x08000000) #define STM32_FLASH_SIZE (128 * 1024) diff --git a/bsp/stm32/stm32g474-st-nucleo/Kconfig b/bsp/stm32/stm32g474-st-nucleo/Kconfig index 362bdfbed8..b8468bfbe3 100644 --- a/bsp/stm32/stm32g474-st-nucleo/Kconfig +++ b/bsp/stm32/stm32g474-st-nucleo/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32G474RE + bool + select SOC_SERIES_STM32G4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32g474-st-nucleo/applications/main.c b/bsp/stm32/stm32g474-st-nucleo/applications/main.c index 5524d24935..f3e9307edf 100644 --- a/bsp/stm32/stm32g474-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32g474-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift first version + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED2 pin: PA5 */ #define LED2_PIN GET_PIN(A, 5) diff --git a/bsp/stm32/stm32g474-st-nucleo/board/Kconfig b/bsp/stm32/stm32g474-st-nucleo/board/Kconfig index 0fa184b676..010baec088 100644 --- a/bsp/stm32/stm32g474-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32g474-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32G474RE - bool - select SOC_SERIES_STM32G4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_STLINK_TO_USART diff --git a/bsp/stm32/stm32g474-st-nucleo/board/board.c b/bsp/stm32/stm32g474-st-nucleo/board/board.c index 7aeb088632..1f5dcd13e4 100644 --- a/bsp/stm32/stm32g474-st-nucleo/board/board.c +++ b/bsp/stm32/stm32g474-st-nucleo/board/board.c @@ -9,7 +9,8 @@ * 2019-10-03 xuzhuoyi add stm32g431-st-nucleo bsp */ -#include "board.h" +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32g474-st-nucleo/board/board.h b/bsp/stm32/stm32g474-st-nucleo/board/board.h index d7d48a2db7..82699ae065 100644 --- a/bsp/stm32/stm32g474-st-nucleo/board/board.h +++ b/bsp/stm32/stm32g474-st-nucleo/board/board.h @@ -12,10 +12,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #define STM32_FLASH_START_ADRESS ((uint32_t)0x08000000) #define STM32_FLASH_SIZE (128 * 1024) diff --git a/bsp/stm32/stm32g491-st-nucleo/Kconfig b/bsp/stm32/stm32g491-st-nucleo/Kconfig index 362bdfbed8..c731d9b557 100644 --- a/bsp/stm32/stm32g491-st-nucleo/Kconfig +++ b/bsp/stm32/stm32g491-st-nucleo/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32G491RE + bool + select SOC_SERIES_STM32G4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32g491-st-nucleo/applications/main.c b/bsp/stm32/stm32g491-st-nucleo/applications/main.c index b797e8bc3d..14239d5ca6 100644 --- a/bsp/stm32/stm32g491-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32g491-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2023-12-04 Supperthomas first version + * 2023-12-05 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED2 pin: PA5 */ #define LED2_PIN GET_PIN(A, 5) diff --git a/bsp/stm32/stm32g491-st-nucleo/board/Kconfig b/bsp/stm32/stm32g491-st-nucleo/board/Kconfig index 3cfaf5d148..42c5cc6eb9 100644 --- a/bsp/stm32/stm32g491-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32g491-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32G491RE - bool - select SOC_SERIES_STM32G4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu diff --git a/bsp/stm32/stm32g491-st-nucleo/board/board.c b/bsp/stm32/stm32g491-st-nucleo/board/board.c index ce3f776d4a..80037636be 100644 --- a/bsp/stm32/stm32g491-st-nucleo/board/board.c +++ b/bsp/stm32/stm32g491-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2023-12-04 Supperthomas First version */ -#include "board.h" +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32g491-st-nucleo/board/board.h b/bsp/stm32/stm32g491-st-nucleo/board/board.h index 2154d88034..e8878fa0d3 100644 --- a/bsp/stm32/stm32g491-st-nucleo/board/board.h +++ b/bsp/stm32/stm32g491-st-nucleo/board/board.h @@ -12,10 +12,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #define STM32_FLASH_START_ADRESS ((uint32_t)0x08000000) #define STM32_FLASH_SIZE (512 * 1024) diff --git a/bsp/stm32/stm32l010-st-nucleo/Kconfig b/bsp/stm32/stm32l010-st-nucleo/Kconfig index 362bdfbed8..780fa13a44 100644 --- a/bsp/stm32/stm32l010-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l010-st-nucleo/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L010RB + bool + select SOC_SERIES_STM32L0 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l010-st-nucleo/applications/main.c b/bsp/stm32/stm32l010-st-nucleo/applications/main.c index a438b9e67d..ec9c789e0b 100644 --- a/bsp/stm32/stm32l010-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32l010-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED pin: PA5 */ #define LED0_PIN GET_PIN(A, 5) diff --git a/bsp/stm32/stm32l010-st-nucleo/board/Kconfig b/bsp/stm32/stm32l010-st-nucleo/board/Kconfig index 9861ceec78..a767ba7c78 100644 --- a/bsp/stm32/stm32l010-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l010-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L010RB - bool - select SOC_SERIES_STM32L0 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART diff --git a/bsp/stm32/stm32l010-st-nucleo/board/board.c b/bsp/stm32/stm32l010-st-nucleo/board/board.c index 62621eed0a..877be2d6c8 100644 --- a/bsp/stm32/stm32l010-st-nucleo/board/board.c +++ b/bsp/stm32/stm32l010-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l010-st-nucleo/board/board.h b/bsp/stm32/stm32l010-st-nucleo/board/board.h index 3e6096d63d..8e4ce0197c 100644 --- a/bsp/stm32/stm32l010-st-nucleo/board/board.h +++ b/bsp/stm32/stm32l010-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l053-st-nucleo/Kconfig b/bsp/stm32/stm32l053-st-nucleo/Kconfig index 362bdfbed8..25d55a0f37 100644 --- a/bsp/stm32/stm32l053-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l053-st-nucleo/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L053R8 + bool + select SOC_SERIES_STM32L0 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l053-st-nucleo/applications/main.c b/bsp/stm32/stm32l053-st-nucleo/applications/main.c index a438b9e67d..ec9c789e0b 100644 --- a/bsp/stm32/stm32l053-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32l053-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED pin: PA5 */ #define LED0_PIN GET_PIN(A, 5) diff --git a/bsp/stm32/stm32l053-st-nucleo/board/Kconfig b/bsp/stm32/stm32l053-st-nucleo/board/Kconfig index bde022d45b..01e9209b29 100644 --- a/bsp/stm32/stm32l053-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l053-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L053R8 - bool - select SOC_SERIES_STM32L0 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART diff --git a/bsp/stm32/stm32l053-st-nucleo/board/board.c b/bsp/stm32/stm32l053-st-nucleo/board/board.c index 62621eed0a..877be2d6c8 100644 --- a/bsp/stm32/stm32l053-st-nucleo/board/board.c +++ b/bsp/stm32/stm32l053-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l053-st-nucleo/board/board.h b/bsp/stm32/stm32l053-st-nucleo/board/board.h index 91745ef064..5b6d9ab5ce 100644 --- a/bsp/stm32/stm32l053-st-nucleo/board/board.h +++ b/bsp/stm32/stm32l053-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l412-st-nucleo/Kconfig b/bsp/stm32/stm32l412-st-nucleo/Kconfig index 362bdfbed8..ae527a2518 100644 --- a/bsp/stm32/stm32l412-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l412-st-nucleo/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L412RB + bool + select SOC_SERIES_STM32L4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l412-st-nucleo/applications/main.c b/bsp/stm32/stm32l412-st-nucleo/applications/main.c index 296c33d352..733e965758 100644 --- a/bsp/stm32/stm32l412-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32l412-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2020-04-24 luhuadong first version + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LD4 pin: PB13 */ #define LD4_PIN GET_PIN(B, 13) diff --git a/bsp/stm32/stm32l412-st-nucleo/board/Kconfig b/bsp/stm32/stm32l412-st-nucleo/board/Kconfig index 34604a52f5..cd66bd135b 100644 --- a/bsp/stm32/stm32l412-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l412-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L412RB - bool - select SOC_SERIES_STM32L4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_STLINK_TO_USART bool "Enable STLINK TO USART (uart2)" diff --git a/bsp/stm32/stm32l412-st-nucleo/board/board.c b/bsp/stm32/stm32l412-st-nucleo/board/board.c index 1ac2bc2df9..a54d327676 100644 --- a/bsp/stm32/stm32l412-st-nucleo/board/board.c +++ b/bsp/stm32/stm32l412-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2020-04-24 luhuadong first version */ -#include "board.h" +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l412-st-nucleo/board/board.h b/bsp/stm32/stm32l412-st-nucleo/board/board.h index 1f1519158f..f179e2845a 100644 --- a/bsp/stm32/stm32l412-st-nucleo/board/board.h +++ b/bsp/stm32/stm32l412-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l431-BearPi/Kconfig b/bsp/stm32/stm32l431-BearPi/Kconfig index 362bdfbed8..608f70fd64 100644 --- a/bsp/stm32/stm32l431-BearPi/Kconfig +++ b/bsp/stm32/stm32l431-BearPi/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L431RC + bool + select SOC_SERIES_STM32L4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l431-BearPi/applications/main.c b/bsp/stm32/stm32l431-BearPi/applications/main.c index b5409814f6..3e5c652c94 100644 --- a/bsp/stm32/stm32l431-BearPi/applications/main.c +++ b/bsp/stm32/stm32l431-BearPi/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2019-01-11 RiceChen first edition + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED pin: PC13 */ #define LED0_PIN GET_PIN(C, 13) diff --git a/bsp/stm32/stm32l431-BearPi/board/Kconfig b/bsp/stm32/stm32l431-BearPi/board/Kconfig index d9f3761b07..287409313d 100644 --- a/bsp/stm32/stm32l431-BearPi/board/Kconfig +++ b/bsp/stm32/stm32l431-BearPi/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L431RC - bool - select SOC_SERIES_STM32L4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "On-chip Peripheral Drivers" config BSP_USING_GPIO diff --git a/bsp/stm32/stm32l431-BearPi/board/board.c b/bsp/stm32/stm32l431-BearPi/board/board.c index b1a9d3d860..8680519f39 100644 --- a/bsp/stm32/stm32l431-BearPi/board/board.c +++ b/bsp/stm32/stm32l431-BearPi/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 RiceChen first version */ -#include "board.h" +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l431-BearPi/board/board.h b/bsp/stm32/stm32l431-BearPi/board/board.h index 77db7fce6e..6ba7e1b06a 100644 --- a/bsp/stm32/stm32l431-BearPi/board/board.h +++ b/bsp/stm32/stm32l431-BearPi/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l432-st-nucleo/Kconfig b/bsp/stm32/stm32l432-st-nucleo/Kconfig index 362bdfbed8..0e406677ad 100644 --- a/bsp/stm32/stm32l432-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l432-st-nucleo/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L432KC + bool + select SOC_SERIES_STM32L4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l432-st-nucleo/applications/main.c b/bsp/stm32/stm32l432-st-nucleo/applications/main.c index d3654159d8..5e52cfa5af 100644 --- a/bsp/stm32/stm32l432-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32l432-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2019-01-11 sun_shine first edition + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PB3 */ #define LED0_PIN GET_PIN(B, 3) diff --git a/bsp/stm32/stm32l432-st-nucleo/board/Kconfig b/bsp/stm32/stm32l432-st-nucleo/board/Kconfig index 645582c8b0..cd66bd135b 100644 --- a/bsp/stm32/stm32l432-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l432-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L432KC - bool - select SOC_SERIES_STM32L4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_STLINK_TO_USART bool "Enable STLINK TO USART (uart2)" diff --git a/bsp/stm32/stm32l432-st-nucleo/board/board.c b/bsp/stm32/stm32l432-st-nucleo/board/board.c index 93000dc18c..d1db8992f2 100644 --- a/bsp/stm32/stm32l432-st-nucleo/board/board.c +++ b/bsp/stm32/stm32l432-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l432-st-nucleo/board/board.h b/bsp/stm32/stm32l432-st-nucleo/board/board.h index 77db7fce6e..6ba7e1b06a 100644 --- a/bsp/stm32/stm32l432-st-nucleo/board/board.h +++ b/bsp/stm32/stm32l432-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l433-ali-startkit/Kconfig b/bsp/stm32/stm32l433-ali-startkit/Kconfig index 362bdfbed8..a364c64cab 100644 --- a/bsp/stm32/stm32l433-ali-startkit/Kconfig +++ b/bsp/stm32/stm32l433-ali-startkit/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L433CC + bool + select SOC_SERIES_STM32L4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l433-ali-startkit/applications/main.c b/bsp/stm32/stm32l433-ali-startkit/applications/main.c index 40c577e9df..ad97cdd44e 100644 --- a/bsp/stm32/stm32l433-ali-startkit/applications/main.c +++ b/bsp/stm32/stm32l433-ali-startkit/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2021-12-05 supperthomas first version + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ #define LED1_PIN GET_PIN(B, 2) int main(void) diff --git a/bsp/stm32/stm32l433-ali-startkit/board/Kconfig b/bsp/stm32/stm32l433-ali-startkit/board/Kconfig index d4a0f6c5dd..200f663e2b 100644 --- a/bsp/stm32/stm32l433-ali-startkit/board/Kconfig +++ b/bsp/stm32/stm32l433-ali-startkit/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L433CC - bool - select SOC_SERIES_STM32L4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_STLINK_TO_USART diff --git a/bsp/stm32/stm32l433-ali-startkit/board/board.c b/bsp/stm32/stm32l433-ali-startkit/board/board.c index dbbdc43b59..99d8ed6967 100644 --- a/bsp/stm32/stm32l433-ali-startkit/board/board.c +++ b/bsp/stm32/stm32l433-ali-startkit/board/board.c @@ -9,6 +9,7 @@ */ #include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l433-ali-startkit/board/board.h b/bsp/stm32/stm32l433-ali-startkit/board/board.h index 59c7733604..b2e4c3d1ce 100644 --- a/bsp/stm32/stm32l433-ali-startkit/board/board.h +++ b/bsp/stm32/stm32l433-ali-startkit/board/board.h @@ -11,9 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l433-st-nucleo/Kconfig b/bsp/stm32/stm32l433-st-nucleo/Kconfig index 362bdfbed8..6c59518b96 100644 --- a/bsp/stm32/stm32l433-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l433-st-nucleo/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L433RC + bool + select SOC_SERIES_STM32L4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l433-st-nucleo/applications/main.c b/bsp/stm32/stm32l433-st-nucleo/applications/main.c index 93992725f1..75a083692c 100644 --- a/bsp/stm32/stm32l433-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32l433-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift first version + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PB13 */ #define LED0_PIN GET_PIN(B, 13) diff --git a/bsp/stm32/stm32l433-st-nucleo/board/Kconfig b/bsp/stm32/stm32l433-st-nucleo/board/Kconfig index 0fb450304e..dfb3ccca48 100644 --- a/bsp/stm32/stm32l433-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l433-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L433RC - bool - select SOC_SERIES_STM32L4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu diff --git a/bsp/stm32/stm32l433-st-nucleo/board/board.c b/bsp/stm32/stm32l433-st-nucleo/board/board.c index 284b759c59..dc80b0daa0 100644 --- a/bsp/stm32/stm32l433-st-nucleo/board/board.c +++ b/bsp/stm32/stm32l433-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include +#include /** * @brief System Clock Configuration diff --git a/bsp/stm32/stm32l433-st-nucleo/board/board.h b/bsp/stm32/stm32l433-st-nucleo/board/board.h index 77db7fce6e..6ba7e1b06a 100644 --- a/bsp/stm32/stm32l433-st-nucleo/board/board.h +++ b/bsp/stm32/stm32l433-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l452-st-nucleo/Kconfig b/bsp/stm32/stm32l452-st-nucleo/Kconfig index 362bdfbed8..e1406185e3 100644 --- a/bsp/stm32/stm32l452-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l452-st-nucleo/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L452RE + bool + select SOC_SERIES_STM32L4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l452-st-nucleo/applications/main.c b/bsp/stm32/stm32l452-st-nucleo/applications/main.c index 5524d24935..f3e9307edf 100644 --- a/bsp/stm32/stm32l452-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32l452-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift first version + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED2 pin: PA5 */ #define LED2_PIN GET_PIN(A, 5) diff --git a/bsp/stm32/stm32l452-st-nucleo/board/Kconfig b/bsp/stm32/stm32l452-st-nucleo/board/Kconfig index 2470c20b36..d95b27881f 100644 --- a/bsp/stm32/stm32l452-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l452-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L452RE - bool - select SOC_SERIES_STM32L4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu diff --git a/bsp/stm32/stm32l452-st-nucleo/board/board.c b/bsp/stm32/stm32l452-st-nucleo/board/board.c index d6c090b6b8..f2a144da0a 100644 --- a/bsp/stm32/stm32l452-st-nucleo/board/board.c +++ b/bsp/stm32/stm32l452-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include +#include /** * @brief System Clock Configuration diff --git a/bsp/stm32/stm32l452-st-nucleo/board/board.h b/bsp/stm32/stm32l452-st-nucleo/board/board.h index 9c481c4983..a9d8ea86e4 100644 --- a/bsp/stm32/stm32l452-st-nucleo/board/board.h +++ b/bsp/stm32/stm32l452-st-nucleo/board/board.h @@ -12,10 +12,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l475-st-discovery/Kconfig b/bsp/stm32/stm32l475-st-discovery/Kconfig index 362bdfbed8..72a179643b 100644 --- a/bsp/stm32/stm32l475-st-discovery/Kconfig +++ b/bsp/stm32/stm32l475-st-discovery/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L475VG + bool + select SOC_SERIES_STM32L4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l475-st-discovery/applications/main.c b/bsp/stm32/stm32l475-st-discovery/applications/main.c index c0c25b6705..5a17dff612 100644 --- a/bsp/stm32/stm32l475-st-discovery/applications/main.c +++ b/bsp/stm32/stm32l475-st-discovery/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2019-3-19 tyustli first version + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PB14 */ #define LED0_PIN GET_PIN(B, 14) diff --git a/bsp/stm32/stm32l475-st-discovery/board/Kconfig b/bsp/stm32/stm32l475-st-discovery/board/Kconfig index 0c695f7520..02063a9a7f 100644 --- a/bsp/stm32/stm32l475-st-discovery/board/Kconfig +++ b/bsp/stm32/stm32l475-st-discovery/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L475VG - bool - select SOC_SERIES_STM32L4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu diff --git a/bsp/stm32/stm32l475-st-discovery/board/board.c b/bsp/stm32/stm32l475-st-discovery/board/board.c index cd2f9a5989..f9df37f961 100644 --- a/bsp/stm32/stm32l475-st-discovery/board/board.c +++ b/bsp/stm32/stm32l475-st-discovery/board/board.c @@ -9,6 +9,7 @@ */ #include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l475-st-discovery/board/board.h b/bsp/stm32/stm32l475-st-discovery/board/board.h index 2b5f830eb9..563993020b 100644 --- a/bsp/stm32/stm32l475-st-discovery/board/board.h +++ b/bsp/stm32/stm32l475-st-discovery/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l476-st-nucleo/Kconfig b/bsp/stm32/stm32l476-st-nucleo/Kconfig index 362bdfbed8..2dfdfdf870 100644 --- a/bsp/stm32/stm32l476-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l476-st-nucleo/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L476RG + bool + select SOC_SERIES_STM32L4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l476-st-nucleo/applications/main.c b/bsp/stm32/stm32l476-st-nucleo/applications/main.c index 2c204ae916..c9585c3450 100644 --- a/bsp/stm32/stm32l476-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32l476-st-nucleo/applications/main.c @@ -6,12 +6,16 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift change to new framework + * 2023-12-03 Meco Man support nano version */ -#include -#include #include -#include "drv_gpio.h" +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ + /* defined the LED0 pin: PA5 */ #define LED0_PIN GET_PIN(A, 5) diff --git a/bsp/stm32/stm32l476-st-nucleo/board/Kconfig b/bsp/stm32/stm32l476-st-nucleo/board/Kconfig index d0eee73a10..6254e081b0 100644 --- a/bsp/stm32/stm32l476-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l476-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L476RG - bool - select SOC_SERIES_STM32L4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_STLINK_TO_USART diff --git a/bsp/stm32/stm32l476-st-nucleo/board/board.c b/bsp/stm32/stm32l476-st-nucleo/board/board.c index 0d279e679a..4dc41b0287 100644 --- a/bsp/stm32/stm32l476-st-nucleo/board/board.c +++ b/bsp/stm32/stm32l476-st-nucleo/board/board.c @@ -10,6 +10,8 @@ */ #include +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l476-st-nucleo/board/board.h b/bsp/stm32/stm32l476-st-nucleo/board/board.h index c0b6a905ff..b8c598903d 100644 --- a/bsp/stm32/stm32l476-st-nucleo/board/board.h +++ b/bsp/stm32/stm32l476-st-nucleo/board/board.h @@ -11,10 +11,8 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" +#include #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l496-ali-developer/Kconfig b/bsp/stm32/stm32l496-ali-developer/Kconfig index 362bdfbed8..7b0945aec2 100644 --- a/bsp/stm32/stm32l496-ali-developer/Kconfig +++ b/bsp/stm32/stm32l496-ali-developer/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L496VG + bool + select SOC_SERIES_STM32L4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l496-ali-developer/applications/main.c b/bsp/stm32/stm32l496-ali-developer/applications/main.c index 1d40627d3c..07e3c88188 100644 --- a/bsp/stm32/stm32l496-ali-developer/applications/main.c +++ b/bsp/stm32/stm32l496-ali-developer/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift first version + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PE7 */ #define LED0_PIN GET_PIN(B, 6) diff --git a/bsp/stm32/stm32l496-ali-developer/board/Kconfig b/bsp/stm32/stm32l496-ali-developer/board/Kconfig index 1b21530b7c..a5c3f2a56b 100644 --- a/bsp/stm32/stm32l496-ali-developer/board/Kconfig +++ b/bsp/stm32/stm32l496-ali-developer/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L496VG - bool - select SOC_SERIES_STM32L4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_STLINK_TO_USART diff --git a/bsp/stm32/stm32l496-ali-developer/board/board.c b/bsp/stm32/stm32l496-ali-developer/board/board.c index 7a1964ae50..d91ec2e8a7 100644 --- a/bsp/stm32/stm32l496-ali-developer/board/board.c +++ b/bsp/stm32/stm32l496-ali-developer/board/board.c @@ -9,6 +9,7 @@ */ #include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l496-ali-developer/board/board.h b/bsp/stm32/stm32l496-ali-developer/board/board.h index dc2db87b70..148ef6cfbe 100644 --- a/bsp/stm32/stm32l496-ali-developer/board/board.h +++ b/bsp/stm32/stm32l496-ali-developer/board/board.h @@ -11,9 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l496-st-discovery/Kconfig b/bsp/stm32/stm32l496-st-discovery/Kconfig index 362bdfbed8..5fbccb10c3 100644 --- a/bsp/stm32/stm32l496-st-discovery/Kconfig +++ b/bsp/stm32/stm32l496-st-discovery/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L496AG + bool + select SOC_SERIES_STM32L4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l496-st-discovery/applications/main.c b/bsp/stm32/stm32l496-st-discovery/applications/main.c index 5f890b607e..525256bc5a 100644 --- a/bsp/stm32/stm32l496-st-discovery/applications/main.c +++ b/bsp/stm32/stm32l496-st-discovery/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2023-5-22 Rain Park first version + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PB13 */ #define LED0_PIN GET_PIN(B, 13) diff --git a/bsp/stm32/stm32l496-st-discovery/board/Kconfig b/bsp/stm32/stm32l496-st-discovery/board/Kconfig index 8ab426c110..8c912b9c48 100644 --- a/bsp/stm32/stm32l496-st-discovery/board/Kconfig +++ b/bsp/stm32/stm32l496-st-discovery/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L496AG - bool - select SOC_SERIES_STM32L4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu diff --git a/bsp/stm32/stm32l496-st-discovery/board/board.c b/bsp/stm32/stm32l496-st-discovery/board/board.c index ecdff61461..7cb067780e 100644 --- a/bsp/stm32/stm32l496-st-discovery/board/board.c +++ b/bsp/stm32/stm32l496-st-discovery/board/board.c @@ -8,7 +8,8 @@ * 2023-5-22 Rain Park first version */ -#include "board.h" +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l496-st-discovery/board/board.h b/bsp/stm32/stm32l496-st-discovery/board/board.h index e2290bbd57..0d001eb1c2 100644 --- a/bsp/stm32/stm32l496-st-discovery/board/board.h +++ b/bsp/stm32/stm32l496-st-discovery/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l496-st-nucleo/Kconfig b/bsp/stm32/stm32l496-st-nucleo/Kconfig index 362bdfbed8..3015d9330f 100644 --- a/bsp/stm32/stm32l496-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l496-st-nucleo/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L496ZG + bool + select SOC_SERIES_STM32L4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l496-st-nucleo/applications/main.c b/bsp/stm32/stm32l496-st-nucleo/applications/main.c index 691dadac22..2dd5896978 100644 --- a/bsp/stm32/stm32l496-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32l496-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2020-03-14 super_mcu first version + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED2 pin: PB7 */ #define LED2_PIN GET_PIN(B, 7) diff --git a/bsp/stm32/stm32l496-st-nucleo/board/Kconfig b/bsp/stm32/stm32l496-st-nucleo/board/Kconfig index 82c8aad1e1..2d2eb8a077 100644 --- a/bsp/stm32/stm32l496-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l496-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L496ZG - bool - select SOC_SERIES_STM32L4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_STLINK_TO_USART diff --git a/bsp/stm32/stm32l496-st-nucleo/board/board.c b/bsp/stm32/stm32l496-st-nucleo/board/board.c index 05887f6152..2e7768cc13 100644 --- a/bsp/stm32/stm32l496-st-nucleo/board/board.c +++ b/bsp/stm32/stm32l496-st-nucleo/board/board.c @@ -10,7 +10,7 @@ */ #include -#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l496-st-nucleo/board/board.h b/bsp/stm32/stm32l496-st-nucleo/board/board.h index 63f09134c0..16270a470a 100644 --- a/bsp/stm32/stm32l496-st-nucleo/board/board.h +++ b/bsp/stm32/stm32l496-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l4r5-st-nucleo/Kconfig b/bsp/stm32/stm32l4r5-st-nucleo/Kconfig index 362bdfbed8..9e19d888fa 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l4r5-st-nucleo/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L4R5ZI + bool + select SOC_SERIES_STM32L4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l4r5-st-nucleo/applications/main.c b/bsp/stm32/stm32l4r5-st-nucleo/applications/main.c index 845e68f25f..d3a6724d5c 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32l4r5-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift first version + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED1 pin: PC7 */ #define LED1_PIN GET_PIN(C, 7) diff --git a/bsp/stm32/stm32l4r5-st-nucleo/board/Kconfig b/bsp/stm32/stm32l4r5-st-nucleo/board/Kconfig index 2456f4e0a9..2164499cdb 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l4r5-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" - config SOC_STM32L4R5ZI - bool - select SOC_SERIES_STM32L4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_STLINK_TO_USART bool "Enable STLINK TO USART (lpuart1)" diff --git a/bsp/stm32/stm32l4r5-st-nucleo/board/board.c b/bsp/stm32/stm32l4r5-st-nucleo/board/board.c index 4b1fccdb4e..e8bdc854e1 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/board/board.c +++ b/bsp/stm32/stm32l4r5-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l4r5-st-nucleo/board/board.h b/bsp/stm32/stm32l4r5-st-nucleo/board/board.h index b90222c6e3..10540cd54e 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/board/board.h +++ b/bsp/stm32/stm32l4r5-st-nucleo/board/board.h @@ -12,10 +12,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l4r9-st-eval/Kconfig b/bsp/stm32/stm32l4r9-st-eval/Kconfig index 362bdfbed8..f8921e4b13 100644 --- a/bsp/stm32/stm32l4r9-st-eval/Kconfig +++ b/bsp/stm32/stm32l4r9-st-eval/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L4R9AI + bool + select SOC_SERIES_STM32L4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l4r9-st-eval/applications/main.c b/bsp/stm32/stm32l4r9-st-eval/applications/main.c index ea49f25f87..09cfefa34a 100644 --- a/bsp/stm32/stm32l4r9-st-eval/applications/main.c +++ b/bsp/stm32/stm32l4r9-st-eval/applications/main.c @@ -5,13 +5,16 @@ * * Change Logs: * Date Author Notes - * 2018-11-06 SummerGift first version - * 2019-04-09 jhb + * 2019-04-09 jhb first version + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PB15 */ #define LED0_PIN GET_PIN(B, 15) diff --git a/bsp/stm32/stm32l4r9-st-eval/board/Kconfig b/bsp/stm32/stm32l4r9-st-eval/board/Kconfig index e38e6eb96a..510d2a6aa0 100644 --- a/bsp/stm32/stm32l4r9-st-eval/board/Kconfig +++ b/bsp/stm32/stm32l4r9-st-eval/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L4R9AI - bool - select SOC_SERIES_STM32L4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_STLINK_TO_USART diff --git a/bsp/stm32/stm32l4r9-st-eval/board/board.c b/bsp/stm32/stm32l4r9-st-eval/board/board.c index cf4231f00c..179ccf08ae 100644 --- a/bsp/stm32/stm32l4r9-st-eval/board/board.c +++ b/bsp/stm32/stm32l4r9-st-eval/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l4r9-st-eval/board/board.h b/bsp/stm32/stm32l4r9-st-eval/board/board.h index 7d85022bb4..4552dd794c 100644 --- a/bsp/stm32/stm32l4r9-st-eval/board/board.h +++ b/bsp/stm32/stm32l4r9-st-eval/board/board.h @@ -12,10 +12,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/Kconfig b/bsp/stm32/stm32l4r9-st-sensortile-box/Kconfig index 362bdfbed8..590891b4d7 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/Kconfig +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/Kconfig @@ -15,6 +15,13 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32L4R9ZI + bool + select SOC_SERIES_STM32L4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/applications/main.c b/bsp/stm32/stm32l4r9-st-sensortile-box/applications/main.c index e7f57327e0..7f322cbc48 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/applications/main.c +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2021-08-09 supperthomas first version + * 2023-12-03 Meco Man support nano version */ -#include -#include #include +#include +#include +#ifndef RT_USING_NANO +#include +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PB15 */ #define LED0_PIN GET_PIN(B, 15) diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/board/Kconfig b/bsp/stm32/stm32l4r9-st-sensortile-box/board/Kconfig index 709a2d1ad4..a115cf8ece 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/board/Kconfig +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/board/Kconfig @@ -1,13 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32L4R9ZI - bool - select SOC_SERIES_STM32L4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - - menu "On-chip Peripheral Drivers" config BSP_USING_GPIO diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/board/board.c b/bsp/stm32/stm32l4r9-st-sensortile-box/board/board.c index beacd7ac14..f757d32555 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/board/board.c +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/board/board.c @@ -8,7 +8,8 @@ * 2021-08-09 supperthomas first version */ -#include "board.h" +#include +#include void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/board/board.h b/bsp/stm32/stm32l4r9-st-sensortile-box/board/board.h index 9a9df06b23..a9e89849c9 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/board/board.h +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include #include -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" {