diff options
| -rw-r--r-- | apps/nshlib/Kconfig | 41 | ||||
| -rw-r--r-- | apps/nshlib/nsh_romfsetc.c | 4 | ||||
| -rw-r--r-- | nuttx/fs/mqueue/mqueue.h | 2 |
3 files changed, 40 insertions, 7 deletions
diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig index 0add860d6..ba9c718b4 100644 --- a/apps/nshlib/Kconfig +++ b/apps/nshlib/Kconfig @@ -529,14 +529,45 @@ config NSH_ROMFSSECTSIZE increased if the ROMFS volume were to be become large. Any value selected must be a power of 2. +choice + prompt "ROMFS header location" + default NSH_DEFAULTROMFS + +config NSH_DEFAULTROMFS + bool "Default ROMFS header path" + ---help--- + Selects the default header located in the source directory of the + NSH library. + config NSH_ARCHROMFS - bool "Architecture-specific ROMFS header" - default n + bool "Architecture-specific ROMFS path" ---help--- Enable this option to provide an architecture-specific ROMFS - header at <arch/board/nsh_romfsimg.h>. Note that this header - will be copied from nuttx/configs/<boardname>/include and should - be stored at this location. + header at arch/<boardname>/nsh_romfsimg.h. Note that this header + will be linked (or copied) from nuttx/configs/<boardname>/include + and should be stored at that location in the nuttx configs/ + sub-directory. + +config NSH_CUSTOMROMFS + bool "Custom ROMFS header path" + ---help--- + Enable this option to provide a custom ROMFS header. The path to + the header file can be specified in the option "Custom ROMFS header + file". + +endchoice + +if NSH_CUSTOMROMFS + +config NSH_CUSTOMROMFS_HEADER + string "Custom ROMFS header file path" + default "" + ---help--- + Specifies the path to the custom ROMFS header file. This must be + either a full path or a path relative to one of the include file + search paths provided in your CFLAGS. + +endif #NSH_CUSTOMROMFS config NSH_FATDEVNO int "FAT block device minor number" diff --git a/apps/nshlib/nsh_romfsetc.c b/apps/nshlib/nsh_romfsetc.c index 6f538b4c5..eba60af92 100644 --- a/apps/nshlib/nsh_romfsetc.c +++ b/apps/nshlib/nsh_romfsetc.c @@ -55,7 +55,9 @@ #ifdef CONFIG_NSH_ARCHROMFS # include <arch/board/nsh_romfsimg.h> -#else +#elif defined(CONFIG_NSH_CUSTOMROMFS) +# include CONFIG_NSH_CUSTOMROMFS_HEADER +#else /* if defined(CONFIG_NSH_DEFAULTROMFS) */ # include "nsh_romfsimg.h" #endif diff --git a/nuttx/fs/mqueue/mqueue.h b/nuttx/fs/mqueue/mqueue.h index bcea7ecce..775ff220e 100644 --- a/nuttx/fs/mqueue/mqueue.h +++ b/nuttx/fs/mqueue/mqueue.h @@ -76,7 +76,7 @@ extern "C" ****************************************************************************/ /**************************************************************************** - * Name: mq_close + * Name: mq_inode_release * * Description: * Release a reference count on a message queue inode. |