diff options
| author | Meco Man <[email protected]> | 2023-12-03 01:33:34 +0800 |
|---|---|---|
| committer | Meco Man <[email protected]> | 2023-12-03 21:25:00 +0800 |
| commit | bb66d1ea50f51e28c930abe1159b593ed8fabbdc (patch) | |
| tree | f6ff977229ed4b95f94dd804fb76b45ec9eb2da7 /bsp/stm32 | |
| parent | 860094e89366bd6f714728e2e9c3de7517a91720 (diff) | |
[bsp][stm32][nano] support nano version
stm32 BSPs to support nano version (RT_USING_NANO)
这个commit支持到stm32f7之前的BSP
Diffstat (limited to 'bsp/stm32')
305 files changed, 973 insertions, 728 deletions
diff --git a/bsp/stm32/libraries/templates/stm32f0xx/board/Kconfig b/bsp/stm32/libraries/templates/stm32f0xx/board/Kconfig index 6a012363e4..65d07ed9d4 100644 --- a/bsp/stm32/libraries/templates/stm32f0xx/board/Kconfig +++ b/bsp/stm32/libraries/templates/stm32f0xx/board/Kconfig @@ -33,7 +33,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/libraries/templates/stm32f10x/board/Kconfig b/bsp/stm32/libraries/templates/stm32f10x/board/Kconfig index 4adac92499..830c618d39 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/board/Kconfig +++ b/bsp/stm32/libraries/templates/stm32f10x/board/Kconfig @@ -33,7 +33,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/libraries/templates/stm32f2xx/board/Kconfig b/bsp/stm32/libraries/templates/stm32f2xx/board/Kconfig index 62a95b1064..82256ff00b 100644 --- a/bsp/stm32/libraries/templates/stm32f2xx/board/Kconfig +++ b/bsp/stm32/libraries/templates/stm32f2xx/board/Kconfig @@ -33,7 +33,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/libraries/templates/stm32f4xx/board/Kconfig b/bsp/stm32/libraries/templates/stm32f4xx/board/Kconfig index 6b1faba6b0..ac42628c8a 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/board/Kconfig +++ b/bsp/stm32/libraries/templates/stm32f4xx/board/Kconfig @@ -33,7 +33,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/libraries/templates/stm32f7xx/board/Kconfig b/bsp/stm32/libraries/templates/stm32f7xx/board/Kconfig index 4c6c6f7e55..9c9e78fa72 100644 --- a/bsp/stm32/libraries/templates/stm32f7xx/board/Kconfig +++ b/bsp/stm32/libraries/templates/stm32f7xx/board/Kconfig @@ -33,7 +33,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/libraries/templates/stm32h7xx/board/Kconfig b/bsp/stm32/libraries/templates/stm32h7xx/board/Kconfig index 059987a8e1..10133353a3 100644 --- a/bsp/stm32/libraries/templates/stm32h7xx/board/Kconfig +++ b/bsp/stm32/libraries/templates/stm32h7xx/board/Kconfig @@ -29,7 +29,7 @@ menu "On-chip Peripheral Drivers" endif - source "../libraries/HAL_Drivers/drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/libraries/templates/stm32l1xx/board/Kconfig b/bsp/stm32/libraries/templates/stm32l1xx/board/Kconfig index 78831f2106..007b712693 100644 --- a/bsp/stm32/libraries/templates/stm32l1xx/board/Kconfig +++ b/bsp/stm32/libraries/templates/stm32l1xx/board/Kconfig @@ -206,7 +206,7 @@ menu "On-chip Peripheral Drivers" select RT_USING_WDT default n - source "../libraries/HAL_Drivers/drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/libraries/templates/stm32l4xx/board/Kconfig b/bsp/stm32/libraries/templates/stm32l4xx/board/Kconfig index a02e7d7458..6de96ab49e 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/board/Kconfig +++ b/bsp/stm32/libraries/templates/stm32l4xx/board/Kconfig @@ -33,7 +33,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/libraries/templates/stm32l5xx/board/Kconfig b/bsp/stm32/libraries/templates/stm32l5xx/board/Kconfig index 85a3fe5dd3..4bcfb716af 100644 --- a/bsp/stm32/libraries/templates/stm32l5xx/board/Kconfig +++ b/bsp/stm32/libraries/templates/stm32l5xx/board/Kconfig @@ -33,7 +33,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/libraries/templates/stm32mp1xx/board/Kconfig b/bsp/stm32/libraries/templates/stm32mp1xx/board/Kconfig index 28a1826d43..fae6dd32ea 100644 --- a/bsp/stm32/libraries/templates/stm32mp1xx/board/Kconfig +++ b/bsp/stm32/libraries/templates/stm32mp1xx/board/Kconfig @@ -39,7 +39,7 @@ menu "On-chip Peripheral Drivers" endif - source "../libraries/HAL_Drivers/drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/libraries/templates/stm32wbxx/board/Kconfig b/bsp/stm32/libraries/templates/stm32wbxx/board/Kconfig index 0dc981d28c..dde7b3fca3 100644 --- a/bsp/stm32/libraries/templates/stm32wbxx/board/Kconfig +++ b/bsp/stm32/libraries/templates/stm32wbxx/board/Kconfig @@ -157,7 +157,7 @@ menu "On-chip Peripheral Drivers" endchoice endif - source "../libraries/HAL_Drivers/drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f072-st-nucleo/Kconfig b/bsp/stm32/stm32f072-st-nucleo/Kconfig index 7a400db91f..d778e1c805 100644 --- a/bsp/stm32/stm32f072-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f072-st-nucleo/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F072RB + bool + select SOC_SERIES_STM32F0 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f072-st-nucleo/applications/main.c b/bsp/stm32/stm32f072-st-nucleo/applications/main.c index 041c8db15b..22cfb736ce 100644 --- a/bsp/stm32/stm32f072-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32f072-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-06 zylx first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED2 (user LED) pin: PA5 */ #define LED2_PIN GET_PIN(A, 5) diff --git a/bsp/stm32/stm32f072-st-nucleo/board/Kconfig b/bsp/stm32/stm32f072-st-nucleo/board/Kconfig index 647979d24b..54afe7d4c3 100644 --- a/bsp/stm32/stm32f072-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32f072-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F072RB - bool - select SOC_SERIES_STM32F0 - 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)" @@ -166,7 +159,7 @@ menu "On-chip Peripheral Drivers" endif endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f072-st-nucleo/board/board.c b/bsp/stm32/stm32f072-st-nucleo/board/board.c index 5f06e3253d..f5801258a5 100644 --- a/bsp/stm32/stm32f072-st-nucleo/board/board.c +++ b/bsp/stm32/stm32f072-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-12-21 zylx first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f072-st-nucleo/board/board.h b/bsp/stm32/stm32f072-st-nucleo/board/board.h index 4dc58c3c92..834459c102 100644 --- a/bsp/stm32/stm32f072-st-nucleo/board/board.h +++ b/bsp/stm32/stm32f072-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f0xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f091-st-nucleo/Kconfig b/bsp/stm32/stm32f091-st-nucleo/Kconfig index 7a400db91f..41aaf93bd5 100644 --- a/bsp/stm32/stm32f091-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f091-st-nucleo/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F091RC + bool + select SOC_SERIES_STM32F0 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f091-st-nucleo/applications/main.c b/bsp/stm32/stm32f091-st-nucleo/applications/main.c index 61981d49b0..596eb77e8e 100644 --- a/bsp/stm32/stm32f091-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32f091-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-06 zylx first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED2 pin: PA5 */ #define LED2_PIN GET_PIN(A, 5) diff --git a/bsp/stm32/stm32f091-st-nucleo/board/Kconfig b/bsp/stm32/stm32f091-st-nucleo/board/Kconfig index 804cc2f258..ac2c40d16a 100644 --- a/bsp/stm32/stm32f091-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32f091-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F091RC - bool - select SOC_SERIES_STM32F0 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART @@ -157,7 +150,7 @@ menu "On-chip Peripheral Drivers" select RT_USING_WDT default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f091-st-nucleo/board/board.c b/bsp/stm32/stm32f091-st-nucleo/board/board.c index ec74fe9af0..45ddb95185 100644 --- a/bsp/stm32/stm32f091-st-nucleo/board/board.c +++ b/bsp/stm32/stm32f091-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-12-21 zylx first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f091-st-nucleo/board/board.h b/bsp/stm32/stm32f091-st-nucleo/board/board.h index efd152dc0d..6f5b342908 100644 --- a/bsp/stm32/stm32f091-st-nucleo/board/board.h +++ b/bsp/stm32/stm32f091-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f0xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f103-100ask-mini/Kconfig b/bsp/stm32/stm32f103-100ask-mini/Kconfig index 7a400db91f..4199912f98 100644 --- a/bsp/stm32/stm32f103-100ask-mini/Kconfig +++ b/bsp/stm32/stm32f103-100ask-mini/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F103C8 + bool + select SOC_SERIES_STM32F1 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f103-100ask-mini/applications/main.c b/bsp/stm32/stm32f103-100ask-mini/applications/main.c index 666fafcb6c..259581ae40 100644 --- a/bsp/stm32/stm32f103-100ask-mini/applications/main.c +++ b/bsp/stm32/stm32f103-100ask-mini/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2019-03-08 obito0 first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PA1 */ #define LED0_PIN GET_PIN(A, 1) diff --git a/bsp/stm32/stm32f103-100ask-mini/board/Kconfig b/bsp/stm32/stm32f103-100ask-mini/board/Kconfig index ee8a6172c2..875265bdf9 100644 --- a/bsp/stm32/stm32f103-100ask-mini/board/Kconfig +++ b/bsp/stm32/stm32f103-100ask-mini/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F103C8 - bool - select SOC_SERIES_STM32F1 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART @@ -79,7 +72,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f103-100ask-mini/board/board.c b/bsp/stm32/stm32f103-100ask-mini/board/board.c index 22f1cc14f7..12c86d81c0 100644 --- a/bsp/stm32/stm32f103-100ask-mini/board/board.c +++ b/bsp/stm32/stm32f103-100ask-mini/board/board.c @@ -8,7 +8,8 @@ * 2019-03-08 obito0 first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f103-100ask-mini/board/board.h b/bsp/stm32/stm32f103-100ask-mini/board/board.h index 6c852d9609..259a1cdbae 100644 --- a/bsp/stm32/stm32f103-100ask-mini/board/board.h +++ b/bsp/stm32/stm32f103-100ask-mini/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f1xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f103-100ask-pro/Kconfig b/bsp/stm32/stm32f103-100ask-pro/Kconfig index 7a400db91f..ed350cbe67 100644 --- a/bsp/stm32/stm32f103-100ask-pro/Kconfig +++ b/bsp/stm32/stm32f103-100ask-pro/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F103ZE + bool + select SOC_SERIES_STM32F1 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f103-100ask-pro/applications/main.c b/bsp/stm32/stm32f103-100ask-pro/applications/main.c index 8e9473cb6e..849f73d74d 100644 --- a/bsp/stm32/stm32f103-100ask-pro/applications/main.c +++ b/bsp/stm32/stm32f103-100ask-pro/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2019-03-08 obito0 first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PA1 */ #define LED0_PIN GET_PIN(B, 5) diff --git a/bsp/stm32/stm32f103-100ask-pro/board/Kconfig b/bsp/stm32/stm32f103-100ask-pro/board/Kconfig index e7a16e428e..b6566158e5 100644 --- a/bsp/stm32/stm32f103-100ask-pro/board/Kconfig +++ b/bsp/stm32/stm32f103-100ask-pro/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F103ZE - bool - select SOC_SERIES_STM32F1 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART @@ -208,7 +201,7 @@ menu "On-chip Peripheral Drivers" select RT_USING_CAN default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f103-100ask-pro/board/board.c b/bsp/stm32/stm32f103-100ask-pro/board/board.c index 22f1cc14f7..12c86d81c0 100644 --- a/bsp/stm32/stm32f103-100ask-pro/board/board.c +++ b/bsp/stm32/stm32f103-100ask-pro/board/board.c @@ -8,7 +8,8 @@ * 2019-03-08 obito0 first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f103-100ask-pro/board/board.h b/bsp/stm32/stm32f103-100ask-pro/board/board.h index 023339a177..e63e4c96d9 100644 --- a/bsp/stm32/stm32f103-100ask-pro/board/board.h +++ b/bsp/stm32/stm32f103-100ask-pro/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f1xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f103-atk-nano/Kconfig b/bsp/stm32/stm32f103-atk-nano/Kconfig index 7a400db91f..3b4560cdca 100644 --- a/bsp/stm32/stm32f103-atk-nano/Kconfig +++ b/bsp/stm32/stm32f103-atk-nano/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F103RB + bool + select SOC_SERIES_STM32F1 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f103-atk-nano/applications/main.c b/bsp/stm32/stm32f103-atk-nano/applications/main.c index 8569ce27bd..f08e254302 100644 --- a/bsp/stm32/stm32f103-atk-nano/applications/main.c +++ b/bsp/stm32/stm32f103-atk-nano/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-27 balanceTWK first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PC0 */ #define LED0_PIN GET_PIN(C, 0) diff --git a/bsp/stm32/stm32f103-atk-nano/board/Kconfig b/bsp/stm32/stm32f103-atk-nano/board/Kconfig index 0211a46686..98d2e21cb7 100644 --- a/bsp/stm32/stm32f103-atk-nano/board/Kconfig +++ b/bsp/stm32/stm32f103-atk-nano/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F103RB - bool - select SOC_SERIES_STM32F1 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART @@ -202,7 +195,7 @@ menu "On-chip Peripheral Drivers" select RT_USING_WDT default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f103-atk-nano/board/board.c b/bsp/stm32/stm32f103-atk-nano/board/board.c index de585efe32..26c9890360 100644 --- a/bsp/stm32/stm32f103-atk-nano/board/board.c +++ b/bsp/stm32/stm32f103-atk-nano/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 balanceTWK first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f103-atk-nano/board/board.h b/bsp/stm32/stm32f103-atk-nano/board/board.h index 05d7bdaf2d..35fb86ea50 100644 --- a/bsp/stm32/stm32f103-atk-nano/board/board.h +++ b/bsp/stm32/stm32f103-atk-nano/board/board.h @@ -12,8 +12,6 @@ #define __BOARD_H__ #include <stm32f1xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f103-atk-warshipv3/Kconfig b/bsp/stm32/stm32f103-atk-warshipv3/Kconfig index 7a400db91f..ed350cbe67 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/Kconfig +++ b/bsp/stm32/stm32f103-atk-warshipv3/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F103ZE + bool + select SOC_SERIES_STM32F1 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f103-atk-warshipv3/applications/main.c b/bsp/stm32/stm32f103-atk-warshipv3/applications/main.c index 8de9bd81e9..f58052fbda 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/applications/main.c +++ b/bsp/stm32/stm32f103-atk-warshipv3/applications/main.c @@ -5,12 +5,16 @@ * * Change Logs: * Date Author Notes - * 2019-03-08 obito0 first version + * 2019-03-08 obito0 first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PB5 */ #define LED0_PIN GET_PIN(B, 5) diff --git a/bsp/stm32/stm32f103-atk-warshipv3/board/Kconfig b/bsp/stm32/stm32f103-atk-warshipv3/board/Kconfig index 9d3e81b729..a2a5f6f20c 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/board/Kconfig +++ b/bsp/stm32/stm32f103-atk-warshipv3/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F103ZE - bool - select SOC_SERIES_STM32F1 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART @@ -242,7 +235,7 @@ menu "On-chip Peripheral Drivers" endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f103-atk-warshipv3/board/board.c b/bsp/stm32/stm32f103-atk-warshipv3/board/board.c index 2dc4c9cabf..cb4f9d3c34 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/board/board.c +++ b/bsp/stm32/stm32f103-atk-warshipv3/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f103-atk-warshipv3/board/board.h b/bsp/stm32/stm32f103-atk-warshipv3/board/board.h index 023339a177..e63e4c96d9 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/board/board.h +++ b/bsp/stm32/stm32f103-atk-warshipv3/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f1xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f103-blue-pill/Kconfig b/bsp/stm32/stm32f103-blue-pill/Kconfig index 5b7fab59c3..29d94cb329 100644 --- a/bsp/stm32/stm32f103-blue-pill/Kconfig +++ b/bsp/stm32/stm32f103-blue-pill/Kconfig @@ -24,8 +24,8 @@ config SOC_STM32F103C8 source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" +source "../libraries/Kconfig" if !RT_USING_NANO -source "../libraries/Kconfig" source "board/Kconfig" endif diff --git a/bsp/stm32/stm32f103-blue-pill/applications/main.c b/bsp/stm32/stm32f103-blue-pill/applications/main.c index 9f4d8cbd95..13b172c830 100644 --- a/bsp/stm32/stm32f103-blue-pill/applications/main.c +++ b/bsp/stm32/stm32f103-blue-pill/applications/main.c @@ -6,13 +6,16 @@ * Change Logs: * Date Author Notes * 2019-03-08 obito0 first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ -#ifndef RT_USING_NANO /* defined the LED0 pin: PC13 */ #define LED0_PIN GET_PIN(C, 13) @@ -29,12 +32,3 @@ int main(void) rt_thread_mdelay(500); } } -#else -int main(void) -{ - while (1) - { - rt_thread_mdelay(500); - } -} -#endif diff --git a/bsp/stm32/stm32f103-blue-pill/board/Kconfig b/bsp/stm32/stm32f103-blue-pill/board/Kconfig index ebb05969e9..c5c82c8ef0 100644 --- a/bsp/stm32/stm32f103-blue-pill/board/Kconfig +++ b/bsp/stm32/stm32f103-blue-pill/board/Kconfig @@ -188,7 +188,7 @@ menu "On-chip Peripheral Drivers" select RT_USING_USB_DEVICE default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f103-blue-pill/board/board.c b/bsp/stm32/stm32f103-blue-pill/board/board.c index 53ddd078b6..12c86d81c0 100644 --- a/bsp/stm32/stm32f103-blue-pill/board/board.c +++ b/bsp/stm32/stm32f103-blue-pill/board/board.c @@ -8,7 +8,8 @@ * 2019-03-08 obito0 first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { @@ -51,10 +52,3 @@ void SystemClock_Config(void) Error_Handler(); } } - -#ifdef RT_USING_NANO -void rt_hw_board_init(void) -{ - -} -#endif diff --git a/bsp/stm32/stm32f103-blue-pill/board/board.h b/bsp/stm32/stm32f103-blue-pill/board/board.h index 04f89988a7..35fb86ea50 100644 --- a/bsp/stm32/stm32f103-blue-pill/board/board.h +++ b/bsp/stm32/stm32f103-blue-pill/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f1xx.h> -#include <drv_common.h> -#include <drv_gpio.h> #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f103-dofly-M3S/Kconfig b/bsp/stm32/stm32f103-dofly-M3S/Kconfig index 7a400db91f..ed350cbe67 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/Kconfig +++ b/bsp/stm32/stm32f103-dofly-M3S/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F103ZE + bool + select SOC_SERIES_STM32F1 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f103-dofly-M3S/applications/main.c b/bsp/stm32/stm32f103-dofly-M3S/applications/main.c index 3101374062..8a6b46cc39 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/applications/main.c +++ b/bsp/stm32/stm32f103-dofly-M3S/applications/main.c @@ -5,13 +5,16 @@ * * Change Logs: * Date Author Notes - * 2018-11-06 SummerGift first version - * 2019-04-09 WillianChan add stm32f103-dofly-M3S BSP + * 2019-04-09 WillianChan first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PE5 */ #define LED0_PIN GET_PIN(E, 5) diff --git a/bsp/stm32/stm32f103-dofly-M3S/board/Kconfig b/bsp/stm32/stm32f103-dofly-M3S/board/Kconfig index 87315ee04e..e52ce5e597 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/board/Kconfig +++ b/bsp/stm32/stm32f103-dofly-M3S/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F103ZE - bool - select SOC_SERIES_STM32F1 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_SDIO_SDCARD @@ -136,7 +129,7 @@ menu "On-chip Peripheral Drivers" select RT_USING_SDIO select RT_USING_DFS default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f103-dofly-M3S/board/board.c b/bsp/stm32/stm32f103-dofly-M3S/board/board.c index d32a5096b6..2ec07d9459 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/board/board.c +++ b/bsp/stm32/stm32f103-dofly-M3S/board/board.c @@ -9,7 +9,8 @@ * 2019-04-09 WillianChan add stm32f103-dofly-M3S BSP */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f103-dofly-M3S/board/board.h b/bsp/stm32/stm32f103-dofly-M3S/board/board.h index 8403f451d4..816d8875c7 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/board/board.h +++ b/bsp/stm32/stm32f103-dofly-M3S/board/board.h @@ -12,10 +12,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f1xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f103-dofly-lyc8/Kconfig b/bsp/stm32/stm32f103-dofly-lyc8/Kconfig index 7a400db91f..4199912f98 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/Kconfig +++ b/bsp/stm32/stm32f103-dofly-lyc8/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F103C8 + bool + select SOC_SERIES_STM32F1 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f103-dofly-lyc8/applications/main.c b/bsp/stm32/stm32f103-dofly-lyc8/applications/main.c index ce702bb417..b53fdcb2b4 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/applications/main.c +++ b/bsp/stm32/stm32f103-dofly-lyc8/applications/main.c @@ -6,12 +6,16 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> -#include "drv_gpio.h" +#endif /* RT_USING_NANO */ + /* defined the LED0 pin: PB8 */ #define LED0_PIN GET_PIN(B, 8) diff --git a/bsp/stm32/stm32f103-dofly-lyc8/board/Kconfig b/bsp/stm32/stm32f103-dofly-lyc8/board/Kconfig index c7657228fa..02063a9a7f 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/board/Kconfig +++ b/bsp/stm32/stm32f103-dofly-lyc8/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F103C8 - bool - select SOC_SERIES_STM32F1 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu @@ -32,7 +25,7 @@ menu "On-chip Peripheral Drivers" depends on BSP_USING_UART1 && RT_SERIAL_USING_DMA default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f103-dofly-lyc8/board/board.c b/bsp/stm32/stm32f103-dofly-lyc8/board/board.c index 8493439409..dc042d25a2 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/board/board.c +++ b/bsp/stm32/stm32f103-dofly-lyc8/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f103-dofly-lyc8/board/board.h b/bsp/stm32/stm32f103-dofly-lyc8/board/board.h index 3d813a0af0..2d2e9b5ec2 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/board/board.h +++ b/bsp/stm32/stm32f103-dofly-lyc8/board/board.h @@ -11,9 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f1xx.h> -#include "drv_common.h" #define STM32_FLASH_START_ADRESS ((uint32_t)0x08000000) #define STM32_FLASH_SIZE (64 * 1024) diff --git a/bsp/stm32/stm32f103-fire-arbitrary/Kconfig b/bsp/stm32/stm32f103-fire-arbitrary/Kconfig index 7a400db91f..ed350cbe67 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/Kconfig +++ b/bsp/stm32/stm32f103-fire-arbitrary/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F103ZE + bool + select SOC_SERIES_STM32F1 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f103-fire-arbitrary/applications/main.c b/bsp/stm32/stm32f103-fire-arbitrary/applications/main.c index e3078f4e82..f927eb72a5 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/applications/main.c +++ b/bsp/stm32/stm32f103-fire-arbitrary/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-5 SummerGift first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PF7 */ #define LED0_PIN GET_PIN(F, 7) diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/Kconfig b/bsp/stm32/stm32f103-fire-arbitrary/board/Kconfig index 1da381d3f4..15722983d5 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/Kconfig +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F103ZE - bool - select SOC_SERIES_STM32F1 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART @@ -310,7 +303,7 @@ menu "On-chip Peripheral Drivers" int "USB PULL UP STATUS" default 0 endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/board.c b/bsp/stm32/stm32f103-fire-arbitrary/board/board.c index abbc74be30..f43ee1d815 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/board.c +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/board.c @@ -8,8 +8,8 @@ * 2018-11-06 balanceTWK first version */ -#include <rtthread.h> -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/board.h b/bsp/stm32/stm32f103-fire-arbitrary/board/board.h index 3cc20b82e4..ffa5bfa5d6 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/board.h +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f1xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/Kconfig b/bsp/stm32/stm32f103-gizwits-gokitv21/Kconfig index 7a400db91f..4199912f98 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/Kconfig +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F103C8 + bool + select SOC_SERIES_STM32F1 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/applications/main.c b/bsp/stm32/stm32f103-gizwits-gokitv21/applications/main.c index a2ffe21b45..e6fd461504 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/applications/main.c +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/applications/main.c @@ -5,12 +5,15 @@ * * Change Logs: * Date Author Notes - * 2018-11-06 SummerGift first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED4 pin: PB1 */ #define LED4_PIN GET_PIN(B, 1) diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/board/Kconfig b/bsp/stm32/stm32f103-gizwits-gokitv21/board/Kconfig index 7e159d6fb1..c9fe11cdaf 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/board/Kconfig +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F103C8 - bool - select SOC_SERIES_STM32F1 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu @@ -78,7 +71,7 @@ menu "On-chip Peripheral Drivers" range 1 216 default 16 endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/board/board.c b/bsp/stm32/stm32f103-gizwits-gokitv21/board/board.c index 55faf0d89f..b0b85dcfc8 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/board/board.c +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> /** * @brief System Clock Configuration diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/board/board.h b/bsp/stm32/stm32f103-gizwits-gokitv21/board/board.h index 6c852d9609..259a1cdbae 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/board/board.h +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f1xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f103-hw100k-ibox/Kconfig b/bsp/stm32/stm32f103-hw100k-ibox/Kconfig index 7a400db91f..ed350cbe67 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/Kconfig +++ b/bsp/stm32/stm32f103-hw100k-ibox/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F103ZE + bool + select SOC_SERIES_STM32F1 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f103-hw100k-ibox/applications/main.c b/bsp/stm32/stm32f103-hw100k-ibox/applications/main.c index 5ba5873b52..125bca3f7c 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/applications/main.c +++ b/bsp/stm32/stm32f103-hw100k-ibox/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 <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PE9 */ #define LED0_PIN GET_PIN(E, 9) diff --git a/bsp/stm32/stm32f103-hw100k-ibox/board/Kconfig b/bsp/stm32/stm32f103-hw100k-ibox/board/Kconfig index 7c7cce397c..caef7e8925 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/board/Kconfig +++ b/bsp/stm32/stm32f103-hw100k-ibox/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F103ZE - bool - select SOC_SERIES_STM32F1 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_RS485_OR_RS232 bool "Enable RS485/RS232 (uart4 be shared)" @@ -216,7 +209,7 @@ menu "On-chip Peripheral Drivers" bool "Enable Watchdog Timer" select RT_USING_WDT default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f103-hw100k-ibox/board/board.c b/bsp/stm32/stm32f103-hw100k-ibox/board/board.c index 779d731980..ef0e9ac8d0 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/board/board.c +++ b/bsp/stm32/stm32f103-hw100k-ibox/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f103-hw100k-ibox/board/board.h b/bsp/stm32/stm32f103-hw100k-ibox/board/board.h index 3dfff3bdb0..e25394bb32 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/board/board.h +++ b/bsp/stm32/stm32f103-hw100k-ibox/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f1xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f103-onenet-nbiot/Kconfig b/bsp/stm32/stm32f103-onenet-nbiot/Kconfig index 7a400db91f..3b4560cdca 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/Kconfig +++ b/bsp/stm32/stm32f103-onenet-nbiot/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F103RB + bool + select SOC_SERIES_STM32F1 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f103-onenet-nbiot/applications/main.c b/bsp/stm32/stm32f103-onenet-nbiot/applications/main.c index 8569ce27bd..f08e254302 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/applications/main.c +++ b/bsp/stm32/stm32f103-onenet-nbiot/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-27 balanceTWK first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PC0 */ #define LED0_PIN GET_PIN(C, 0) diff --git a/bsp/stm32/stm32f103-onenet-nbiot/board/Kconfig b/bsp/stm32/stm32f103-onenet-nbiot/board/Kconfig index b532fa55c4..e4d4bb6a2e 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/board/Kconfig +++ b/bsp/stm32/stm32f103-onenet-nbiot/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F103RB - bool - select SOC_SERIES_STM32F1 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART @@ -68,7 +61,7 @@ menu "On-chip Peripheral Drivers" endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f103-onenet-nbiot/board/board.c b/bsp/stm32/stm32f103-onenet-nbiot/board/board.c index 5e045816b2..aef0086868 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/board/board.c +++ b/bsp/stm32/stm32f103-onenet-nbiot/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 balanceTWK first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> /** * @brief System Clock Configuration diff --git a/bsp/stm32/stm32f103-onenet-nbiot/board/board.h b/bsp/stm32/stm32f103-onenet-nbiot/board/board.h index 2e5f93a0bb..e63e4c96d9 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/board/board.h +++ b/bsp/stm32/stm32f103-onenet-nbiot/board/board.h @@ -12,8 +12,6 @@ #define __BOARD_H__ #include <stm32f1xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f103-yf-ufun/Kconfig b/bsp/stm32/stm32f103-yf-ufun/Kconfig index 7a400db91f..310d56eb02 100644 --- a/bsp/stm32/stm32f103-yf-ufun/Kconfig +++ b/bsp/stm32/stm32f103-yf-ufun/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F103RC + bool + select SOC_SERIES_STM32F1 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f103-yf-ufun/applications/main.c b/bsp/stm32/stm32f103-yf-ufun/applications/main.c index 8f9c5c7a07..e7057a7bf9 100644 --- a/bsp/stm32/stm32f103-yf-ufun/applications/main.c +++ b/bsp/stm32/stm32f103-yf-ufun/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 <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED3 pin: PA3 */ #define LED3_PIN GET_PIN(A, 3) diff --git a/bsp/stm32/stm32f103-yf-ufun/board/Kconfig b/bsp/stm32/stm32f103-yf-ufun/board/Kconfig index 4892c73b49..dc853634e1 100644 --- a/bsp/stm32/stm32f103-yf-ufun/board/Kconfig +++ b/bsp/stm32/stm32f103-yf-ufun/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F103RC - bool - select SOC_SERIES_STM32F1 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu @@ -101,7 +94,7 @@ menu "On-chip Peripheral Drivers" select RT_USING_DFS_ELMFAT default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f103-yf-ufun/board/board.c b/bsp/stm32/stm32f103-yf-ufun/board/board.c index 5271b59c71..0ee9ec3799 100644 --- a/bsp/stm32/stm32f103-yf-ufun/board/board.c +++ b/bsp/stm32/stm32f103-yf-ufun/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f103-yf-ufun/board/board.h b/bsp/stm32/stm32f103-yf-ufun/board/board.h index fa0ff3fed2..c411be8f06 100644 --- a/bsp/stm32/stm32f103-yf-ufun/board/board.h +++ b/bsp/stm32/stm32f103-yf-ufun/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f1xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f103-ys-f1pro/Kconfig b/bsp/stm32/stm32f103-ys-f1pro/Kconfig index 7a400db91f..ed350cbe67 100644 --- a/bsp/stm32/stm32f103-ys-f1pro/Kconfig +++ b/bsp/stm32/stm32f103-ys-f1pro/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F103ZE + bool + select SOC_SERIES_STM32F1 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f103-ys-f1pro/applications/main.c b/bsp/stm32/stm32f103-ys-f1pro/applications/main.c index adf981c8b0..90b5fb3e14 100644 --- a/bsp/stm32/stm32f103-ys-f1pro/applications/main.c +++ b/bsp/stm32/stm32f103-ys-f1pro/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2022-09-01 liYony first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED1 pin: PB0 */ #define LED1_PIN GET_PIN(B, 0) diff --git a/bsp/stm32/stm32f103-ys-f1pro/board/Kconfig b/bsp/stm32/stm32f103-ys-f1pro/board/Kconfig index 7ed6ebc52c..23a802ef93 100644 --- a/bsp/stm32/stm32f103-ys-f1pro/board/Kconfig +++ b/bsp/stm32/stm32f103-ys-f1pro/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F103ZE - bool - select SOC_SERIES_STM32F1 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu @@ -34,7 +27,7 @@ menu "On-chip Peripheral Drivers" endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f103-ys-f1pro/board/board.c b/bsp/stm32/stm32f103-ys-f1pro/board/board.c index 6fad08c1d7..82502b3c1d 100644 --- a/bsp/stm32/stm32f103-ys-f1pro/board/board.c +++ b/bsp/stm32/stm32f103-ys-f1pro/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> /** * @brief System Clock Configuration diff --git a/bsp/stm32/stm32f103-ys-f1pro/board/board.h b/bsp/stm32/stm32f103-ys-f1pro/board/board.h index 250e5c7b03..9dfa04eea8 100644 --- a/bsp/stm32/stm32f103-ys-f1pro/board/board.h +++ b/bsp/stm32/stm32f103-ys-f1pro/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f1xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f107-uc-eval/Kconfig b/bsp/stm32/stm32f107-uc-eval/Kconfig index 7a400db91f..cf7bf14f7f 100644 --- a/bsp/stm32/stm32f107-uc-eval/Kconfig +++ b/bsp/stm32/stm32f107-uc-eval/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F107VC + bool + select SOC_SERIES_STM32F1 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f107-uc-eval/applications/main.c b/bsp/stm32/stm32f107-uc-eval/applications/main.c index 9f1a27444d..5d53deab41 100644 --- a/bsp/stm32/stm32f107-uc-eval/applications/main.c +++ b/bsp/stm32/stm32f107-uc-eval/applications/main.c @@ -7,11 +7,15 @@ * Date Author Notes * 2018-11-06 SummerGift change to new framework * 2019-01-12 whj add stm32f107-uc-Eval bsp + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED1 pin: PD13 */ #define LED1_PIN GET_PIN(D, 13) diff --git a/bsp/stm32/stm32f107-uc-eval/board/Kconfig b/bsp/stm32/stm32f107-uc-eval/board/Kconfig index 10acf5fca5..98dcf2f1ae 100644 --- a/bsp/stm32/stm32f107-uc-eval/board/Kconfig +++ b/bsp/stm32/stm32f107-uc-eval/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F107VC - bool - select SOC_SERIES_STM32F1 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART @@ -41,7 +34,7 @@ menu "On-chip Peripheral Drivers" endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f107-uc-eval/board/board.c b/bsp/stm32/stm32f107-uc-eval/board/board.c index f053579c2f..4587941d68 100644 --- a/bsp/stm32/stm32f107-uc-eval/board/board.c +++ b/bsp/stm32/stm32f107-uc-eval/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift change to new framework */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f107-uc-eval/board/board.h b/bsp/stm32/stm32f107-uc-eval/board/board.h index ce1681ba28..ba31da810d 100644 --- a/bsp/stm32/stm32f107-uc-eval/board/board.h +++ b/bsp/stm32/stm32f107-uc-eval/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f1xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f207-st-nucleo/Kconfig b/bsp/stm32/stm32f207-st-nucleo/Kconfig index 7a400db91f..7fca606082 100644 --- a/bsp/stm32/stm32f207-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f207-st-nucleo/Kconfig @@ -15,8 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F207ZG + bool + select SOC_SERIES_STM32F2 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f207-st-nucleo/applications/main.c b/bsp/stm32/stm32f207-st-nucleo/applications/main.c index b88176a8ac..49c891c553 100644 --- a/bsp/stm32/stm32f207-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32f207-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 <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PB14 */ #define LED0_PIN GET_PIN(B, 14) diff --git a/bsp/stm32/stm32f207-st-nucleo/board/Kconfig b/bsp/stm32/stm32f207-st-nucleo/board/Kconfig index 9521c89825..f28ced5cb6 100644 --- a/bsp/stm32/stm32f207-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32f207-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F207ZG - bool - select SOC_SERIES_STM32F2 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu @@ -28,7 +21,7 @@ menu "On-chip Peripheral Drivers" default y endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f207-st-nucleo/board/board.c b/bsp/stm32/stm32f207-st-nucleo/board/board.c index cd22eb8a57..8aab0cc550 100644 --- a/bsp/stm32/stm32f207-st-nucleo/board/board.c +++ b/bsp/stm32/stm32f207-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f207-st-nucleo/board/board.h b/bsp/stm32/stm32f207-st-nucleo/board/board.h index c52bed558b..2c511fd6c6 100644 --- a/bsp/stm32/stm32f207-st-nucleo/board/board.h +++ b/bsp/stm32/stm32f207-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f2xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f302-st-nucleo/Kconfig b/bsp/stm32/stm32f302-st-nucleo/Kconfig index 79b160b856..fb71ffbeca 100644 --- a/bsp/stm32/stm32f302-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f302-st-nucleo/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F302R8 + bool + select SOC_SERIES_STM32F3 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f302-st-nucleo/applications/main.c b/bsp/stm32/stm32f302-st-nucleo/applications/main.c index 92a4f084e4..7cfcabdc1c 100644 --- a/bsp/stm32/stm32f302-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32f302-st-nucleo/applications/main.c @@ -6,25 +6,29 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ + +/* defined the LED0 pin: PB13 */ +#define LED0_PIN GET_PIN(B, 13) int main(void) { - /* LED pin: PB13 */ - rt_uint16_t led = rt_pin_get("PB.13"); - /* set LED pin mode to output */ - rt_pin_mode(led, PIN_MODE_OUTPUT); + rt_pin_mode(LED0_PIN, PIN_MODE_OUTPUT); while (1) { - rt_pin_write(led, PIN_HIGH); + rt_pin_write(LED0_PIN, PIN_HIGH); rt_thread_mdelay(500); - rt_pin_write(led, PIN_LOW); + rt_pin_write(LED0_PIN, PIN_LOW); rt_thread_mdelay(500); } diff --git a/bsp/stm32/stm32f302-st-nucleo/board/Kconfig b/bsp/stm32/stm32f302-st-nucleo/board/Kconfig index e4414bfa2a..1bdbb7eea2 100644 --- a/bsp/stm32/stm32f302-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32f302-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F302R8 - bool - select SOC_SERIES_STM32F3 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu diff --git a/bsp/stm32/stm32f302-st-nucleo/board/board.c b/bsp/stm32/stm32f302-st-nucleo/board/board.c index 2f0ec3e759..175f61685d 100644 --- a/bsp/stm32/stm32f302-st-nucleo/board/board.c +++ b/bsp/stm32/stm32f302-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f302-st-nucleo/board/board.h b/bsp/stm32/stm32f302-st-nucleo/board/board.h index de61eb7514..2b84e583ce 100644 --- a/bsp/stm32/stm32f302-st-nucleo/board/board.h +++ b/bsp/stm32/stm32f302-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f3xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f334-st-nucleo/Kconfig b/bsp/stm32/stm32f334-st-nucleo/Kconfig index 79b160b856..e3f8480d13 100644 --- a/bsp/stm32/stm32f334-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f334-st-nucleo/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F334R8 + bool + select SOC_SERIES_STM32F3 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f334-st-nucleo/applications/main.c b/bsp/stm32/stm32f334-st-nucleo/applications/main.c index 1b4d409a45..2bcbd772d0 100644 --- a/bsp/stm32/stm32f334-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32f334-st-nucleo/applications/main.c @@ -8,23 +8,26 @@ * 2023-06-05 tangzz98 first version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ + +/* defined the LED0 pin: PA5 */ +#define LED0_PIN GET_PIN(A, 5) int main(void) { - /* LED pin: PB13 */ - rt_uint16_t led = rt_pin_get("PA.5"); - /* set LED pin mode to output */ - rt_pin_mode(led, PIN_MODE_OUTPUT); + rt_pin_mode(LED0_PIN, PIN_MODE_OUTPUT); while (1) { - rt_pin_write(led, PIN_HIGH); + rt_pin_write(LED0_PIN, PIN_HIGH); rt_thread_mdelay(500); - rt_pin_write(led, PIN_LOW); + rt_pin_write(LED0_PIN, PIN_LOW); rt_thread_mdelay(500); } diff --git a/bsp/stm32/stm32f334-st-nucleo/board/Kconfig b/bsp/stm32/stm32f334-st-nucleo/board/Kconfig index a4a9dd2c0f..0e6eb5d146 100644 --- a/bsp/stm32/stm32f334-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32f334-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F334R8 - bool - select SOC_SERIES_STM32F3 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu diff --git a/bsp/stm32/stm32f334-st-nucleo/board/board.c b/bsp/stm32/stm32f334-st-nucleo/board/board.c index 0565fc0dfc..815f769283 100644 --- a/bsp/stm32/stm32f334-st-nucleo/board/board.c +++ b/bsp/stm32/stm32f334-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2023-06-05 tangzz98 first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f334-st-nucleo/board/board.h b/bsp/stm32/stm32f334-st-nucleo/board/board.h index d343bebc84..cd749cbea2 100644 --- a/bsp/stm32/stm32f334-st-nucleo/board/board.h +++ b/bsp/stm32/stm32f334-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f3xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f401-st-nucleo/Kconfig b/bsp/stm32/stm32f401-st-nucleo/Kconfig index 79b160b856..b4dc11b77f 100644 --- a/bsp/stm32/stm32f401-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f401-st-nucleo/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F401RE + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f401-st-nucleo/applications/main.c b/bsp/stm32/stm32f401-st-nucleo/applications/main.c index 36a52e02a8..ce0f2572d0 100644 --- a/bsp/stm32/stm32f401-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32f401-st-nucleo/applications/main.c @@ -6,13 +6,17 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ -/* defined the LD2 (user LED) pin: PB1 */ +/* defined the LD2 (user LED) pin: PA5 */ #define LED2_PIN GET_PIN(A, 5) int main(void) diff --git a/bsp/stm32/stm32f401-st-nucleo/board/Kconfig b/bsp/stm32/stm32f401-st-nucleo/board/Kconfig index a462e103a9..f9e5650bf9 100644 --- a/bsp/stm32/stm32f401-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32f401-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F401RE - bool - select SOC_SERIES_STM32F4 - 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)" @@ -208,7 +201,7 @@ menu "On-chip Peripheral Drivers" endif endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f401-st-nucleo/board/board.c b/bsp/stm32/stm32f401-st-nucleo/board/board.c index 9c33cdbba5..00b4975f17 100644 --- a/bsp/stm32/stm32f401-st-nucleo/board/board.c +++ b/bsp/stm32/stm32f401-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f401-st-nucleo/board/board.h b/bsp/stm32/stm32f401-st-nucleo/board/board.h index 93a2407c87..ae1c69f8b5 100644 --- a/bsp/stm32/stm32f401-st-nucleo/board/board.h +++ b/bsp/stm32/stm32f401-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f401-weact-blackpill/Kconfig b/bsp/stm32/stm32f401-weact-blackpill/Kconfig index 79b160b856..0cbf0f9a33 100644 --- a/bsp/stm32/stm32f401-weact-blackpill/Kconfig +++ b/bsp/stm32/stm32f401-weact-blackpill/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F401CC + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f401-weact-blackpill/applications/main.c b/bsp/stm32/stm32f401-weact-blackpill/applications/main.c index 5faa7145bd..c61ddb90ee 100644 --- a/bsp/stm32/stm32f401-weact-blackpill/applications/main.c +++ b/bsp/stm32/stm32f401-weact-blackpill/applications/main.c @@ -6,13 +6,17 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ -/* defined the LED0 pin: PB1 */ +/* defined the LED0 pin: PC13 */ #define LED0_PIN GET_PIN(C, 13) int main(void) diff --git a/bsp/stm32/stm32f401-weact-blackpill/board/Kconfig b/bsp/stm32/stm32f401-weact-blackpill/board/Kconfig index 3bb705e5a6..18e74b8184 100644 --- a/bsp/stm32/stm32f401-weact-blackpill/board/Kconfig +++ b/bsp/stm32/stm32f401-weact-blackpill/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F401CC - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_ARDUINO @@ -131,7 +124,7 @@ menu "On-chip Peripheral Drivers" default 46 endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f401-weact-blackpill/board/board.c b/bsp/stm32/stm32f401-weact-blackpill/board/board.c index 8e1061d2c6..918a9b245c 100644 --- a/bsp/stm32/stm32f401-weact-blackpill/board/board.c +++ b/bsp/stm32/stm32f401-weact-blackpill/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f401-weact-blackpill/board/board.h b/bsp/stm32/stm32f401-weact-blackpill/board/board.h index 76454062fb..002cb8da44 100644 --- a/bsp/stm32/stm32f401-weact-blackpill/board/board.h +++ b/bsp/stm32/stm32f401-weact-blackpill/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/Kconfig b/bsp/stm32/stm32f405-smdz-breadfruit/Kconfig index 79b160b856..4a7f6c9682 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/Kconfig +++ b/bsp/stm32/stm32f405-smdz-breadfruit/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F405RG + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/applications/main.c b/bsp/stm32/stm32f405-smdz-breadfruit/applications/main.c index 9f52445b11..937dcbf488 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/applications/main.c +++ b/bsp/stm32/stm32f405-smdz-breadfruit/applications/main.c @@ -6,14 +6,19 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ -/* defined the LED0 pin: PC4-36 PA8-8,PC5-37,PA10-10*/ -#define LED0_PIN 10 +/* defined the LED0 pin: PC4 */ +/* LEDs: PC4, PA8, PC5, PA10 */ +#define LED0_PIN GET_PIN(C, 4) int main(void) { diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/board/Kconfig b/bsp/stm32/stm32f405-smdz-breadfruit/board/Kconfig index 9a69caa853..9a965262ff 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/board/Kconfig +++ b/bsp/stm32/stm32f405-smdz-breadfruit/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F405RG - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu @@ -32,7 +25,7 @@ menu "On-chip Peripheral Drivers" depends on BSP_USING_UART2 && RT_SERIAL_USING_DMA default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/board/board.c b/bsp/stm32/stm32f405-smdz-breadfruit/board/board.c index 190ca080cf..306fc433f2 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/board/board.c +++ b/bsp/stm32/stm32f405-smdz-breadfruit/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/board/board.h b/bsp/stm32/stm32f405-smdz-breadfruit/board/board.h index 64d30cc5b7..6ef645fb5d 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/board/board.h +++ b/bsp/stm32/stm32f405-smdz-breadfruit/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f405zg-mini-template/Kconfig b/bsp/stm32/stm32f405zg-mini-template/Kconfig index 79b160b856..577928c20b 100644 --- a/bsp/stm32/stm32f405zg-mini-template/Kconfig +++ b/bsp/stm32/stm32f405zg-mini-template/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F405ZG + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f405zg-mini-template/applications/main.c b/bsp/stm32/stm32f405zg-mini-template/applications/main.c index ed2b96fa79..bf5eb5b80e 100644 --- a/bsp/stm32/stm32f405zg-mini-template/applications/main.c +++ b/bsp/stm32/stm32f405zg-mini-template/applications/main.c @@ -5,13 +5,16 @@ * * Change Logs: * Date Author Notes - * 2018-11-06 SummerGift first version * 2023-08-22 Donocean first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the RGB0 pin: PF6 */ #define LED0_PIN GET_PIN(F, 6) diff --git a/bsp/stm32/stm32f405zg-mini-template/board/Kconfig b/bsp/stm32/stm32f405zg-mini-template/board/Kconfig index c1a9a4f211..8a65aca73d 100644 --- a/bsp/stm32/stm32f405zg-mini-template/board/Kconfig +++ b/bsp/stm32/stm32f405zg-mini-template/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F405ZG - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_SPI_FLASH @@ -120,7 +113,7 @@ menu "On-chip Peripheral Drivers" endif endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f405zg-mini-template/board/board.c b/bsp/stm32/stm32f405zg-mini-template/board/board.c index f2e4f070c9..4f2db145e8 100644 --- a/bsp/stm32/stm32f405zg-mini-template/board/board.c +++ b/bsp/stm32/stm32f405zg-mini-template/board/board.c @@ -9,7 +9,8 @@ * 2023-08-20 Donocean Configure Main clock to 168MHz */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f405zg-mini-template/board/board.h b/bsp/stm32/stm32f405zg-mini-template/board/board.h index 9b438444e2..c7c7391f2c 100644 --- a/bsp/stm32/stm32f405zg-mini-template/board/board.h +++ b/bsp/stm32/stm32f405zg-mini-template/board/board.h @@ -12,10 +12,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f407-armfly-v5/Kconfig b/bsp/stm32/stm32f407-armfly-v5/Kconfig index 79b160b856..ad277e4f13 100644 --- a/bsp/stm32/stm32f407-armfly-v5/Kconfig +++ b/bsp/stm32/stm32f407-armfly-v5/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F407IG + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f407-armfly-v5/applications/main.c b/bsp/stm32/stm32f407-armfly-v5/applications/main.c index f7ace7aa57..d4ffbccdbf 100644 --- a/bsp/stm32/stm32f407-armfly-v5/applications/main.c +++ b/bsp/stm32/stm32f407-armfly-v5/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2020-07-13 Dozingfiretruck first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED4 pin: PC2 */ #define LED0_PIN GET_PIN(C, 2) diff --git a/bsp/stm32/stm32f407-armfly-v5/board/Kconfig b/bsp/stm32/stm32f407-armfly-v5/board/Kconfig index a67ea1f21d..aa5964cb66 100644 --- a/bsp/stm32/stm32f407-armfly-v5/board/Kconfig +++ b/bsp/stm32/stm32f407-armfly-v5/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F407IG - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_RS232_TO_USART @@ -186,7 +179,7 @@ menu "On-chip Peripheral Drivers" select RT_USING_DFS default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f407-armfly-v5/board/board.c b/bsp/stm32/stm32f407-armfly-v5/board/board.c index 89a7fdc26a..e80bcb0e7c 100644 --- a/bsp/stm32/stm32f407-armfly-v5/board/board.c +++ b/bsp/stm32/stm32f407-armfly-v5/board/board.c @@ -8,7 +8,8 @@ * 2020-07-13 Dozingfiretruck first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f407-armfly-v5/board/board.h b/bsp/stm32/stm32f407-armfly-v5/board/board.h index 995b482f86..4e8feb60fd 100644 --- a/bsp/stm32/stm32f407-armfly-v5/board/board.h +++ b/bsp/stm32/stm32f407-armfly-v5/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f407-atk-explorer/Kconfig b/bsp/stm32/stm32f407-atk-explorer/Kconfig index 79b160b856..d90b595244 100644 --- a/bsp/stm32/stm32f407-atk-explorer/Kconfig +++ b/bsp/stm32/stm32f407-atk-explorer/Kconfig @@ -15,7 +15,21 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F407ZG + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + +config BOARD_STM32F407_ATK_EXPLORER + bool + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f407-atk-explorer/applications/main.c b/bsp/stm32/stm32f407-atk-explorer/applications/main.c index 9fb7ebf153..573ae823e7 100644 --- a/bsp/stm32/stm32f407-atk-explorer/applications/main.c +++ b/bsp/stm32/stm32f407-atk-explorer/applications/main.c @@ -7,11 +7,15 @@ * Date Author Notes * 2018-11-06 SummerGift first version * 2018-11-19 flybreak add stm32f407-atk-explorer bsp + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PF9 */ #define LED0_PIN GET_PIN(F, 9) diff --git a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig b/bsp/stm32/stm32f407-atk-explorer/board/Kconfig index 8445eff75f..c8302e8c87 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig +++ b/bsp/stm32/stm32f407-atk-explorer/board/Kconfig @@ -1,16 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F407ZG - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - -config BOARD_STM32F407_ATK_EXPLORER - bool - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART @@ -500,7 +489,7 @@ menu "On-chip Peripheral Drivers" config BSP_USING_FMC bool default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f407-atk-explorer/board/board.c b/bsp/stm32/stm32f407-atk-explorer/board/board.c index 02a3a3d53f..f5de0dd107 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/board.c +++ b/bsp/stm32/stm32f407-atk-explorer/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f407-atk-explorer/board/board.h b/bsp/stm32/stm32f407-atk-explorer/board/board.h index b88f85a064..c9c29aa134 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/board.h +++ b/bsp/stm32/stm32f407-atk-explorer/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f407-robomaster-c/Kconfig b/bsp/stm32/stm32f407-robomaster-c/Kconfig index 79b160b856..ad277e4f13 100644 --- a/bsp/stm32/stm32f407-robomaster-c/Kconfig +++ b/bsp/stm32/stm32f407-robomaster-c/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F407IG + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f407-robomaster-c/applications/main.c b/bsp/stm32/stm32f407-robomaster-c/applications/main.c index 919267ba14..88aa5968a2 100644 --- a/bsp/stm32/stm32f407-robomaster-c/applications/main.c +++ b/bsp/stm32/stm32f407-robomaster-c/applications/main.c @@ -5,13 +5,16 @@ * * Change Logs: * Date Author Notes - * 2018-11-06 SummerGift first version - * 2021-06-30 crazt modify for robomaster C board + * 2021-06-30 crazt first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED Blue pin: PH10 */ #define LED_B_PIN GET_PIN(H, 10) diff --git a/bsp/stm32/stm32f407-robomaster-c/board/Kconfig b/bsp/stm32/stm32f407-robomaster-c/board/Kconfig index 78eaf1cd33..f9226bda3e 100644 --- a/bsp/stm32/stm32f407-robomaster-c/board/Kconfig +++ b/bsp/stm32/stm32f407-robomaster-c/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F407IG - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_ARDUINO @@ -202,7 +195,7 @@ menu "On-chip Peripheral Drivers" endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f407-robomaster-c/board/board.c b/bsp/stm32/stm32f407-robomaster-c/board/board.c index d544465866..57aa190669 100644 --- a/bsp/stm32/stm32f407-robomaster-c/board/board.c +++ b/bsp/stm32/stm32f407-robomaster-c/board/board.c @@ -9,7 +9,8 @@ * 2021-06-30 crazt modify for robomaster C board */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f407-robomaster-c/board/board.h b/bsp/stm32/stm32f407-robomaster-c/board/board.h index 92b9520169..d03ea54c08 100644 --- a/bsp/stm32/stm32f407-robomaster-c/board/board.h +++ b/bsp/stm32/stm32f407-robomaster-c/board/board.h @@ -12,10 +12,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f407-rt-spark/board/Kconfig b/bsp/stm32/stm32f407-rt-spark/board/Kconfig index 222339a1c1..94a62539a8 100644 --- a/bsp/stm32/stm32f407-rt-spark/board/Kconfig +++ b/bsp/stm32/stm32f407-rt-spark/board/Kconfig @@ -664,7 +664,7 @@ menu "On-chip Peripheral Drivers" config BSP_USING_FMC bool default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f407-st-discovery/Kconfig b/bsp/stm32/stm32f407-st-discovery/Kconfig index 79b160b856..2578bf455b 100644 --- a/bsp/stm32/stm32f407-st-discovery/Kconfig +++ b/bsp/stm32/stm32f407-st-discovery/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F407VG + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f407-st-discovery/applications/main.c b/bsp/stm32/stm32f407-st-discovery/applications/main.c index ecc3464e69..95b0daddca 100644 --- a/bsp/stm32/stm32f407-st-discovery/applications/main.c +++ b/bsp/stm32/stm32f407-st-discovery/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-06 misonyo first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PD14 */ #define LED0_PIN GET_PIN(D, 14) diff --git a/bsp/stm32/stm32f407-st-discovery/board/Kconfig b/bsp/stm32/stm32f407-st-discovery/board/Kconfig index d68092835a..604e56d3e4 100644 --- a/bsp/stm32/stm32f407-st-discovery/board/Kconfig +++ b/bsp/stm32/stm32f407-st-discovery/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F407VG - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu @@ -70,7 +63,7 @@ menu "On-chip Peripheral Drivers" range 1 216 default 25 endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f407-st-discovery/board/board.c b/bsp/stm32/stm32f407-st-discovery/board/board.c index 5fff5426fe..48deaaf9b1 100644 --- a/bsp/stm32/stm32f407-st-discovery/board/board.c +++ b/bsp/stm32/stm32f407-st-discovery/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f407-st-discovery/board/board.h b/bsp/stm32/stm32f407-st-discovery/board/board.h index ca3b4f8b24..2df8a2355d 100644 --- a/bsp/stm32/stm32f407-st-discovery/board/board.h +++ b/bsp/stm32/stm32f407-st-discovery/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f410-st-nucleo/Kconfig b/bsp/stm32/stm32f410-st-nucleo/Kconfig index 79b160b856..4666cce094 100644 --- a/bsp/stm32/stm32f410-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f410-st-nucleo/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F410RB + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f410-st-nucleo/applications/main.c b/bsp/stm32/stm32f410-st-nucleo/applications/main.c index 0de22d3ffd..f01561b005 100644 --- a/bsp/stm32/stm32f410-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32f410-st-nucleo/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2020-03-07 tanglj86 first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PA5 */ #define LED0_PIN GET_PIN(A, 5) diff --git a/bsp/stm32/stm32f410-st-nucleo/board/Kconfig b/bsp/stm32/stm32f410-st-nucleo/board/Kconfig index 20f8611262..db487454e8 100644 --- a/bsp/stm32/stm32f410-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32f410-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F410RB - bool - select SOC_SERIES_STM32F4 - 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)" @@ -114,7 +107,7 @@ menu "On-chip Peripheral Drivers" default 25 endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f410-st-nucleo/board/board.c b/bsp/stm32/stm32f410-st-nucleo/board/board.c index 3e64df40d7..851e473a7f 100644 --- a/bsp/stm32/stm32f410-st-nucleo/board/board.c +++ b/bsp/stm32/stm32f410-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2020-03-07 tanglj86 first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f411-atk-nano/Kconfig b/bsp/stm32/stm32f411-atk-nano/Kconfig index 79b160b856..b05130fafa 100644 --- a/bsp/stm32/stm32f411-atk-nano/Kconfig +++ b/bsp/stm32/stm32f411-atk-nano/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F411RC + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f411-atk-nano/applications/main.c b/bsp/stm32/stm32f411-atk-nano/applications/main.c index 351b59dc19..1e35cb6335 100644 --- a/bsp/stm32/stm32f411-atk-nano/applications/main.c +++ b/bsp/stm32/stm32f411-atk-nano/applications/main.c @@ -6,11 +6,15 @@ * Change Logs: * Date Author Notes * 2020-05-11 bigaij first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PC0 */ #define LED0_PIN GET_PIN(C, 0) diff --git a/bsp/stm32/stm32f411-atk-nano/board/Kconfig b/bsp/stm32/stm32f411-atk-nano/board/Kconfig index a8c6c66091..af4d8b8470 100644 --- a/bsp/stm32/stm32f411-atk-nano/board/Kconfig +++ b/bsp/stm32/stm32f411-atk-nano/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F411RC - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART @@ -159,7 +152,7 @@ menu "On-chip Peripheral Drivers" select RT_USING_WDT default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f411-atk-nano/board/board.c b/bsp/stm32/stm32f411-atk-nano/board/board.c index 08158c2f96..32eb015f16 100644 --- a/bsp/stm32/stm32f411-atk-nano/board/board.c +++ b/bsp/stm32/stm32f411-atk-nano/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f411-atk-nano/board/board.h b/bsp/stm32/stm32f411-atk-nano/board/board.h index f301f3f527..4f56eb8e56 100644 --- a/bsp/stm32/stm32f411-atk-nano/board/board.h +++ b/bsp/stm32/stm32f411-atk-nano/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f411-st-nucleo/Kconfig b/bsp/stm32/stm32f411-st-nucleo/Kconfig index 79b160b856..d5b1524e05 100644 --- a/bsp/stm32/stm32f411-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f411-st-nucleo/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F411RE + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f411-st-nucleo/applications/main.c b/bsp/stm32/stm32f411-st-nucleo/applications/main.c index 9f36615507..590e0919c8 100644 --- a/bsp/stm32/stm32f411-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32f411-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 <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PA5 */ #define LED0_PIN GET_PIN(A, 5) diff --git a/bsp/stm32/stm32f411-st-nucleo/board/Kconfig b/bsp/stm32/stm32f411-st-nucleo/board/Kconfig index 19cebb0b35..4624e8eab4 100644 --- a/bsp/stm32/stm32f411-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32f411-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F411RE - bool - select SOC_SERIES_STM32F4 - 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)" @@ -233,7 +226,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f411-st-nucleo/board/board.c b/bsp/stm32/stm32f411-st-nucleo/board/board.c index 1d83386719..f733dde70e 100644 --- a/bsp/stm32/stm32f411-st-nucleo/board/board.c +++ b/bsp/stm32/stm32f411-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f411-st-nucleo/board/board.h b/bsp/stm32/stm32f411-st-nucleo/board/board.h index 25b839b380..9bd1b06020 100644 --- a/bsp/stm32/stm32f411-st-nucleo/board/board.h +++ b/bsp/stm32/stm32f411-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f411-weact-blackpill/Kconfig b/bsp/stm32/stm32f411-weact-blackpill/Kconfig index 79b160b856..d5b1524e05 100644 --- a/bsp/stm32/stm32f411-weact-blackpill/Kconfig +++ b/bsp/stm32/stm32f411-weact-blackpill/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F411RE + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f411-weact-blackpill/applications/main.c b/bsp/stm32/stm32f411-weact-blackpill/applications/main.c index f28cc62dd2..4d21341f14 100644 --- a/bsp/stm32/stm32f411-weact-blackpill/applications/main.c +++ b/bsp/stm32/stm32f411-weact-blackpill/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 <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PC13 */ #define LED0_PIN GET_PIN(C, 13) diff --git a/bsp/stm32/stm32f411-weact-blackpill/board/Kconfig b/bsp/stm32/stm32f411-weact-blackpill/board/Kconfig index 563869c25b..d7798f16de 100644 --- a/bsp/stm32/stm32f411-weact-blackpill/board/Kconfig +++ b/bsp/stm32/stm32f411-weact-blackpill/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F411RE - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_ARDUINO bool "Compatible with Arduino Ecosystem (RTduino)" @@ -183,7 +176,7 @@ menu "On-chip Peripheral Drivers" select RT_USING_USB_DEVICE default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f411-weact-blackpill/board/board.c b/bsp/stm32/stm32f411-weact-blackpill/board/board.c index 7f27135a6b..c4968a8a73 100644 --- a/bsp/stm32/stm32f411-weact-blackpill/board/board.c +++ b/bsp/stm32/stm32f411-weact-blackpill/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f411-weact-blackpill/board/board.h b/bsp/stm32/stm32f411-weact-blackpill/board/board.h index 25b839b380..9bd1b06020 100644 --- a/bsp/stm32/stm32f411-weact-blackpill/board/board.h +++ b/bsp/stm32/stm32f411-weact-blackpill/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f412-st-nucleo/Kconfig b/bsp/stm32/stm32f412-st-nucleo/Kconfig index 79b160b856..ca218de8e3 100644 --- a/bsp/stm32/stm32f412-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f412-st-nucleo/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F412ZG + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f412-st-nucleo/applications/main.c b/bsp/stm32/stm32f412-st-nucleo/applications/main.c index ec30dd059b..4139c20473 100644 --- a/bsp/stm32/stm32f412-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32f412-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 <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the USER LED2 pin: PB7 */ #define LED2_PIN GET_PIN(B, 7) diff --git a/bsp/stm32/stm32f412-st-nucleo/board/Kconfig b/bsp/stm32/stm32f412-st-nucleo/board/Kconfig index 40dc97105f..547d6857e4 100644 --- a/bsp/stm32/stm32f412-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32f412-st-nucleo/board/Kconfig @@ -1,13 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F412ZG - bool - select SOC_SERIES_STM32F4 - 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/stm32f412-st-nucleo/board/board.c b/bsp/stm32/stm32f412-st-nucleo/board/board.c index b8f8168dfa..be864756e8 100644 --- a/bsp/stm32/stm32f412-st-nucleo/board/board.c +++ b/bsp/stm32/stm32f412-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f412-st-nucleo/board/board.h b/bsp/stm32/stm32f412-st-nucleo/board/board.h index 8d1465a1c9..3741628abd 100644 --- a/bsp/stm32/stm32f412-st-nucleo/board/board.h +++ b/bsp/stm32/stm32f412-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f413-st-nucleo/Kconfig b/bsp/stm32/stm32f413-st-nucleo/Kconfig index 79b160b856..ab2a912e69 100644 --- a/bsp/stm32/stm32f413-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f413-st-nucleo/Kconfig @@ -15,7 +15,18 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" + +config SOC_STM32F413ZH + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f413-st-nucleo/applications/main.c b/bsp/stm32/stm32f413-st-nucleo/applications/main.c index ddd672e739..e543f100fe 100644 --- a/bsp/stm32/stm32f413-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32f413-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 <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED1 pin: PB0 */ #define LED1_PIN GET_PIN(B, 0) diff --git a/bsp/stm32/stm32f413-st-nucleo/board/Kconfig b/bsp/stm32/stm32f413-st-nucleo/board/Kconfig index 6af6135074..5b3ae767a1 100644 --- a/bsp/stm32/stm32f413-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32f413-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F413ZH - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_STLINK_TO_USART @@ -160,7 +153,7 @@ menu "On-chip Peripheral Drivers" select BSP_USBD_TYPE_FS default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f413-st-nucleo/board/board.c b/bsp/stm32/stm32f413-st-nucleo/board/board.c index b36f973530..b71acd61b0 100644 --- a/bsp/stm32/stm32f413-st-nucleo/board/board.c +++ b/bsp/stm32/stm32f413-st-nucleo/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> /** * @brief System Clock Configuration diff --git a/bsp/stm32/stm32f413-st-nucleo/board/board.h b/bsp/stm32/stm32f413-st-nucleo/board/board.h index e98990ce75..02f6290569 100644 --- a/bsp/stm32/stm32f413-st-nucleo/board/board.h +++ b/bsp/stm32/stm32f413-st-nucleo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f427-robomaster-a/Kconfig b/bsp/stm32/stm32f427-robomaster-a/Kconfig index 79b160b856..fe518d308c 100644 --- a/bsp/stm32/stm32f427-robomaster-a/Kconfig +++ b/bsp/stm32/stm32f427-robomaster-a/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F427II + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f427-robomaster-a/applications/main.c b/bsp/stm32/stm32f427-robomaster-a/applications/main.c index f63f29396c..59098f00e2 100644 --- a/bsp/stm32/stm32f427-robomaster-a/applications/main.c +++ b/bsp/stm32/stm32f427-robomaster-a/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 <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED_G pin: PF14 */ #define LED0_PIN GET_PIN(F, 14) diff --git a/bsp/stm32/stm32f427-robomaster-a/board/Kconfig b/bsp/stm32/stm32f427-robomaster-a/board/Kconfig index 0ced347439..76e47e04f3 100644 --- a/bsp/stm32/stm32f427-robomaster-a/board/Kconfig +++ b/bsp/stm32/stm32f427-robomaster-a/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F427II - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_SDCARD bool "Enable SDCARD (sdio)" @@ -246,7 +239,7 @@ menu "On-chip Peripheral Drivers" endif endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f427-robomaster-a/board/board.c b/bsp/stm32/stm32f427-robomaster-a/board/board.c index 780e089fcd..865640b743 100644 --- a/bsp/stm32/stm32f427-robomaster-a/board/board.c +++ b/bsp/stm32/stm32f427-robomaster-a/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> /** * @brief System Clock Configuration diff --git a/bsp/stm32/stm32f427-robomaster-a/board/board.h b/bsp/stm32/stm32f427-robomaster-a/board/board.h index 0e3a162bae..a1a7398a1b 100644 --- a/bsp/stm32/stm32f427-robomaster-a/board/board.h +++ b/bsp/stm32/stm32f427-robomaster-a/board/board.h @@ -12,10 +12,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f429-armfly-v6/Kconfig b/bsp/stm32/stm32f429-armfly-v6/Kconfig index 79b160b856..61648f9905 100644 --- a/bsp/stm32/stm32f429-armfly-v6/Kconfig +++ b/bsp/stm32/stm32f429-armfly-v6/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F429BI + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f429-armfly-v6/board/Kconfig b/bsp/stm32/stm32f429-armfly-v6/board/Kconfig index 0aa90398d8..e9d993c9ec 100644 --- a/bsp/stm32/stm32f429-armfly-v6/board/Kconfig +++ b/bsp/stm32/stm32f429-armfly-v6/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F429BI - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_RS232_TO_USART @@ -219,7 +212,7 @@ menu "On-chip Peripheral Drivers" config BSP_USING_LTDC bool default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f429-atk-apollo/Kconfig b/bsp/stm32/stm32f429-atk-apollo/Kconfig index 79b160b856..ddc9b196d5 100644 --- a/bsp/stm32/stm32f429-atk-apollo/Kconfig +++ b/bsp/stm32/stm32f429-atk-apollo/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F429IG + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f429-atk-apollo/applications/main.c b/bsp/stm32/stm32f429-atk-apollo/applications/main.c index 609b4e63b4..50c7fface3 100644 --- a/bsp/stm32/stm32f429-atk-apollo/applications/main.c +++ b/bsp/stm32/stm32f429-atk-apollo/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 <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PB1 */ #define LED0_PIN GET_PIN(B, 1) diff --git a/bsp/stm32/stm32f429-atk-apollo/board/Kconfig b/bsp/stm32/stm32f429-atk-apollo/board/Kconfig index 0e2fa4d833..f5ab5b5a83 100644 --- a/bsp/stm32/stm32f429-atk-apollo/board/Kconfig +++ b/bsp/stm32/stm32f429-atk-apollo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F429IG - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART @@ -295,7 +288,7 @@ menu "On-chip Peripheral Drivers" config BSP_USING_FMC bool default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f429-atk-apollo/board/board.c b/bsp/stm32/stm32f429-atk-apollo/board/board.c index 36d2ff17d3..d033549804 100644 --- a/bsp/stm32/stm32f429-atk-apollo/board/board.c +++ b/bsp/stm32/stm32f429-atk-apollo/board/board.c @@ -8,7 +8,8 @@ * 2018-11-7 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> /** System Clock Configuration */ diff --git a/bsp/stm32/stm32f429-atk-apollo/board/board.h b/bsp/stm32/stm32f429-atk-apollo/board/board.h index e07f601b84..a06b3236c9 100644 --- a/bsp/stm32/stm32f429-atk-apollo/board/board.h +++ b/bsp/stm32/stm32f429-atk-apollo/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f429-fire-challenger/Kconfig b/bsp/stm32/stm32f429-fire-challenger/Kconfig index 79b160b856..ddc9b196d5 100644 --- a/bsp/stm32/stm32f429-fire-challenger/Kconfig +++ b/bsp/stm32/stm32f429-fire-challenger/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F429IG + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f429-fire-challenger/applications/main.c b/bsp/stm32/stm32f429-fire-challenger/applications/main.c index 27c28e0cb2..efbc9b6f56 100644 --- a/bsp/stm32/stm32f429-fire-challenger/applications/main.c +++ b/bsp/stm32/stm32f429-fire-challenger/applications/main.c @@ -7,11 +7,15 @@ * Date Author Notes * 2018-11-06 SummerGift first version * 2018-11-19 flybreak add stm32f429-fire-challenger bsp + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PH10 */ #define LED0_PIN GET_PIN(H, 10) diff --git a/bsp/stm32/stm32f429-fire-challenger/board/Kconfig b/bsp/stm32/stm32f429-fire-challenger/board/Kconfig index 36af05fe92..0c68ab1cc9 100644 --- a/bsp/stm32/stm32f429-fire-challenger/board/Kconfig +++ b/bsp/stm32/stm32f429-fire-challenger/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F429IG - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_USB_TO_USART @@ -241,7 +234,7 @@ menu "On-chip Peripheral Drivers" config BSP_USING_LTDC bool default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f429-fire-challenger/board/board.c b/bsp/stm32/stm32f429-fire-challenger/board/board.c index 5ca583d599..2d1b0661ec 100644 --- a/bsp/stm32/stm32f429-fire-challenger/board/board.c +++ b/bsp/stm32/stm32f429-fire-challenger/board/board.c @@ -8,7 +8,8 @@ * 2018-11-06 SummerGift first version */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f429-fire-challenger/board/board.h b/bsp/stm32/stm32f429-fire-challenger/board/board.h index 6a205b9393..9319220119 100644 --- a/bsp/stm32/stm32f429-fire-challenger/board/board.h +++ b/bsp/stm32/stm32f429-fire-challenger/board/board.h @@ -11,10 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f429-st-disco/.config b/bsp/stm32/stm32f429-st-disco/.config index 8150567508..748b440ca2 100644 --- a/bsp/stm32/stm32f429-st-disco/.config +++ b/bsp/stm32/stm32f429-st-disco/.config @@ -2,6 +2,7 @@ # Automatically generated file; DO NOT EDIT. # RT-Thread Configuration # +CONFIG_SOC_STM32F429ZI=y # # RT-Thread Kernel @@ -9,8 +10,10 @@ CONFIG_RT_NAME_MAX=8 # CONFIG_RT_USING_ARCH_DATA_TYPE is not set # CONFIG_RT_USING_SMART is not set +# CONFIG_RT_USING_NANO is not set # CONFIG_RT_USING_AMP is not set # CONFIG_RT_USING_SMP is not set +CONFIG_RT_CPUS_NR=1 CONFIG_RT_ALIGN_SIZE=8 # CONFIG_RT_THREAD_PRIORITY_8 is not set CONFIG_RT_THREAD_PRIORITY_32=y @@ -35,7 +38,7 @@ CONFIG_IDLE_THREAD_STACK_SIZE=1024 CONFIG_RT_USING_DEBUG=y CONFIG_RT_DEBUGING_COLOR=y CONFIG_RT_DEBUGING_CONTEXT=y -# CONFIG_RT_DEBUGING_INIT is not set +# CONFIG_RT_DEBUGING_AUTO_INIT is not set # # Inter-Thread communication @@ -46,7 +49,7 @@ CONFIG_RT_USING_EVENT=y CONFIG_RT_USING_MAILBOX=y CONFIG_RT_USING_MESSAGEQUEUE=y # CONFIG_RT_USING_MESSAGEQUEUE_PRIORITY is not set -CONFIG_RT_USING_SIGNALS=y +# CONFIG_RT_USING_SIGNALS is not set # # Memory Management @@ -66,19 +69,15 @@ CONFIG_RT_USING_MEMHEAP_AUTO_BINDING=y # CONFIG_RT_USING_MEMTRACE is not set # CONFIG_RT_USING_HEAP_ISR is not set CONFIG_RT_USING_HEAP=y - -# -# Kernel Device Object -# CONFIG_RT_USING_DEVICE=y # CONFIG_RT_USING_DEVICE_OPS is not set -# CONFIG_RT_USING_DM is not set # CONFIG_RT_USING_INTERRUPT_INFO is not set CONFIG_RT_USING_CONSOLE=y CONFIG_RT_CONSOLEBUF_SIZE=128 CONFIG_RT_CONSOLE_DEVICE_NAME="uart1" -CONFIG_RT_VER_NUM=0x50002 +CONFIG_RT_VER_NUM=0x50100 # CONFIG_RT_USING_STDC_ATOMIC is not set +CONFIG_RT_BACKTRACE_LEVEL_MAX_NR=32 # CONFIG_RT_USING_CACHE is not set CONFIG_RT_USING_HW_ATOMIC=y # CONFIG_ARCH_ARM_BOOTWITH_FLUSH_CACHE is not set @@ -137,6 +136,7 @@ CONFIG_RT_USING_DFS_DEVFS=y # # Device Drivers # +# CONFIG_RT_USING_DM is not set CONFIG_RT_USING_DEVICE_IPC=y CONFIG_RT_UNAMED_PIPE_NUMBER=64 # CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set @@ -152,6 +152,7 @@ CONFIG_RT_USING_I2C=y # CONFIG_RT_I2C_DEBUG is not set CONFIG_RT_USING_I2C_BITOPS=y # CONFIG_RT_I2C_BITOPS_DEBUG is not set +# CONFIG_RT_USING_SOFT_I2C is not set # CONFIG_RT_USING_PHY is not set CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_ADC is not set @@ -163,7 +164,6 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_MTD_NOR is not set # CONFIG_RT_USING_MTD_NAND is not set # CONFIG_RT_USING_PM is not set -# CONFIG_RT_USING_FDT is not set # CONFIG_RT_USING_RTC is not set # CONFIG_RT_USING_SDIO is not set CONFIG_RT_USING_SPI=y @@ -241,6 +241,12 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_RT_USING_AT is not set # +# Memory protection +# +# CONFIG_RT_USING_MEM_PROTECTION is not set +# CONFIG_RT_USING_HW_STACK_GUARD is not set + +# # Utilities # # CONFIG_RT_USING_RYM is not set @@ -292,6 +298,11 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # # CONFIG_PKG_USING_WLAN_WICED is not set # CONFIG_PKG_USING_RW007 is not set + +# +# CYW43012 WiFi +# +# CONFIG_PKG_USING_WLAN_CYW43012 is not set # CONFIG_PKG_USING_COAP is not set # CONFIG_PKG_USING_NOPOLL is not set # CONFIG_PKG_USING_NETUTILS is not set @@ -353,6 +364,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_ZFTP is not set # CONFIG_PKG_USING_WOL is not set # CONFIG_PKG_USING_ZEPHYR_POLLING is not set +# CONFIG_PKG_USING_MATTER_ADAPTATION_LAYER is not set # # security packages @@ -399,7 +411,6 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # LVGL: powerful and easy-to-use embedded GUI library # # CONFIG_PKG_USING_LVGL is not set -# CONFIG_PKG_USING_LITTLEVGL2RTT is not set # CONFIG_PKG_USING_LV_MUSIC_DEMO is not set # CONFIG_PKG_USING_GUI_GUIDER_DEMO is not set @@ -476,6 +487,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_ARMV7M_DWT_TOOL is not set # CONFIG_PKG_USING_VOFA_PLUS is not set # CONFIG_PKG_USING_RT_TRACE is not set +# CONFIG_PKG_USING_ZDEBUG is not set # # system packages @@ -512,6 +524,8 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_UC_COMMON is not set # CONFIG_PKG_USING_UC_MODBUS is not set # CONFIG_PKG_USING_FREERTOS_WRAPPER is not set +# CONFIG_PKG_USING_LITEOS_SDK is not set +# CONFIG_PKG_USING_TZ_DATABASE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set # CONFIG_PKG_USING_PARTITION is not set @@ -535,6 +549,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_QBOOT is not set # CONFIG_PKG_USING_PPOOL is not set # CONFIG_PKG_USING_OPENAMP is not set +# CONFIG_PKG_USING_RPMSG_LITE is not set # CONFIG_PKG_USING_LPM is not set # CONFIG_PKG_USING_TLSF is not set # CONFIG_PKG_USING_EVENT_RECORDER is not set @@ -548,6 +563,8 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_AGILE_UPGRADE is not set # CONFIG_PKG_USING_FLASH_BLOB is not set # CONFIG_PKG_USING_MLIBC is not set +# CONFIG_PKG_USING_TASK_MSG_BUS is not set +# CONFIG_PKG_USING_SFDB is not set # # peripheral libraries and drivers @@ -612,6 +629,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_BALANCE is not set # CONFIG_PKG_USING_SHT2X is not set # CONFIG_PKG_USING_SHT3X is not set +# CONFIG_PKG_USING_SHT4X is not set # CONFIG_PKG_USING_AD7746 is not set # CONFIG_PKG_USING_ADT74XX is not set # CONFIG_PKG_USING_MAX17048 is not set @@ -712,6 +730,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_FINGERPRINT is not set # CONFIG_PKG_USING_BT_ECB02C is not set # CONFIG_PKG_USING_UAT is not set +# CONFIG_PKG_USING_ST7789 is not set # CONFIG_PKG_USING_SPI_TOOLS is not set # @@ -735,6 +754,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # CONFIG_PKG_USING_UKAL is not set # CONFIG_PKG_USING_DIGITALCTRL is not set # CONFIG_PKG_USING_KISSFFT is not set +# CONFIG_PKG_USING_CMSIS_DSP is not set # # miscellaneous packages @@ -957,6 +977,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_GFX_LIBRARY is not set # CONFIG_PKG_USING_ARDUINO_U8G2 is not set +# CONFIG_PKG_USING_ARDUINO_TFT_ESPI is not set # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_ST7735 is not set # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_SSD1306 is not set # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_ILI9341 is not set @@ -965,6 +986,7 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # # Timing # +# CONFIG_PKG_USING_ARDUINO_RTCLIB is not set # CONFIG_PKG_USING_ARDUINO_MSTIMER2 is not set # CONFIG_PKG_USING_ARDUINO_TICKER is not set # CONFIG_PKG_USING_ARDUINO_TASKSCHEDULER is not set @@ -1001,7 +1023,6 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0 # # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_MFRC630 is not set # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_SI5351 is not set -# CONFIG_PKG_USING_ARDUINO_RTCLIB is not set # # Signal IO @@ -1024,7 +1045,6 @@ CONFIG_SOC_SERIES_STM32F4=y # # Hardware Drivers Config # -CONFIG_SOC_STM32F429ZI=y # # Onboard Peripheral Drivers diff --git a/bsp/stm32/stm32f429-st-disco/Kconfig b/bsp/stm32/stm32f429-st-disco/Kconfig index 79b160b856..75d6a77aae 100644 --- a/bsp/stm32/stm32f429-st-disco/Kconfig +++ b/bsp/stm32/stm32f429-st-disco/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F429ZI + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f429-st-disco/applications/main.c b/bsp/stm32/stm32f429-st-disco/applications/main.c index 48f43fd6fa..f54c7c566e 100644 --- a/bsp/stm32/stm32f429-st-disco/applications/main.c +++ b/bsp/stm32/stm32f429-st-disco/applications/main.c @@ -7,11 +7,15 @@ * Date Author Notes * 2018-11-06 SummerGift first version * 2019-10-19 xuzhuoyi add stm32f429-st-disco bsp + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED1 pin: PG13 */ #define LED1_PIN GET_PIN(G, 13) diff --git a/bsp/stm32/stm32f429-st-disco/board/Kconfig b/bsp/stm32/stm32f429-st-disco/board/Kconfig index fddfaa9616..fcec182d7f 100644 --- a/bsp/stm32/stm32f429-st-disco/board/Kconfig +++ b/bsp/stm32/stm32f429-st-disco/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F429ZI - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" config BSP_USING_SDRAM @@ -111,7 +104,7 @@ menu "On-chip Peripheral Drivers" select BSP_USING_LCD default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f429-st-disco/board/board.c b/bsp/stm32/stm32f429-st-disco/board/board.c index 542681ae0b..190b6f79da 100644 --- a/bsp/stm32/stm32f429-st-disco/board/board.c +++ b/bsp/stm32/stm32f429-st-disco/board/board.c @@ -9,7 +9,8 @@ * 2019-10-13 xuzhuoyi add stm32f429-st-disco bsp */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f429-st-disco/board/board.h b/bsp/stm32/stm32f429-st-disco/board/board.h index 650b64a256..94098c6b97 100644 --- a/bsp/stm32/stm32f429-st-disco/board/board.h +++ b/bsp/stm32/stm32f429-st-disco/board/board.h @@ -12,10 +12,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f429-st-disco/rtconfig.h b/bsp/stm32/stm32f429-st-disco/rtconfig.h index b41db94443..6ba035c9d0 100644 --- a/bsp/stm32/stm32f429-st-disco/rtconfig.h +++ b/bsp/stm32/stm32f429-st-disco/rtconfig.h @@ -4,9 +4,12 @@ /* Automatically generated file; DO NOT EDIT. */ /* RT-Thread Configuration */ +#define SOC_STM32F429ZI + /* RT-Thread Kernel */ #define RT_NAME_MAX 8 +#define RT_CPUS_NR 1 #define RT_ALIGN_SIZE 8 #define RT_THREAD_PRIORITY_32 #define RT_THREAD_PRIORITY_MAX 32 @@ -31,7 +34,6 @@ #define RT_USING_EVENT #define RT_USING_MAILBOX #define RT_USING_MESSAGEQUEUE -#define RT_USING_SIGNALS /* Memory Management */ @@ -41,14 +43,12 @@ #define RT_USING_MEMHEAP_AS_HEAP #define RT_USING_MEMHEAP_AUTO_BINDING #define RT_USING_HEAP - -/* Kernel Device Object */ - #define RT_USING_DEVICE #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 128 #define RT_CONSOLE_DEVICE_NAME "uart1" -#define RT_VER_NUM 0x50002 +#define RT_VER_NUM 0x50100 +#define RT_BACKTRACE_LEVEL_MAX_NR 32 #define RT_USING_HW_ATOMIC #define RT_USING_CPU_FFS #define ARCH_ARM @@ -126,6 +126,9 @@ /* Network */ +/* Memory protection */ + + /* Utilities */ @@ -145,6 +148,9 @@ /* Wiced WiFi */ +/* CYW43012 WiFi */ + + /* IoT Cloud */ @@ -250,8 +256,6 @@ /* Hardware Drivers Config */ -#define SOC_STM32F429ZI - /* Onboard Peripheral Drivers */ #define BSP_USING_SDRAM diff --git a/bsp/stm32/stm32f446-st-nucleo/Kconfig b/bsp/stm32/stm32f446-st-nucleo/Kconfig index 79b160b856..dca75b1339 100644 --- a/bsp/stm32/stm32f446-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f446-st-nucleo/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F446ZE + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f446-st-nucleo/applications/main.c b/bsp/stm32/stm32f446-st-nucleo/applications/main.c index b419a79449..48cb839622 100644 --- a/bsp/stm32/stm32f446-st-nucleo/applications/main.c +++ b/bsp/stm32/stm32f446-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 <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED2 pin: PB7 */ #define LED2_PIN GET_PIN(B, 7) diff --git a/bsp/stm32/stm32f446-st-nucleo/board/Kconfig b/bsp/stm32/stm32f446-st-nucleo/board/Kconfig index 99d45bee62..02063a9a7f 100644 --- a/bsp/stm32/stm32f446-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32f446-st-nucleo/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F446ZE - bool - select SOC_SERIES_STM32F4 - select RT_USING_COMPONENTS_INIT - select RT_USING_USER_MAIN - default y - menu "Onboard Peripheral Drivers" endmenu @@ -32,7 +25,7 @@ menu "On-chip Peripheral Drivers" depends on BSP_USING_UART1 && RT_SERIAL_USING_DMA default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f446-st-nucleo/board/board.c b/bsp/stm32/stm32f446-st-nucleo/board/board.c index a2500ee68a..825f68bd10 100644 --- a/bsp/stm32/stm32f446-st-nucleo/board/board.c +++ b/bsp/stm32/stm32f446-st-nucleo/board/board.c @@ -9,7 +9,8 @@ * 2019-01-08 AndeyQi add stm32f446-st-nucleo bsp */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f446-st-nucleo/board/board.h b/bsp/stm32/stm32f446-st-nucleo/board/board.h index 3da6cda6d2..96803437ce 100644 --- a/bsp/stm32/stm32f446-st-nucleo/board/board.h +++ b/bsp/stm32/stm32f446-st-nucleo/board/board.h @@ -12,10 +12,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#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/stm32f469-st-disco/Kconfig b/bsp/stm32/stm32f469-st-disco/Kconfig index 79b160b856..f8ff75a689 100644 --- a/bsp/stm32/stm32f469-st-disco/Kconfig +++ b/bsp/stm32/stm32f469-st-disco/Kconfig @@ -15,7 +15,17 @@ config PKGS_DIR option env="PKGS_ROOT" default "packages" +config SOC_STM32F469NI + bool + select SOC_SERIES_STM32F4 + select RT_USING_COMPONENTS_INIT + select RT_USING_USER_MAIN + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f469-st-disco/applications/main.c b/bsp/stm32/stm32f469-st-disco/applications/main.c index e5a331ad8c..4f54207460 100644 --- a/bsp/stm32/stm32f469-st-disco/applications/main.c +++ b/bsp/stm32/stm32f469-st-disco/applications/main.c @@ -5,13 +5,16 @@ * * Change Logs: * Date Author Notes - * 2018-11-06 SummerGift first version - * 2019-04-09 WillianChan add stm32f469-st-disco bsp + * 2019-04-09 WillianChan first version + * 2023-12-03 Meco Man support nano version */ +#include <board.h> #include <rtthread.h> +#include <drv_gpio.h> +#ifndef RT_USING_NANO #include <rtdevice.h> -#include <board.h> +#endif /* RT_USING_NANO */ /* defined the LED1 pin: PG6 */ #define LED1_PIN GET_PIN(G, 6) diff --git a/bsp/stm32/stm32f469-st-disco/board/Kconfig b/bsp/stm32/stm32f469-st-disco/board/Kconfig index 6eea01cadb..c96f12bc91 100644 --- a/bsp/stm32/stm32f469-st-disco/board/Kconfig +++ b/bsp/stm32/stm32f469-st-disco/board/Kconfig @@ -1,12 +1,5 @@ menu "Hardware Drivers Config" -config SOC_STM32F469NI - bool - select SOC_SERIES_STM32F4 - 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 (uart3)" @@ -261,7 +254,7 @@ menu "On-chip Peripheral Drivers" config BSP_USING_LTDC bool "Enable LTDC" default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f469-st-disco/board/board.c b/bsp/stm32/stm32f469-st-disco/board/board.c index fefb07fafd..e9dced29f6 100644 --- a/bsp/stm32/stm32f469-st-disco/board/board.c +++ b/bsp/stm32/stm32f469-st-disco/board/board.c @@ -9,7 +9,8 @@ * 2019-04-09 WillianChan add stm32f469-st-disco bsp */ -#include "board.h" +#include <board.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32f469-st-disco/board/board.h b/bsp/stm32/stm32f469-st-disco/board/board.h index 14f3a6f037..d098d80c30 100644 --- a/bsp/stm32/stm32f469-st-disco/board/board.h +++ b/bsp/stm32/stm32f469-st-disco/board/board.h @@ -12,10 +12,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32f4xx.h> -#include "drv_common.h" -#include "drv_gpio.h" #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32f723-st-disco/Kconfig b/bsp/stm32/stm32f723-st-disco/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32f723-st-disco/Kconfig +++ b/bsp/stm32/stm32f723-st-disco/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f723-st-disco/board/Kconfig b/bsp/stm32/stm32f723-st-disco/board/Kconfig index be3f9ab747..f77c9ec8d9 100644 --- a/bsp/stm32/stm32f723-st-disco/board/Kconfig +++ b/bsp/stm32/stm32f723-st-disco/board/Kconfig @@ -33,7 +33,7 @@ menu "On-chip Peripheral Drivers" default y endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f746-st-disco/Kconfig b/bsp/stm32/stm32f746-st-disco/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32f746-st-disco/Kconfig +++ b/bsp/stm32/stm32f746-st-disco/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f746-st-disco/board/Kconfig b/bsp/stm32/stm32f746-st-disco/board/Kconfig index bcef1eb339..b5519dace3 100644 --- a/bsp/stm32/stm32f746-st-disco/board/Kconfig +++ b/bsp/stm32/stm32f746-st-disco/board/Kconfig @@ -109,7 +109,7 @@ menu "On-chip Peripheral Drivers" config BSP_USING_LTDC bool default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f746-st-nucleo/Kconfig b/bsp/stm32/stm32f746-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32f746-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f746-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f746-st-nucleo/board/Kconfig b/bsp/stm32/stm32f746-st-nucleo/board/Kconfig index 78ea3494a2..df051d1362 100644 --- a/bsp/stm32/stm32f746-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32f746-st-nucleo/board/Kconfig @@ -241,7 +241,7 @@ menu "On-chip Peripheral Drivers" int "USB PULL UP STATUS" default 0 endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f767-atk-apollo/Kconfig b/bsp/stm32/stm32f767-atk-apollo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32f767-atk-apollo/Kconfig +++ b/bsp/stm32/stm32f767-atk-apollo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f767-atk-apollo/board/Kconfig b/bsp/stm32/stm32f767-atk-apollo/board/Kconfig index f47878e990..e337a09428 100644 --- a/bsp/stm32/stm32f767-atk-apollo/board/Kconfig +++ b/bsp/stm32/stm32f767-atk-apollo/board/Kconfig @@ -255,7 +255,7 @@ menu "On-chip Peripheral Drivers" bool "Enable LTDC" default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/Kconfig b/bsp/stm32/stm32f767-fire-challenger-v1/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/Kconfig +++ b/bsp/stm32/stm32f767-fire-challenger-v1/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/board/Kconfig b/bsp/stm32/stm32f767-fire-challenger-v1/board/Kconfig index 8b1918684d..fc0562c09c 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/board/Kconfig +++ b/bsp/stm32/stm32f767-fire-challenger-v1/board/Kconfig @@ -175,7 +175,7 @@ menu "On-chip Peripheral Drivers" bool default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f767-st-nucleo/Kconfig b/bsp/stm32/stm32f767-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32f767-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f767-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f767-st-nucleo/board/Kconfig b/bsp/stm32/stm32f767-st-nucleo/board/Kconfig index 26f22c378a..3cb7a5ccd1 100644 --- a/bsp/stm32/stm32f767-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32f767-st-nucleo/board/Kconfig @@ -56,7 +56,7 @@ menu "On-chip Peripheral Drivers" depends on BSP_USING_UART3 && RT_SERIAL_USING_DMA default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32f769-st-disco/Kconfig b/bsp/stm32/stm32f769-st-disco/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32f769-st-disco/Kconfig +++ b/bsp/stm32/stm32f769-st-disco/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32f769-st-disco/board/Kconfig b/bsp/stm32/stm32f769-st-disco/board/Kconfig index dbb42a1d99..fc6b54dd38 100644 --- a/bsp/stm32/stm32f769-st-disco/board/Kconfig +++ b/bsp/stm32/stm32f769-st-disco/board/Kconfig @@ -74,7 +74,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32g070-st-nucleo/Kconfig b/bsp/stm32/stm32g070-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32g070-st-nucleo/Kconfig +++ b/bsp/stm32/stm32g070-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32g070-st-nucleo/board/Kconfig b/bsp/stm32/stm32g070-st-nucleo/board/Kconfig index 4b7368b1a4..be468b410e 100644 --- a/bsp/stm32/stm32g070-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32g070-st-nucleo/board/Kconfig @@ -186,7 +186,7 @@ menu "On-chip Peripheral Drivers" bool "Enable Watchdog Timer" select RT_USING_WDT default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32g071-st-nucleo/Kconfig b/bsp/stm32/stm32g071-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32g071-st-nucleo/Kconfig +++ b/bsp/stm32/stm32g071-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32g071-st-nucleo/board/Kconfig b/bsp/stm32/stm32g071-st-nucleo/board/Kconfig index ee86ae58dc..f6641f010c 100644 --- a/bsp/stm32/stm32g071-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32g071-st-nucleo/board/Kconfig @@ -169,7 +169,7 @@ menu "On-chip Peripheral Drivers" bool "Enable Watchdog Timer" select RT_USING_WDT default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32g431-st-nucleo/Kconfig b/bsp/stm32/stm32g431-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32g431-st-nucleo/Kconfig +++ b/bsp/stm32/stm32g431-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32g431-st-nucleo/board/Kconfig b/bsp/stm32/stm32g431-st-nucleo/board/Kconfig index 1b769221f6..8635d18300 100644 --- a/bsp/stm32/stm32g431-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32g431-st-nucleo/board/Kconfig @@ -59,7 +59,7 @@ menu "On-chip Peripheral Drivers" depends on BSP_USING_UART4 && RT_SERIAL_USING_DMA default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32g474-st-nucleo/Kconfig b/bsp/stm32/stm32g474-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32g474-st-nucleo/Kconfig +++ b/bsp/stm32/stm32g474-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32g474-st-nucleo/board/Kconfig b/bsp/stm32/stm32g474-st-nucleo/board/Kconfig index 620f2a1a0a..0fa184b676 100644 --- a/bsp/stm32/stm32g474-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32g474-st-nucleo/board/Kconfig @@ -168,7 +168,7 @@ menu "On-chip Peripheral Drivers" default 25 endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32h563-st-nucleo/Kconfig b/bsp/stm32/stm32h563-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32h563-st-nucleo/Kconfig +++ b/bsp/stm32/stm32h563-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32h563-st-nucleo/board/Kconfig b/bsp/stm32/stm32h563-st-nucleo/board/Kconfig index a071b60d3e..6af29c13f2 100644 --- a/bsp/stm32/stm32h563-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32h563-st-nucleo/board/Kconfig @@ -56,7 +56,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32h743-armfly-v7/Kconfig b/bsp/stm32/stm32h743-armfly-v7/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32h743-armfly-v7/Kconfig +++ b/bsp/stm32/stm32h743-armfly-v7/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32h743-armfly-v7/board/Kconfig b/bsp/stm32/stm32h743-armfly-v7/board/Kconfig index 3306a438ae..0dedbb0d58 100644 --- a/bsp/stm32/stm32h743-armfly-v7/board/Kconfig +++ b/bsp/stm32/stm32h743-armfly-v7/board/Kconfig @@ -29,7 +29,7 @@ menu "On-chip Peripheral Drivers" endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32h743-atk-apollo/Kconfig b/bsp/stm32/stm32h743-atk-apollo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32h743-atk-apollo/Kconfig +++ b/bsp/stm32/stm32h743-atk-apollo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32h743-atk-apollo/board/Kconfig b/bsp/stm32/stm32h743-atk-apollo/board/Kconfig index 03206e5d11..f46f5f7956 100644 --- a/bsp/stm32/stm32h743-atk-apollo/board/Kconfig +++ b/bsp/stm32/stm32h743-atk-apollo/board/Kconfig @@ -197,7 +197,7 @@ menu "On-chip Peripheral Drivers" default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32h743-openmv-h7plus/Kconfig b/bsp/stm32/stm32h743-openmv-h7plus/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32h743-openmv-h7plus/Kconfig +++ b/bsp/stm32/stm32h743-openmv-h7plus/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32h743-openmv-h7plus/board/Kconfig b/bsp/stm32/stm32h743-openmv-h7plus/board/Kconfig index ca3ae90a22..656e2f955a 100644 --- a/bsp/stm32/stm32h743-openmv-h7plus/board/Kconfig +++ b/bsp/stm32/stm32h743-openmv-h7plus/board/Kconfig @@ -59,7 +59,7 @@ menu "Hardware Drivers Config" select RT_USING_RTC default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32h743-st-nucleo/Kconfig b/bsp/stm32/stm32h743-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32h743-st-nucleo/Kconfig +++ b/bsp/stm32/stm32h743-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32h743-st-nucleo/board/Kconfig b/bsp/stm32/stm32h743-st-nucleo/board/Kconfig index 71a9e6d6fb..4cf0104dfd 100644 --- a/bsp/stm32/stm32h743-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32h743-st-nucleo/board/Kconfig @@ -29,7 +29,7 @@ menu "On-chip Peripheral Drivers" endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32h747-st-discovery/Kconfig b/bsp/stm32/stm32h747-st-discovery/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32h747-st-discovery/Kconfig +++ b/bsp/stm32/stm32h747-st-discovery/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32h747-st-discovery/board/Kconfig b/bsp/stm32/stm32h747-st-discovery/board/Kconfig index eef2a51548..b7770bbdc8 100644 --- a/bsp/stm32/stm32h747-st-discovery/board/Kconfig +++ b/bsp/stm32/stm32h747-st-discovery/board/Kconfig @@ -29,7 +29,7 @@ menu "On-chip Peripheral Drivers" endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32h750-armfly-h7-tool/Kconfig b/bsp/stm32/stm32h750-armfly-h7-tool/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32h750-armfly-h7-tool/Kconfig +++ b/bsp/stm32/stm32h750-armfly-h7-tool/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32h750-armfly-h7-tool/board/Kconfig b/bsp/stm32/stm32h750-armfly-h7-tool/board/Kconfig index 98431741e4..ff284c91f4 100644 --- a/bsp/stm32/stm32h750-armfly-h7-tool/board/Kconfig +++ b/bsp/stm32/stm32h750-armfly-h7-tool/board/Kconfig @@ -136,7 +136,7 @@ menu "On-chip Peripheral Drivers" select BSP_USBD_PHY_ULPI default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32h750-artpi/Kconfig b/bsp/stm32/stm32h750-artpi/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32h750-artpi/Kconfig +++ b/bsp/stm32/stm32h750-artpi/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32h750-artpi/board/Kconfig b/bsp/stm32/stm32h750-artpi/board/Kconfig index 1d488c446f..0e1b0972a7 100644 --- a/bsp/stm32/stm32h750-artpi/board/Kconfig +++ b/bsp/stm32/stm32h750-artpi/board/Kconfig @@ -386,7 +386,7 @@ menu "On-chip Peripheral Drivers" config BSP_USING_LTDC bool default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32h750-fk750m1-vbt6/Kconfig b/bsp/stm32/stm32h750-fk750m1-vbt6/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32h750-fk750m1-vbt6/Kconfig +++ b/bsp/stm32/stm32h750-fk750m1-vbt6/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32h750-fk750m1-vbt6/board/Kconfig b/bsp/stm32/stm32h750-fk750m1-vbt6/board/Kconfig index d387aa3dd2..43416899bf 100644 --- a/bsp/stm32/stm32h750-fk750m1-vbt6/board/Kconfig +++ b/bsp/stm32/stm32h750-fk750m1-vbt6/board/Kconfig @@ -114,14 +114,13 @@ menu "On-chip Peripheral Drivers" menuconfig BSP_USING_ONCHIP_RTC bool "Enable RTC" select RT_USING_RTC - select RT_USING_LIBC default n config BSP_USING_ON_CHIP_FLASH bool "Enable on-chip FLASH" default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32h750-weact-ministm32h7xx/Kconfig b/bsp/stm32/stm32h750-weact-ministm32h7xx/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32h750-weact-ministm32h7xx/Kconfig +++ b/bsp/stm32/stm32h750-weact-ministm32h7xx/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32h750-weact-ministm32h7xx/board/Kconfig b/bsp/stm32/stm32h750-weact-ministm32h7xx/board/Kconfig index 55e845bd64..ae3e8fabc5 100644 --- a/bsp/stm32/stm32h750-weact-ministm32h7xx/board/Kconfig +++ b/bsp/stm32/stm32h750-weact-ministm32h7xx/board/Kconfig @@ -176,7 +176,7 @@ menu "On-chip Peripheral Drivers" select BSP_USBD_PHY_ULPI default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l010-st-nucleo/Kconfig b/bsp/stm32/stm32l010-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l010-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l010-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l010-st-nucleo/board/Kconfig b/bsp/stm32/stm32l010-st-nucleo/board/Kconfig index 4946a21947..9861ceec78 100644 --- a/bsp/stm32/stm32l010-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l010-st-nucleo/board/Kconfig @@ -37,7 +37,7 @@ menu "On-chip Peripheral Drivers" depends on BSP_USING_UART2 && RT_SERIAL_USING_DMA default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l053-st-nucleo/Kconfig b/bsp/stm32/stm32l053-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l053-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l053-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l053-st-nucleo/board/Kconfig b/bsp/stm32/stm32l053-st-nucleo/board/Kconfig index b086dbff9b..bde022d45b 100644 --- a/bsp/stm32/stm32l053-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l053-st-nucleo/board/Kconfig @@ -38,7 +38,7 @@ menu "On-chip Peripheral Drivers" depends on BSP_USING_UART2 && RT_SERIAL_USING_DMA default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l412-st-nucleo/Kconfig b/bsp/stm32/stm32l412-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l412-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l412-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l412-st-nucleo/board/Kconfig b/bsp/stm32/stm32l412-st-nucleo/board/Kconfig index ec1cba23e2..34604a52f5 100644 --- a/bsp/stm32/stm32l412-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l412-st-nucleo/board/Kconfig @@ -62,7 +62,7 @@ menu "On-chip Peripheral Drivers" bool "Enable Watchdog Timer" select RT_USING_WDT default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l431-BearPi/Kconfig b/bsp/stm32/stm32l431-BearPi/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l431-BearPi/Kconfig +++ b/bsp/stm32/stm32l431-BearPi/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l431-BearPi/board/Kconfig b/bsp/stm32/stm32l431-BearPi/board/Kconfig index c5bde336d1..d9f3761b07 100644 --- a/bsp/stm32/stm32l431-BearPi/board/Kconfig +++ b/bsp/stm32/stm32l431-BearPi/board/Kconfig @@ -148,7 +148,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l432-st-nucleo/Kconfig b/bsp/stm32/stm32l432-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l432-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l432-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l432-st-nucleo/board/Kconfig b/bsp/stm32/stm32l432-st-nucleo/board/Kconfig index fcc0a9ffa6..645582c8b0 100644 --- a/bsp/stm32/stm32l432-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l432-st-nucleo/board/Kconfig @@ -62,7 +62,7 @@ menu "On-chip Peripheral Drivers" bool "Enable Watchdog Timer" select RT_USING_WDT default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l433-ali-startkit/Kconfig b/bsp/stm32/stm32l433-ali-startkit/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l433-ali-startkit/Kconfig +++ b/bsp/stm32/stm32l433-ali-startkit/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l433-ali-startkit/board/Kconfig b/bsp/stm32/stm32l433-ali-startkit/board/Kconfig index 8b88d1f6b3..d4a0f6c5dd 100644 --- a/bsp/stm32/stm32l433-ali-startkit/board/Kconfig +++ b/bsp/stm32/stm32l433-ali-startkit/board/Kconfig @@ -220,7 +220,7 @@ menu "On-chip Peripheral Drivers" select RT_USING_WDT default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l433-st-nucleo/Kconfig b/bsp/stm32/stm32l433-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l433-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l433-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l433-st-nucleo/board/Kconfig b/bsp/stm32/stm32l433-st-nucleo/board/Kconfig index e0652e11b8..0fb450304e 100644 --- a/bsp/stm32/stm32l433-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l433-st-nucleo/board/Kconfig @@ -84,7 +84,7 @@ menu "On-chip Peripheral Drivers" endchoice endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l452-st-nucleo/Kconfig b/bsp/stm32/stm32l452-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l452-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l452-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l452-st-nucleo/board/Kconfig b/bsp/stm32/stm32l452-st-nucleo/board/Kconfig index 6672d209b9..2470c20b36 100644 --- a/bsp/stm32/stm32l452-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l452-st-nucleo/board/Kconfig @@ -81,7 +81,7 @@ menu "On-chip Peripheral Drivers" range 1 176 default 16 endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l475-atk-pandora/Kconfig b/bsp/stm32/stm32l475-atk-pandora/Kconfig index 18ee161f55..586c8dc428 100644 --- a/bsp/stm32/stm32l475-atk-pandora/Kconfig +++ b/bsp/stm32/stm32l475-atk-pandora/Kconfig @@ -22,10 +22,14 @@ config SOC_STM32L475VE select RT_USING_USER_MAIN default y +config BOARD_STM32L475_ATK_PANDORA + bool + default y + source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" +source "../libraries/Kconfig" if !RT_USING_NANO -source "../libraries/Kconfig" source "board/Kconfig" endif diff --git a/bsp/stm32/stm32l475-atk-pandora/applications/main.c b/bsp/stm32/stm32l475-atk-pandora/applications/main.c index 7ff30d0059..87a18eaf44 100644 --- a/bsp/stm32/stm32l475-atk-pandora/applications/main.c +++ b/bsp/stm32/stm32l475-atk-pandora/applications/main.c @@ -6,13 +6,15 @@ * Change Logs: * Date Author Notes * 2018-11-06 SummerGift first version + * 2023-12-03 Meco Man support nano version */ -#include <rtthread.h> #include <board.h> - +#include <rtthread.h> +#include <drv_gpio.h> #ifndef RT_USING_NANO #include <rtdevice.h> +#endif /* RT_USING_NANO */ /* defined the LED0 pin: PE7 */ #define LED0_PIN GET_PIN(E, 7) @@ -30,28 +32,4 @@ int main(void) rt_thread_mdelay(500); } } -#else -int main(void) -{ - GPIO_InitTypeDef GPIO_InitStruct = {0}; - - /* GPIO Ports Clock Enable */ - __HAL_RCC_GPIOE_CLK_ENABLE(); - - /*Configure GPIO pin Output Level */ - HAL_GPIO_WritePin(GPIOE, GPIO_PIN_7, GPIO_PIN_SET); - /*Configure GPIO pin : PE7 */ - GPIO_InitStruct.Pin = GPIO_PIN_7; - GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; - GPIO_InitStruct.Pull = GPIO_PULLUP; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_MEDIUM; - HAL_GPIO_Init(GPIOE, &GPIO_InitStruct); - - while (1) - { - HAL_GPIO_TogglePin(GPIOE, GPIO_PIN_7); - rt_thread_mdelay(500); - } -} -#endif /* RT_USING_NANO */ diff --git a/bsp/stm32/stm32l475-atk-pandora/board/Kconfig b/bsp/stm32/stm32l475-atk-pandora/board/Kconfig index 0bc4844a11..659408da4f 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/Kconfig +++ b/bsp/stm32/stm32l475-atk-pandora/board/Kconfig @@ -1,9 +1,5 @@ menu "Hardware Drivers Config" -config BOARD_STM32L475_ATK_PANDORA - bool - default y - menu "Onboard Peripheral Drivers" config BSP_USING_STLINK_TO_USART @@ -576,7 +572,7 @@ menu "On-chip Peripheral Drivers" BSP_USING_STM32_SDIO use drv_sdio_adapter.c,and BSP_USING_SDIO use drv_sdio.c - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l475-atk-pandora/board/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/SConscript index e1deb74ee5..bf886a10db 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/board/SConscript @@ -43,8 +43,6 @@ if not GetDepend(['RT_USING_NANO']): if GetDepend(['BSP_USING_AUDIO']): path += [cwd + os.path.join('ports', 'audio')] -else: - src += [os.path.join('nano', 'drv_console.c')] startup_path_prefix = SDK_LIB diff --git a/bsp/stm32/stm32l475-atk-pandora/board/board.c b/bsp/stm32/stm32l475-atk-pandora/board/board.c index 17f1f41010..183c61401a 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/board.c +++ b/bsp/stm32/stm32l475-atk-pandora/board/board.c @@ -5,12 +5,11 @@ * * Change Logs: * Date Author Notes - * 2009-01-05 Bernard first implementation * 2019-05-09 Zero-Free Adding multiple configurations for system clock frequency */ #include <board.h> -#include <rtthread.h> +#include <drv_common.h> void SystemClock_Config(void) { diff --git a/bsp/stm32/stm32l475-atk-pandora/board/board.h b/bsp/stm32/stm32l475-atk-pandora/board/board.h index 410d3155e6..c554ff60a2 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/board.h +++ b/bsp/stm32/stm32l475-atk-pandora/board/board.h @@ -11,12 +11,7 @@ #ifndef __BOARD_H__ #define __BOARD_H__ -#include <rtthread.h> #include <stm32l4xx.h> -#include <drv_common.h> -#ifndef RT_USING_NANO -#include <drv_gpio.h> -#endif /* RT_USING_NANO */ #ifdef __cplusplus extern "C" { diff --git a/bsp/stm32/stm32l475-atk-pandora/board/nano/drv_console.c b/bsp/stm32/stm32l475-atk-pandora/board/nano/drv_console.c deleted file mode 100644 index 95a7734227..0000000000 --- a/bsp/stm32/stm32l475-atk-pandora/board/nano/drv_console.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2006-2021, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2023-11-30 Meco Man First version - */ - -#include <board.h> - -UART_HandleTypeDef huart1; - -void rt_hw_console_init(void) -{ - huart1.Instance = USART1; - huart1.Init.BaudRate = 115200; - huart1.Init.WordLength = UART_WORDLENGTH_8B; - huart1.Init.StopBits = UART_STOPBITS_1; - huart1.Init.Parity = UART_PARITY_NONE; - huart1.Init.Mode = UART_MODE_TX_RX; - huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE; - huart1.Init.OverSampling = UART_OVERSAMPLING_16; - huart1.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE; - huart1.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT; - if (HAL_UART_Init(&huart1) != HAL_OK) - { - Error_Handler(); - } -} - -void rt_hw_console_output(const char *str) -{ - rt_size_t i = 0, size = 0; - char a = '\r'; - - __HAL_UNLOCK(&huart1); - - size = rt_strlen(str); - for (i = 0; i < size; i++) - { - if (*(str + i) == '\n') - { - HAL_UART_Transmit(&huart1, (uint8_t *)&a, 1, 1); - } - HAL_UART_Transmit(&huart1, (uint8_t *)(str + i), 1, 1); - } -} - -char rt_hw_console_getchar(void) -{ - int ch = -1; - - if (__HAL_UART_GET_FLAG(&huart1, UART_FLAG_RXNE) != RESET) - { - ch = huart1.Instance->RDR & 0xff; - } - else - { - rt_thread_mdelay(10); - } - return ch; -} diff --git a/bsp/stm32/stm32l475-st-discovery/Kconfig b/bsp/stm32/stm32l475-st-discovery/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l475-st-discovery/Kconfig +++ b/bsp/stm32/stm32l475-st-discovery/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l475-st-discovery/board/Kconfig b/bsp/stm32/stm32l475-st-discovery/board/Kconfig index c3da67a5f4..0c695f7520 100644 --- a/bsp/stm32/stm32l475-st-discovery/board/Kconfig +++ b/bsp/stm32/stm32l475-st-discovery/board/Kconfig @@ -32,7 +32,7 @@ menu "On-chip Peripheral Drivers" depends on BSP_USING_UART1 && RT_SERIAL_USING_DMA default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l476-st-nucleo/Kconfig b/bsp/stm32/stm32l476-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l476-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l476-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l476-st-nucleo/board/Kconfig b/bsp/stm32/stm32l476-st-nucleo/board/Kconfig index 3f329322ab..d0eee73a10 100644 --- a/bsp/stm32/stm32l476-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l476-st-nucleo/board/Kconfig @@ -269,7 +269,7 @@ menu "On-chip Peripheral Drivers" endchoice endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l496-ali-developer/Kconfig b/bsp/stm32/stm32l496-ali-developer/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l496-ali-developer/Kconfig +++ b/bsp/stm32/stm32l496-ali-developer/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l496-ali-developer/board/Kconfig b/bsp/stm32/stm32l496-ali-developer/board/Kconfig index bfe1551a06..1b21530b7c 100644 --- a/bsp/stm32/stm32l496-ali-developer/board/Kconfig +++ b/bsp/stm32/stm32l496-ali-developer/board/Kconfig @@ -228,7 +228,7 @@ menu "On-chip Peripheral Drivers" select RT_USING_WDT default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l496-st-discovery/Kconfig b/bsp/stm32/stm32l496-st-discovery/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l496-st-discovery/Kconfig +++ b/bsp/stm32/stm32l496-st-discovery/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l496-st-discovery/board/Kconfig b/bsp/stm32/stm32l496-st-discovery/board/Kconfig index 78f4a0f51d..8ab426c110 100644 --- a/bsp/stm32/stm32l496-st-discovery/board/Kconfig +++ b/bsp/stm32/stm32l496-st-discovery/board/Kconfig @@ -37,7 +37,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l496-st-nucleo/Kconfig b/bsp/stm32/stm32l496-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l496-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l496-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l496-st-nucleo/board/Kconfig b/bsp/stm32/stm32l496-st-nucleo/board/Kconfig index 0ed4a9cefd..82c8aad1e1 100644 --- a/bsp/stm32/stm32l496-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l496-st-nucleo/board/Kconfig @@ -285,7 +285,7 @@ menu "On-chip Peripheral Drivers" select RT_USING_DFS_ELMFAT default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l4r5-st-nucleo/Kconfig b/bsp/stm32/stm32l4r5-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l4r5-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l4r9-st-eval/Kconfig b/bsp/stm32/stm32l4r9-st-eval/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l4r9-st-eval/Kconfig +++ b/bsp/stm32/stm32l4r9-st-eval/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l4r9-st-eval/board/Kconfig b/bsp/stm32/stm32l4r9-st-eval/board/Kconfig index c1cceb57a5..e38e6eb96a 100644 --- a/bsp/stm32/stm32l4r9-st-eval/board/Kconfig +++ b/bsp/stm32/stm32l4r9-st-eval/board/Kconfig @@ -90,7 +90,7 @@ menu "On-chip Peripheral Drivers" config BSP_USING_FMC bool default n - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/Kconfig b/bsp/stm32/stm32l4r9-st-sensortile-box/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/Kconfig +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/board/Kconfig b/bsp/stm32/stm32l4r9-st-sensortile-box/board/Kconfig index ae62ce437f..709a2d1ad4 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/board/Kconfig +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/board/Kconfig @@ -31,7 +31,7 @@ menu "On-chip Peripheral Drivers" default y - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32l552-st-nucleo/Kconfig b/bsp/stm32/stm32l552-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32l552-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l552-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32l552-st-nucleo/board/Kconfig b/bsp/stm32/stm32l552-st-nucleo/board/Kconfig index cb91e5e446..4bcfb716af 100644 --- a/bsp/stm32/stm32l552-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32l552-st-nucleo/board/Kconfig @@ -33,7 +33,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32mp157a-st-discovery/Kconfig b/bsp/stm32/stm32mp157a-st-discovery/Kconfig index 7a400db91f..1b639d65a7 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/Kconfig +++ b/bsp/stm32/stm32mp157a-st-discovery/Kconfig @@ -18,5 +18,8 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/Kconfig b/bsp/stm32/stm32mp157a-st-discovery/board/Kconfig index 4c7665b167..ae00b7a4f7 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/board/Kconfig +++ b/bsp/stm32/stm32mp157a-st-discovery/board/Kconfig @@ -291,7 +291,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32mp157a-st-ev1/Kconfig b/bsp/stm32/stm32mp157a-st-ev1/Kconfig index 7a400db91f..1b639d65a7 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/Kconfig +++ b/bsp/stm32/stm32mp157a-st-ev1/Kconfig @@ -18,5 +18,8 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig b/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig index 35a8ec35a9..4574839263 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig +++ b/bsp/stm32/stm32mp157a-st-ev1/board/Kconfig @@ -328,7 +328,7 @@ menu "On-chip Peripheral Drivers" default n endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32u575-st-nucleo/Kconfig b/bsp/stm32/stm32u575-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32u575-st-nucleo/Kconfig +++ b/bsp/stm32/stm32u575-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32u575-st-nucleo/board/Kconfig b/bsp/stm32/stm32u575-st-nucleo/board/Kconfig index 3d6d5b29a1..813d5eb97b 100644 --- a/bsp/stm32/stm32u575-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32u575-st-nucleo/board/Kconfig @@ -197,7 +197,7 @@ menu "On-chip Peripheral Drivers" endif endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32u585-iot02a/Kconfig b/bsp/stm32/stm32u585-iot02a/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32u585-iot02a/Kconfig +++ b/bsp/stm32/stm32u585-iot02a/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32u585-iot02a/board/Kconfig b/bsp/stm32/stm32u585-iot02a/board/Kconfig index 7bc7e1ebf1..995dfbc7e0 100644 --- a/bsp/stm32/stm32u585-iot02a/board/Kconfig +++ b/bsp/stm32/stm32u585-iot02a/board/Kconfig @@ -25,7 +25,7 @@ menu "On-chip Peripheral Drivers" default y endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32wb55-st-nucleo/Kconfig b/bsp/stm32/stm32wb55-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/Kconfig +++ b/bsp/stm32/stm32wb55-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32wb55-st-nucleo/board/Kconfig b/bsp/stm32/stm32wb55-st-nucleo/board/Kconfig index 806100aca1..dde7b3fca3 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/board/Kconfig +++ b/bsp/stm32/stm32wb55-st-nucleo/board/Kconfig @@ -157,7 +157,7 @@ menu "On-chip Peripheral Drivers" endchoice endif - source "../libraries/HAL_Drivers/Kconfig" + source "$BSP_DIR/../libraries/HAL_Drivers/drivers/Kconfig" endmenu diff --git a/bsp/stm32/stm32wl55-st-nucleo/Kconfig b/bsp/stm32/stm32wl55-st-nucleo/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32wl55-st-nucleo/Kconfig +++ b/bsp/stm32/stm32wl55-st-nucleo/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32wle5-yizhilian-lm401/Kconfig b/bsp/stm32/stm32wle5-yizhilian-lm401/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm401/Kconfig +++ b/bsp/stm32/stm32wle5-yizhilian-lm401/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif diff --git a/bsp/stm32/stm32wle5-yizhilian-lm402/Kconfig b/bsp/stm32/stm32wle5-yizhilian-lm402/Kconfig index 79b160b856..362bdfbed8 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm402/Kconfig +++ b/bsp/stm32/stm32wle5-yizhilian-lm402/Kconfig @@ -18,4 +18,7 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" source "../libraries/Kconfig" + +if !RT_USING_NANO source "board/Kconfig" +endif |