You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gu...@apache.org on 2021/11/08 13:43:53 UTC
[incubator-nuttx-apps] branch master updated (6b7fe2a -> 991e491)
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from 6b7fe2a FOC Kconfig corrected
new 35e442d system/readline: Move READLINE_HAVE_EXTMATCH inside SYSTEM_READLINE section
new 991e491 nsh: Remove the duplicated NSH_MMCSDMINOR
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
nshlib/Kconfig | 24 ++++++++----------------
system/readline/Kconfig | 8 ++++----
2 files changed, 12 insertions(+), 20 deletions(-)
[incubator-nuttx-apps] 01/02: system/readline: Move
READLINE_HAVE_EXTMATCH inside SYSTEM_READLINE section
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 35e442d08c4a5080530b6cea2104841e9e076bee
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Nov 7 12:33:20 2021 +0800
system/readline: Move READLINE_HAVE_EXTMATCH inside SYSTEM_READLINE section
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
nshlib/Kconfig | 2 +-
system/readline/Kconfig | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 6d54c38..c45b6ff 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -11,7 +11,6 @@ config NSH_LIBRARY
default n
select NETUTILS_NETLIB if NET
select LIBC_NETDB if NET
- select READLINE_HAVE_EXTMATCH
select BOARDCTL if (!NSH_DISABLE_MKRD && !DISABLE_MOUNTPOINT) || NSH_ARCHINIT || NSH_ROMFSETC
select BOARDCTL_MKRD if !NSH_DISABLE_MKRD && !DISABLE_MOUNTPOINT
select BOARDCTL_ROMDISK if NSH_ROMFSETC
@@ -80,6 +79,7 @@ choice
config NSH_READLINE
bool "Minimal readline()"
select SYSTEM_READLINE
+ select READLINE_HAVE_EXTMATCH
---help---
Selects the minimal implementation of readline(). This minimal
implementation provides on backspace for command line editing.
diff --git a/system/readline/Kconfig b/system/readline/Kconfig
index 5a9411f..f088fdd 100644
--- a/system/readline/Kconfig
+++ b/system/readline/Kconfig
@@ -3,10 +3,6 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-config READLINE_HAVE_EXTMATCH
- bool
- default n
-
menuconfig SYSTEM_READLINE
bool "readline() Support"
default n
@@ -15,6 +11,10 @@ menuconfig SYSTEM_READLINE
if SYSTEM_READLINE
+config READLINE_HAVE_EXTMATCH
+ bool
+ default n
+
config READLINE_ECHO
bool "Echo character input"
default y
[incubator-nuttx-apps] 02/02: nsh: Remove the duplicated
NSH_MMCSDMINOR
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 991e491c94cd65309c90c6976251c17f0de8a0ac
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Nov 7 15:58:07 2021 +0800
nsh: Remove the duplicated NSH_MMCSDMINOR
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
nshlib/Kconfig | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index c45b6ff..fbdb78a 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -627,12 +627,14 @@ endmenu
if MMCSD
config NSH_MMCSDMINOR
- int "MMC/SD minor number"
+ int "MMC/SD minor device number"
default 0
---help---
- If board-specific NSH start-up logic needs to mount an MMC/SD device, then the
- setting should be provided to identify the MMC/SD minor device number (i.e., the N ini
- /dev/mmcsdN). Default 0
+ If the architecture supports an MMC/SD slot and if the NSH
+ architecture specific logic is present, this option will provide
+ the MMC/SD minor number, i.e., the MMC/SD block driver will
+ be registered as /dev/mmcsdN where N is the minor number.
+ Default is zero.
config NSH_MMCSDSLOTNO
int "MMC/SD slot number"
@@ -762,16 +764,6 @@ config NSH_DISABLE_LOOPS
endif # !NSH_DISABLESCRIPT
-config NSH_MMCSDMINOR
- int "MMC/SD minor device number"
- default 0
- ---help---
- If the architecture supports an MMC/SD slot and if the NSH
- architecture specific logic is present, this option will provide
- the MMC/SD minor number, i.e., the MMC/SD block driver will
- be registered as /dev/mmcsdN where N is the minor number.
- Default is zero.
-
config NSH_ROMFSETC
bool "Support ROMFS start-up script"
default n
@@ -786,7 +778,7 @@ if NSH_ROMFSETC
config NSH_CROMFSETC
bool "Support CROMFS (compressed) start-up script"
default n
- depends on NSH_ROMFSETC && FS_CROMFS
+ depends on FS_CROMFS
---help---
Mount a CROMFS filesystem at /etc and provide a compressed startup
script at /etc/init.d/rcS.