From ae6ca7bb02c89c755487b6dbd565d3d204c00b1f Mon Sep 17 00:00:00 2001 From: bernard Date: Tue, 6 Jun 2017 18:18:44 +0800 Subject: [PATCH] KConfig cleanup. --- components/KConfig | 12 ++ components/drivers/KConfig | 114 +++++++++---------- components/net/KConfig | 218 +++++++++++++++++++++---------------- 3 files changed, 197 insertions(+), 147 deletions(-) diff --git a/components/KConfig b/components/KConfig index 5747befe3a..0ec586b2be 100644 --- a/components/KConfig +++ b/components/KConfig @@ -1,5 +1,17 @@ menu "RT-Thread Components" +config RT_USING_COMPONENTS_INIT + bool "Use components automatically initialization" + default y + +if RT_USING_COMPONENTS_INIT + config RT_USING_USER_MAIN + bool "The main() function as user entry function" + default y +endif + +source "$RTT_DIR/components/cplusplus/KConfig" + source "$RTT_DIR/components/finsh/KConfig" source "$RTT_DIR/components/dfs/KConfig" diff --git a/components/drivers/KConfig b/components/drivers/KConfig index b72d7d7162..7679ea4493 100644 --- a/components/drivers/KConfig +++ b/components/drivers/KConfig @@ -1,90 +1,94 @@ menu "Device Drivers" +config RT_USING_DEVICE_IPC + bool "Using device drivers IPC" + default y + config RT_USING_SERIAL - bool "Using serial device drivers" - default y + bool "Using serial device drivers" + default y config RT_USING_CAN - bool "Using CAN device drivers" - default n + bool "Using CAN device drivers" + default n config RT_USING_HWTIMER - bool "Using hardware timer device drivers" - default n + bool "Using hardware timer device drivers" + default n config RT_USING_I2C - bool "Using I2C device drivers" - default n + bool "Using I2C device drivers" + default n config RT_USING_PIN - bool "Using generic GPIO device drivers" - default y + bool "Using generic GPIO device drivers" + default y config RT_USING_MTD_NOR - bool "Using MTD Nor Flash device drivers" - default n + bool "Using MTD Nor Flash device drivers" + default n config RT_USING_MTD_NAND - bool "Using MTD Nand Flash device drivers" - default n + bool "Using MTD Nand Flash device drivers" + default n config RT_USING_RTC - bool "Using RTC device drivers" - default n + bool "Using RTC device drivers" + default n config RT_USING_SDIO - bool "Using SD/MMC device drivers" - default n + bool "Using SD/MMC device drivers" + default n config RT_USING_SPI - bool "Using SPI Bus/Device device drivers" - default n + bool "Using SPI Bus/Device device drivers" + default n - if RT_USING_SPI - config RT_USING_W25QXX - bool "Using W25QXX SPI NorFlash" - default n + if RT_USING_SPI + config RT_USING_W25QXX + bool "Using W25QXX SPI NorFlash" + default n - config RT_USING_GD - bool "Using GD SPI NorFlash" - default n + config RT_USING_GD + bool "Using GD SPI NorFlash" + default n - config RT_USING_ENC28J60 - bool "Using ENC28J60 SPI Ethernet network interface" - select RT_USING_LWIP - default n + config RT_USING_ENC28J60 + bool "Using ENC28J60 SPI Ethernet network interface" + select RT_USING_LWIP + default n - config RT_USING_SPI_WIFI - bool "Using RW009/007 SPI Wi-Fi wireless interface" - select RT_USING_LWIP - default n - endif + config RT_USING_SPI_WIFI + bool "Using RW009/007 SPI Wi-Fi wireless interface" + select RT_USING_LWIP + default n + endif config RT_USING_WDT - bool "Using Watch Dog device drivers" - default n + bool "Using Watch Dog device drivers" + default n config RT_USING_USB_HOST - bool "Using USB host" - default n + bool "Using USB host" + default n - if RT_USING_USB_HOST - config RT_USBH_ADK - bool "Enable connected with Android by ADK USB" - default n - endif + if RT_USING_USB_HOST + config RT_USBH_ADK + bool "Enable connected with Android by ADK USB" + default n + endif config RT_USING_USB_DEVICE - bool "Using USB device" - default n + bool "Using USB device" + default n - if RT_USING_USB_DEVICE - config RT_USB_DEVICE_CDC - bool "Enable to use device as CDC device" - default n + if RT_USING_USB_DEVICE + config RT_USB_DEVICE_CDC + bool "Enable to use device as CDC device" + default n - config RT_USB_DEVICE_MSTORAGE - bool "Enable to use device as Mass Storage device" - default n - endif + config RT_USB_DEVICE_MSTORAGE + bool "Enable to use device as Mass Storage device" + default n + endif endmenu diff --git a/components/net/KConfig b/components/net/KConfig index 0f2b2d794d..0154d0e7f1 100644 --- a/components/net/KConfig +++ b/components/net/KConfig @@ -2,126 +2,160 @@ menu "Network stack" menu "light weight TCP/IP stack" config RT_USING_LWIP - bool "Enable lwIP stack" - default n + bool "Enable lwIP stack" + default n - if RT_USING_LWIP - choice - prompt "lwIP version" - default RT_USING_LWIP141 - help - Select the lwIP version + if RT_USING_LWIP + choice + prompt "lwIP version" + default RT_USING_LWIP141 + help + Select the lwIP version - config RT_USING_LWIP141 - bool "lwIP v1.4.1" + config RT_USING_LWIP141 + bool "lwIP v1.4.1" - config RT_USING_LWIP200 - bool "lwIP v2.0.0" + config RT_USING_LWIP200 + bool "lwIP v2.0.0" - config RT_USING_LWIP202 - bool "lwIP v2.0.2" - endchoice + config RT_USING_LWIP202 + bool "lwIP v2.0.2" + endchoice - config RT_LWIP_IGMP - bool "IGMP protocol" - default n + config RT_LWIP_IGMP + bool "IGMP protocol" + default n - config RT_LWIP_ICMP - bool "ICMP protocol" - default y + config RT_LWIP_ICMP + bool "ICMP protocol" + default y - config RT_LWIP_SNMP - bool "SNMP protocol" - default n + config RT_LWIP_SNMP + bool "SNMP protocol" + default n - config RT_LWIP_DNS - bool "Enble DNS for name resolution" - select RT_LWIP_UDP - default y + config RT_LWIP_DNS + bool "Enble DNS for name resolution" + select RT_LWIP_UDP + default y - config RT_LWIP_DHCP - bool "Enable alloc ip address through DHCP" - select RT_LWIP_UDP - default y + config RT_LWIP_DHCP + bool "Enable alloc ip address through DHCP" + select RT_LWIP_UDP + default y - config RT_LWIP_UDP - bool "UDP protocol" - default y + if RT_LWIP_DHCP + config IP_SOF_BROADCAST + int "SOF broadcast" + default 1 + + config IP_SOF_BROADCAST_RECV + int "SOF broadcast recv" + default 1 - config RT_LWIP_TCP - bool "TCP protocol" - default y + config LWIP_USING_DHCPD + bool "Enable DHCP server" + default y + endif - config RT_LWIP_PPP - bool "PPP protocol" - default n + config RT_LWIP_UDP + bool "UDP protocol" + default y - config RT_LWIP_PPPOE - bool "PPPoE protocol" - default n + config RT_LWIP_TCP + bool "TCP protocol" + default y - config RT_LWIP_PPPOS - bool "PPPoS protocol" - default n + config RT_LWIP_PPP + bool "PPP protocol" + default n - config RT_LWIP_RAW_PCB_NUM - int "the number of raw connection" - default 4 + config RT_LWIP_PPPOE + bool "PPPoE protocol" + default n - config RT_LWIP_UDP_PCB_NUM - int "the number of UDP socket" - default 4 + config RT_LWIP_PPPOS + bool "PPPoS protocol" + default n - if RT_LWIP_TCP - config RT_LWIP_TCP_PCB_NUM - int "the number of TCP socket" - default 4 + config RT_LWIP_PBUF_NUM + int "the number of PBUF" + default 16 - config RT_LWIP_TCP_SEG_NUM - int "the number of TCP segment" - default 4 + config RT_LWIP_RAW_PCB_NUM + int "the number of raw connection" + default 4 - config RT_LWIP_TCP_SND_BUF - int "the size of send buffer" - default 8196 + config RT_LWIP_UDP_PCB_NUM + int "the number of UDP socket" + default 4 - config RT_LWIP_TCP_WND - int "the size of TCP send window" - default 8196 - endif + if RT_LWIP_TCP + config RT_LWIP_TCP_PCB_NUM + int "the number of TCP socket" + default 4 - config RT_LWIP_TCPTHREAD_PRIORITY - int "the priority level value of lwIP thread" - default 10 + config RT_LWIP_TCP_SEG_NUM + int "the number of TCP segment" + default 40 - config RT_LWIP_TCPTHREAD_MBOX_SIZE - int "the number of mail in the lwIP thread mailbox" - default 8 + config RT_LWIP_TCP_SND_BUF + int "the size of send buffer" + default 8196 - config RT_LWIP_TCPTHREAD_STACKSIZE - int "the stack size of lwIP thread" - default 1024 + config RT_LWIP_TCP_WND + int "the size of TCP send window" + default 8196 + endif - config RT_LWIP_REASSEMBLY_FRAG - bool "Enable IP reassembly and frag" - default n + config RT_LWIP_TCPTHREAD_PRIORITY + int "the priority level value of lwIP thread" + default 10 - config SO_REUSE - bool "Enable SO_REUSEADDR option" - default n + config RT_LWIP_TCPTHREAD_MBOX_SIZE + int "the number of mail in the lwIP thread mailbox" + default 8 - config LWIP_SO_RCVTIMEO - bool "Enable receive timeout for sockets/netconns and SO_RCVTIMEO processing." - default n + config RT_LWIP_TCPTHREAD_STACKSIZE + int "the stack size of lwIP thread" + default 1024 - config LWIP_SO_SNDTIMEO - bool "Enable send timeout for sockets/netconns and SO_SNDTIMEO processing." - default n + config RT_LWIP_ETHTHREAD_PRIORITY + int "the priority level value of ethernet thread" + default 12 + + config RT_LWIP_ETHTHREAD_STACKSIZE + int "the stack size of ethernet thread" + default 1024 + + config RT_LWIP_ETHTHREAD_MBOX_SIZE + int "the number of mail in the ethernet thread mailbox" + default 8 - config LWIP_SO_RCVBUF - bool "Enable SO_RCVBUF processing" - default n - endif + config RT_LWIP_REASSEMBLY_FRAG + bool "Enable IP reassembly and frag" + default n + + config LWIP_NETIF_STATUS_CALLBACK + int "netif status callback" + default 1 + + config SO_REUSE + int "Enable SO_REUSEADDR option" + default 1 + + config LWIP_SO_RCVTIMEO + int "Enable receive timeout for sockets/netconns and SO_RCVTIMEO processing." + default 1 + + config LWIP_SO_SNDTIMEO + int "Enable send timeout for sockets/netconns and SO_SNDTIMEO processing." + default 1 + + config LWIP_SO_RCVBUF + int "Enable SO_RCVBUF processing" + default 1 + endif endmenu