Add support for a custom NSH ROMFS startup image header file location. From Martin Lederhilger

This commit is contained in:
Gregory Nutt 2014-09-30 06:43:49 -06:00
parent 048d410258
commit f856424ce6
2 changed files with 39 additions and 6 deletions

View File

@ -529,14 +529,45 @@ config NSH_ROMFSSECTSIZE
increased if the ROMFS volume were to be become large. Any value increased if the ROMFS volume were to be become large. Any value
selected must be a power of 2. 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 config NSH_ARCHROMFS
bool "Architecture-specific ROMFS header" bool "Architecture-specific ROMFS path"
default n
---help--- ---help---
Enable this option to provide an architecture-specific ROMFS Enable this option to provide an architecture-specific ROMFS
header at <arch/board/nsh_romfsimg.h>. Note that this header header at arch/<boardname>/nsh_romfsimg.h. Note that this header
will be copied from nuttx/configs/<boardname>/include and should will be linked (or copied) from nuttx/configs/<boardname>/include
be stored at this location. 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 config NSH_FATDEVNO
int "FAT block device minor number" int "FAT block device minor number"

View File

@ -55,7 +55,9 @@
#ifdef CONFIG_NSH_ARCHROMFS #ifdef CONFIG_NSH_ARCHROMFS
# include <arch/board/nsh_romfsimg.h> # 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" # include "nsh_romfsimg.h"
#endif #endif