From 3cefa437ddf0a06aecd772560294172f3d888580 Mon Sep 17 00:00:00 2001 From: SummerGift Date: Mon, 18 Dec 2017 15:42:23 +0800 Subject: [PATCH 1/2] [nfs]: optimize Kconfig file for nfs --- components/dfs/Kconfig | 19 +++++++++++-------- components/net/Kconfig | 1 + 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/components/dfs/Kconfig b/components/dfs/Kconfig index 91df96cb08..1654a2e6c4 100644 --- a/components/dfs/Kconfig +++ b/components/dfs/Kconfig @@ -10,19 +10,22 @@ if RT_USING_DFS config DFS_USING_WORKDIR bool "Using working directory" default y - + config DFS_FILESYSTEMS_MAX - int "The maximal number of mounted file system" - default 2 - + int "The maximal number of mounted file system" + default 4 if RT_USING_DFS_NFS + default 2 + config DFS_FILESYSTEM_TYPES_MAX int "The maximal number of file system type" - default 2 - + default 4 if RT_USING_DFS_NFS + default 2 + config DFS_FD_MAX int "The maximal number of opened files" + default 16 if RT_USING_DFS_NFS default 4 - + config RT_USING_DFS_ELMFAT bool "Enable elm-chan fatfs" default y @@ -156,7 +159,7 @@ if RT_USING_DFS config RT_USING_DFS_NFS bool "Using NFS v3 client file system" - depends on RT_USING_LWIP + select RT_USING_LWIP default n if RT_USING_DFS_NFS diff --git a/components/net/Kconfig b/components/net/Kconfig index af375e6c03..c87ac93294 100644 --- a/components/net/Kconfig +++ b/components/net/Kconfig @@ -111,6 +111,7 @@ config RT_USING_LWIP config RT_LWIP_UDP_PCB_NUM int "the number of UDP socket" + default 8 if RT_USING_DFS_NFS default 4 if RT_LWIP_TCP From 2d0f18f41f783d95d421603dcb4d3e2a4964802e Mon Sep 17 00:00:00 2001 From: SummerGift Date: Mon, 18 Dec 2017 15:47:30 +0800 Subject: [PATCH 2/2] [nfs]: optimize Kconfig file for nfs --- components/dfs/Kconfig | 24 ++++++++++++------------ components/net/Kconfig | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/components/dfs/Kconfig b/components/dfs/Kconfig index 1654a2e6c4..ec9985e21c 100644 --- a/components/dfs/Kconfig +++ b/components/dfs/Kconfig @@ -10,22 +10,22 @@ if RT_USING_DFS config DFS_USING_WORKDIR bool "Using working directory" default y - + config DFS_FILESYSTEMS_MAX int "The maximal number of mounted file system" default 4 if RT_USING_DFS_NFS default 2 - + config DFS_FILESYSTEM_TYPES_MAX int "The maximal number of file system type" default 4 if RT_USING_DFS_NFS default 2 - + config DFS_FD_MAX int "The maximal number of opened files" default 16 if RT_USING_DFS_NFS default 4 - + config RT_USING_DFS_ELMFAT bool "Enable elm-chan fatfs" default y @@ -54,18 +54,18 @@ if RT_USING_DFS config RT_DFS_ELM_USE_LFN_2 bool "2: LFN with dynamic LFN working buffer on the stack" - + config RT_DFS_ELM_USE_LFN_3 bool "3: LFN with dynamic LFN working buffer on the heap" endchoice - + config RT_DFS_ELM_USE_LFN int default 0 if RT_DFS_ELM_USE_LFN_0 default 1 if RT_DFS_ELM_USE_LFN_1 default 2 if RT_DFS_ELM_USE_LFN_2 default 3 if RT_DFS_ELM_USE_LFN_3 - + config RT_DFS_ELM_MAX_LFN int "Maximal size of file name length" range 12 255 @@ -84,7 +84,7 @@ if RT_USING_DFS config RT_DFS_ELM_USE_ERASE bool "Enable sector erase feature" default n - + config RT_DFS_ELM_REENTRANT bool "Enable the reentrancy (thread safe) of the FatFs module" default y @@ -94,7 +94,7 @@ if RT_USING_DFS config RT_USING_DFS_DEVFS bool "Using devfs for device objects" default y - + config RT_USING_DFS_NET bool "Enable BSD socket operated by file system API" select RT_USING_LWIP @@ -143,18 +143,18 @@ if RT_USING_DFS config RT_UFFS_ECC_MODE_2 bool "2: Flash driver(or by hardware) calculate the ECC" - + config RT_UFFS_ECC_MODE_3 bool "3: Hardware calculate the ECC and automatically write to spare." endchoice - + config RT_UFFS_ECC_MODE int default 0 if RT_UFFS_ECC_MODE_0 default 1 if RT_UFFS_ECC_MODE_1 default 2 if RT_UFFS_ECC_MODE_2 default 3 if RT_UFFS_ECC_MODE_3 - + endif config RT_USING_DFS_NFS diff --git a/components/net/Kconfig b/components/net/Kconfig index c87ac93294..eaa78cd941 100644 --- a/components/net/Kconfig +++ b/components/net/Kconfig @@ -91,12 +91,12 @@ config RT_USING_LWIP config RT_LWIP_PPPOE bool "PPPoE protocol" default n - + config RT_LWIP_PPPOS bool "PPPoS protocol" default n endif - + config RT_MEMP_NUM_NETCONN int "the number of struct netconns" default 8