From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tetsuyuki Kobayashi Date: Wed, 04 Jul 2012 17:25:21 +0900 Subject: [U-Boot] [RFC][PATCH v3] net: nfs: make NFS_TIMEOUT configurable In-Reply-To: <20120704054028.29DA9202270@gemini.denx.de> References: <4FE85B13.5080902@kmckk.co.jp> <20120625213437.6482C200358@gemini.denx.de> <4FE90756.30009@kmckk.co.jp> <4FE9711A.2090602@kmckk.co.jp> <20120626085259.BA38F2000D2@gemini.denx.de> <4FF2D5F9.7080808@kmckk.co.jp> <0010DB50-D36F-4227-8B83-994DAA6AB887@gmail.com> <2F369455-F060-42FC-AD13-DC72E4819C92@kmckk.co.jp> <4FF3AEC4.9050808@kmckk.co.jp> <20120704054028.29DA9202270@gemini.denx.de> Message-ID: <4FF3FDF1.2020509@kmckk.co.jp> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de NFS_TIMEOUT is constant value defined in net/nfs.c. But sometimes it needs to adjust. This patch enables to override NFS_TIMEOUT by defining CONFIG_NFS_TIMEOUT in a board specific config file. Signed-off-by: Tetsuyuki Kobayashi --- Changes for v2: - remove a wrong #error line Changes for v3: - add CONFIG_NFS_TIMEOUT after CONFIG_ARP_TIMEOUT in README file - align #ifndef - #else - #endif format as same as tftp.c README | 7 +++++++ net/nfs.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/README b/README index 67dc444..9a18a5c 100644 --- a/README +++ b/README @@ -2140,6 +2140,13 @@ The following options need to be configured: Timeout waiting for an ARP reply in milliseconds. + CONFIG_NFS_TIMEOUT + + Timeout in milliseconds used in NFS protocol. + If you encounter "ERROR: Cannot umount" in nfs command, + try longer timeout such as + #define CONFIG_NFS_TIMEOUT 10000UL + - Command Interpreter: CONFIG_AUTO_COMPLETE diff --git a/net/nfs.c b/net/nfs.c index 5b99763..7f2393f 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -31,7 +31,11 @@ #define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */ #define NFS_RETRY_COUNT 30 -#define NFS_TIMEOUT 2000UL +#ifndef CONFIG_NFS_TIMEOUT +# define NFS_TIMEOUT 2000UL +#else +# define NFS_TIMEOUT CONFIG_NFS_TIMEOUT +#endif static int fs_mounted; static unsigned long rpc_id; -- 1.7.9.5