diff options
| author | Rbb666 <[email protected]> | 2022-03-14 14:28:42 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-03-14 14:28:42 +0800 |
| commit | 8505d91586871329aca586eaeaa5fc2d0bb092ca (patch) | |
| tree | 936b5854fa7bdd757a70fd9bf057df88b48c1d10 /components | |
| parent | 01ed2e7d11e81ed31ba63229ab957be230457f9f (diff) | |
| parent | 46d09e045eb767bf59452dd02dec93c65d30d345 (diff) | |
Merge branch 'RT-Thread:master' into master
Diffstat (limited to 'components')
| -rw-r--r-- | components/finsh/cmd.c | 32 | ||||
| -rw-r--r-- | components/net/lwip/Kconfig | 14 |
2 files changed, 14 insertions, 32 deletions
diff --git a/components/finsh/cmd.c b/components/finsh/cmd.c index 215300f20d..8fd03e3126 100644 --- a/components/finsh/cmd.c +++ b/components/finsh/cmd.c @@ -40,14 +40,6 @@ #define LIST_FIND_OBJ_NR 8 -long hello(void) -{ - rt_kprintf("Hello RT-Thread!\n"); - - return 0; -} -MSH_CMD_EXPORT(hello, say hello world); - static long clear(void) { rt_kprintf("\x1b[2J\x1b[H"); @@ -886,28 +878,4 @@ long list_device(void) MSH_CMD_EXPORT(list_device, list device in system); #endif -long list(void) -{ - rt_kprintf("--Commands List:\n"); - { - struct finsh_syscall *index; - for (index = _syscall_table_begin; - index < _syscall_table_end; - FINSH_NEXT_SYSCALL(index)) - { - /* skip the internal command */ - if (strncmp((char *)index->name, "__", 2) == 0) continue; - -#if defined(FINSH_USING_DESCRIPTION) && defined(FINSH_USING_SYMTAB) - rt_kprintf("%-16s -- %s\n", index->name, index->desc); -#else - rt_kprintf("%s\n", index->name); -#endif - } - } - - return 0; -} -MSH_CMD_EXPORT(list, list all commands in system) - #endif /* RT_USING_FINSH */ diff --git a/components/net/lwip/Kconfig b/components/net/lwip/Kconfig index 2566870d6e..42b48f4413 100644 --- a/components/net/lwip/Kconfig +++ b/components/net/lwip/Kconfig @@ -5,6 +5,13 @@ menuconfig RT_USING_LWIP default n if RT_USING_LWIP + config RT_USING_LWIP_LOCAL_VERSION + bool "Use LwIP local version only" + default n + help + If don't select this option, both local version and upstream + version can be selected. If select this option, only local version + can be selected. choice prompt "lwIP version" default RT_USING_LWIP203 @@ -20,10 +27,17 @@ if RT_USING_LWIP config RT_USING_LWIP212 bool "lwIP v2.1.2" + # online version + if !RT_USING_LWIP_LOCAL_VERSION + config RT_USING_LWIP_LATEST + bool "lwIP latest" + select PKG_USING_LWIP + endif endchoice config RT_USING_LWIP_VER_NUM hex + default 0x99999 if RT_USING_LWIP_LATEST default 0x20102 if RT_USING_LWIP212 default 0x20003 if RT_USING_LWIP203 default 0x10401 if RT_USING_LWIP141 |