From 227b6eb30de0758b1ff115de88a32eeb44706557 Mon Sep 17 00:00:00 2001 From: misonyo Date: Mon, 28 Jan 2019 13:54:20 +0800 Subject: [PATCH 1/2] [components/drivers & bsp/stm32]fix kconfig syntax error and add rx buffer size config --- bsp/stm32/stm32f103-dofly-lyc8/Kconfig | 6 +++--- bsp/stm32/stm32f103-hw100k-ibox/Kconfig | 6 +++--- bsp/stm32/stm32f746-st-disco/Kconfig | 6 +++--- bsp/stm32/stm32f767-st-nucleo/Kconfig | 6 +++--- bsp/stm32/stm32g071-st-nucleo/Kconfig | 6 +++--- bsp/stm32/stm32l432-st-nucleo/Kconfig | 6 +++--- components/drivers/Kconfig | 8 +++++++- 7 files changed, 25 insertions(+), 19 deletions(-) diff --git a/bsp/stm32/stm32f103-dofly-lyc8/Kconfig b/bsp/stm32/stm32f103-dofly-lyc8/Kconfig index 2b30840a3e..7a400db91f 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/Kconfig +++ b/bsp/stm32/stm32f103-dofly-lyc8/Kconfig @@ -1,16 +1,16 @@ mainmenu "RT-Thread Configuration" -config $BSP_DIR +config BSP_DIR string option env="BSP_ROOT" default "." -config $RTT_DIR +config RTT_DIR string option env="RTT_ROOT" default "../../.." -config $PKGS_DIR +config PKGS_DIR string option env="PKGS_ROOT" default "packages" diff --git a/bsp/stm32/stm32f103-hw100k-ibox/Kconfig b/bsp/stm32/stm32f103-hw100k-ibox/Kconfig index 2b30840a3e..7a400db91f 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/Kconfig +++ b/bsp/stm32/stm32f103-hw100k-ibox/Kconfig @@ -1,16 +1,16 @@ mainmenu "RT-Thread Configuration" -config $BSP_DIR +config BSP_DIR string option env="BSP_ROOT" default "." -config $RTT_DIR +config RTT_DIR string option env="RTT_ROOT" default "../../.." -config $PKGS_DIR +config PKGS_DIR string option env="PKGS_ROOT" default "packages" diff --git a/bsp/stm32/stm32f746-st-disco/Kconfig b/bsp/stm32/stm32f746-st-disco/Kconfig index d174bcc585..8cbc7b71a8 100644 --- a/bsp/stm32/stm32f746-st-disco/Kconfig +++ b/bsp/stm32/stm32f746-st-disco/Kconfig @@ -1,16 +1,16 @@ mainmenu "RT-Thread Configuration" -config $BSP_DIR +config BSP_DIR string option env="BSP_ROOT" default "." -config $RTT_DIR +config RTT_DIR string option env="RTT_ROOT" default "../../.." -config $PKGS_DIR +config PKGS_DIR string option env="PKGS_ROOT" default "packages" diff --git a/bsp/stm32/stm32f767-st-nucleo/Kconfig b/bsp/stm32/stm32f767-st-nucleo/Kconfig index 768b68bb13..8fa7560ee8 100644 --- a/bsp/stm32/stm32f767-st-nucleo/Kconfig +++ b/bsp/stm32/stm32f767-st-nucleo/Kconfig @@ -1,16 +1,16 @@ mainmenu "RT-Thread Configuration" -config $BSP_DIR +config BSP_DIR string option env="BSP_ROOT" default "." -config $RTT_DIR +config RTT_DIR string option env="RTT_ROOT" default "../../.." -config $PKGS_DIR +config PKGS_DIR string option env="PKGS_ROOT" default "packages" diff --git a/bsp/stm32/stm32g071-st-nucleo/Kconfig b/bsp/stm32/stm32g071-st-nucleo/Kconfig index 8c9d8002cf..79b160b856 100644 --- a/bsp/stm32/stm32g071-st-nucleo/Kconfig +++ b/bsp/stm32/stm32g071-st-nucleo/Kconfig @@ -1,16 +1,16 @@ mainmenu "RT-Thread Configuration" -config $BSP_DIR +config BSP_DIR string option env="BSP_ROOT" default "." -config $RTT_DIR +config RTT_DIR string option env="RTT_ROOT" default "../../.." -config $PKGS_DIR +config PKGS_DIR string option env="PKGS_ROOT" default "packages" diff --git a/bsp/stm32/stm32l432-st-nucleo/Kconfig b/bsp/stm32/stm32l432-st-nucleo/Kconfig index d174bcc585..8cbc7b71a8 100644 --- a/bsp/stm32/stm32l432-st-nucleo/Kconfig +++ b/bsp/stm32/stm32l432-st-nucleo/Kconfig @@ -1,16 +1,16 @@ mainmenu "RT-Thread Configuration" -config $BSP_DIR +config BSP_DIR string option env="BSP_ROOT" default "." -config $RTT_DIR +config RTT_DIR string option env="RTT_ROOT" default "../../.." -config $PKGS_DIR +config PKGS_DIR string option env="PKGS_ROOT" default "packages" diff --git a/components/drivers/Kconfig b/components/drivers/Kconfig index d8dc5e7458..6d45e44cfd 100755 --- a/components/drivers/Kconfig +++ b/components/drivers/Kconfig @@ -20,7 +20,12 @@ if RT_USING_SERIAL config RT_SERIAL_USING_DMA bool "Enable serial DMA mode" default y -endif + + config RT_SERIAL_RB_BUFSZ + int "Set RX buffer size" + default 64 + +endif config RT_USING_CAN bool "Using CAN device drivers" @@ -120,6 +125,7 @@ config RT_USING_PM config RT_USING_RTC bool "Using RTC device drivers" + select RT_USING_LIBC default n if RT_USING_RTC From c974949cee7337a4b63bc20e4366fe3bda35c4d2 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Wed, 30 Jan 2019 09:24:47 +0800 Subject: [PATCH 2/2] Update Kconfig --- components/drivers/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/drivers/Kconfig b/components/drivers/Kconfig index 6d45e44cfd..8f66738260 100755 --- a/components/drivers/Kconfig +++ b/components/drivers/Kconfig @@ -22,8 +22,8 @@ if RT_USING_SERIAL default y config RT_SERIAL_RB_BUFSZ - int "Set RX buffer size" - default 64 + int "Set RX buffer size" + default 64 endif @@ -241,8 +241,8 @@ config RT_USING_AUDIO menu "Using WiFi" config RT_USING_WIFI - bool "Using Wi-Fi framework" - default n + bool "Using Wi-Fi framework" + default n if RT_USING_WIFI config RT_WLAN_DEVICE_STA_NAME