diff options
| author | Bernard Xiong <[email protected]> | 2018-01-31 11:08:13 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-01-31 11:08:13 +0800 |
| commit | 7d967f282bb294b55d3df087167280c4ab6ead7f (patch) | |
| tree | 7de0443c51f010569477b3834faeeaef3c2b7297 /components | |
| parent | d5ddcb13e2d6fc9f4c13256ad5fed6598e56335c (diff) | |
| parent | 4793dc0d06afce6b1987604564c27fc8ea7dc431 (diff) | |
Merge pull request #1198 from armink/fix_netutils
[Net][NetUtils] Fix networking utils Kconfig and SConscript.
Diffstat (limited to 'components')
| -rw-r--r-- | components/net/Kconfig | 18 | ||||
| -rw-r--r-- | components/net/lwip-2.0.2/SConscript | 6 | ||||
| -rw-r--r-- | components/net/lwip-2.0.2/src/apps/SConscript | 13 |
3 files changed, 23 insertions, 14 deletions
diff --git a/components/net/Kconfig b/components/net/Kconfig index 282ea7e776..53f55c3c71 100644 --- a/components/net/Kconfig +++ b/components/net/Kconfig @@ -201,10 +201,26 @@ config LWIP_USING_DHCPD bool "Enable DHCP server" default n + +menu "Networking utilities" config RT_USING_NETUTILS - bool "Enable net utils" + bool "Enable networking utilities" default n + if RT_USING_NETUTILS + config RT_NETUTILS_USING_PING + bool "Enable Ping utility" + select RT_LWIP_ICMP + select RT_LWIP_RAW + default n + + config RT_NETUTILS_USING_TFTP + bool "Enable TFTP(Trivial File Transfer Protocol) utility" + default n + + endif +endmenu + endif endmenu diff --git a/components/net/lwip-2.0.2/SConscript b/components/net/lwip-2.0.2/SConscript index 58a25dc5e6..761681c57d 100644 --- a/components/net/lwip-2.0.2/SConscript +++ b/components/net/lwip-2.0.2/SConscript @@ -81,6 +81,12 @@ if GetDepend(['RT_LWIP_PPP']): if GetDepend(['RT_USING_LWIP_IPV6']): src += ipv6_src +if GetDepend(['RT_USING_NETUTILS']): + if GetDepend(['RT_NETUTILS_USING_TFTP']): + src += Glob('src/apps/tftp/*.c') + if GetDepend(['RT_NETUTILS_USING_PING']): + src += Glob('src/apps/ping/*.c') + group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP202'], CPPPATH = path) Return('group') diff --git a/components/net/lwip-2.0.2/src/apps/SConscript b/components/net/lwip-2.0.2/src/apps/SConscript deleted file mode 100644 index 2bc01cc16e..0000000000 --- a/components/net/lwip-2.0.2/src/apps/SConscript +++ /dev/null @@ -1,13 +0,0 @@ -from building import * - -cwd = GetCurrentDir() -src = Glob('tftp/*.c') - -if GetDepend(['RT_LWIP_ICMP', 'RT_LWIP_RAW']): - src += Glob('ping/*.c') - -CPPPATH = [cwd] - -group = DefineGroup('LwIP', src, depend = ['RT_USING_NETUTILS', 'RT_USING_LWIP202'], CPPPATH = CPPPATH) - -Return('group')
\ No newline at end of file |