diff options
Diffstat (limited to 'nuttx/configs/vsn')
| -rwxr-xr-x | nuttx/configs/vsn/nsh/appconfig | 36 | ||||
| -rwxr-xr-x | nuttx/configs/vsn/nsh/defconfig | 122 | ||||
| -rw-r--r-- | nuttx/configs/vsn/src/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/configs/vsn/src/nsh.c | 4 | ||||
| -rw-r--r-- | nuttx/configs/vsn/src/sdcard.c | 26 |
5 files changed, 110 insertions, 80 deletions
diff --git a/nuttx/configs/vsn/nsh/appconfig b/nuttx/configs/vsn/nsh/appconfig index d946c07a3..65e8c220f 100755 --- a/nuttx/configs/vsn/nsh/appconfig +++ b/nuttx/configs/vsn/nsh/appconfig @@ -35,8 +35,38 @@ # ############################################################################ -# Add the list of built-in apps needed by this configuration +######################################################################## +# +# Applications to be included within the NuttX binary as described +# under the apps/README.txt +# +# Set thi config parameter above to: CONFIG_TASK_NAME_SIZE=16 +# In order to enable argv[0]=<task name> argument set the option +# CONFIG_TASK_NAME_SIZE=16 +# + +# Invoke the following application after NuttX starts +#CONFIG_BUILTIN_APP_START="hello" + +# Application Libraries +CONFIGURED_APPS += nshlib/.built_always + +# Individual selection of built-in applications: + +# Hello world provide a simple skeleton/demo application +CONFIGURED_APPS += hello/.built_always + +# Provide poweroff command to switch off the board +CONFIGURED_APPS += poweroff/.built_always + +# Provide SDcard tool +CONFIGURED_APPS += sdcard/.built_always + +# Provide RAMTRON tool +CONFIGURED_APPS += ramtron/.built_always -CONFIGURED_APPS += hello/.built_always poweroff/.built_always \ - sdcard/.built_always ramtron/.built_always nshlib/.built_always +# Provide UNIX style free +CONFIGURED_APPS += free/.built_always +# Provide JAVA Virtual Machine (the Darjeeling JVM) +#CONFIGURED_APPS += jvm/.built_always diff --git a/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig index f73401372..1e5f34c2f 100755 --- a/nuttx/configs/vsn/nsh/defconfig +++ b/nuttx/configs/vsn/nsh/defconfig @@ -704,76 +704,76 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # -# Settings for examples/nsh -# -# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer -# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno) -# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line -# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads. -# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi -# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support -# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands -# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc -# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end -# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end -# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture +# Settings for apps/nshlib +# +# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer +# CONFIG_NSH_STRERROR - Use strerror(errno) +# CONFIG_NSH_LINELEN - Maximum length of one command line +# CONFIG_NSH_STACKSIZE - Stack size to use for new threads. +# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi +# CONFIG_NSH_DISABLESCRIPT - Disable scripting support +# CONFIG_NSH_DISABLEBG - Disable background commands +# CONFIG_NSH_ROMFSETC - Use startup script in /etc +# CONFIG_NSH_CONSOLE - Use serial console front end +# CONFIG_NSH_TELNET - Use telnetd console front end +# CONFIG_NSH_ARCHINIT - Platform provides architecture # specific initialization (nsh_archinitialize()). # -# If CONFIG_EXAMPLES_NSH_TELNET is selected: -# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size -# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP -# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address -# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address -# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask -# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address +# If CONFIG_NSH_TELNET is selected: +# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size +# CONFIG_NSH_DHCPC - Obtain address using DHCP +# CONFIG_NSH_IPADDR - Provides static IP address +# CONFIG_NSH_DRIPADDR - Provides static router IP address +# CONFIG_NSH_NETMASK - Provides static network mask +# CONFIG_NSH_NOMAC - Use a bogus MAC address # -# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected: -# CONFIG_EXAMPLES_NSH_ARCHROMFS - May be defined to specify an alternative +# If CONFIG_NSH_ROMFSETC is selected: +# CONFIG_NSH_ARCHROMFS - May be defined to specify an alternative # ROMFS image that can be found at configs/<board>/include/nsh_romfsimg.h. -# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint -# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script -# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor -# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size -# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor -# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size -# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors -# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint -# -CONFIG_EXAMPLES_NSH_BUILTIN_APPS=y -CONFIG_EXAMPLES_NSH_FILEIOSIZE=512 -CONFIG_EXAMPLES_NSH_STRERROR=n -CONFIG_EXAMPLES_NSH_LINELEN=64 -CONFIG_EXAMPLES_NSH_STACKSIZE=2048 -CONFIG_EXAMPLES_NSH_NESTDEPTH=3 -CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n -CONFIG_EXAMPLES_NSH_DISABLEBG=n -CONFIG_EXAMPLES_NSH_ROMFSETC=y -CONFIG_EXAMPLES_NSH_CONSOLE=y -CONFIG_EXAMPLES_NSH_TELNET=n -CONFIG_EXAMPLES_NSH_ARCHINIT=y -CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512 -CONFIG_EXAMPLES_NSH_DHCPC=n -CONFIG_EXAMPLES_NSH_NOMAC=n -CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2) -CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) -CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLES_NSH_ARCHROMFS=y -CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc" -CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS" -CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0 -CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64 -CONFIG_EXAMPLES_NSH_FATDEVNO=1 -CONFIG_EXAMPLES_NSH_FATSECTSIZE=512 -CONFIG_EXAMPLES_NSH_FATNSECTORS=40 -CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp +# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint +# CONFIG_NSH_INITSCRIPT - Relative path to init script +# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor +# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size +# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor +# CONFIG_NSH_FATSECTSIZE - FAT FS sector size +# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors +# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint +# +CONFIG_NSH_BUILTIN_APPS=y +CONFIG_NSH_FILEIOSIZE=512 +CONFIG_NSH_STRERROR=n +CONFIG_NSH_LINELEN=64 +CONFIG_NSH_STACKSIZE=2048 +CONFIG_NSH_NESTDEPTH=3 +CONFIG_NSH_DISABLESCRIPT=n +CONFIG_NSH_DISABLEBG=n +CONFIG_NSH_ROMFSETC=y +CONFIG_NSH_CONSOLE=y +CONFIG_NSH_TELNET=n +CONFIG_NSH_ARCHINIT=y +CONFIG_NSH_IOBUFFER_SIZE=512 +CONFIG_NSH_DHCPC=n +CONFIG_NSH_NOMAC=n +CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2) +CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1) +CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0) +CONFIG_NSH_ARCHROMFS=y +CONFIG_NSH_ROMFSMOUNTPT="/etc" +CONFIG_NSH_INITSCRIPT="init.d/rcS" +CONFIG_NSH_ROMFSDEVNO=0 +CONFIG_NSH_ROMFSSECTSIZE=64 +CONFIG_NSH_FATDEVNO=1 +CONFIG_NSH_FATSECTSIZE=512 +CONFIG_NSH_FATNSECTORS=40 +CONFIG_NSH_FATMOUNTPT=/tmp # # Architecture-specific NSH options # -CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0 -CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0 -CONFIG_EXAMPLES_NSH_MMCSDMINOR=0 +CONFIG_NSH_MMCSDSPIPORTNO=0 +CONFIG_NSH_MMCSDSLOTNO=0 +CONFIG_NSH_MMCSDMINOR=0 # # Settings for examples/usbserial diff --git a/nuttx/configs/vsn/src/Makefile b/nuttx/configs/vsn/src/Makefile index f12a8bcef..6e55c30ca 100644 --- a/nuttx/configs/vsn/src/Makefile +++ b/nuttx/configs/vsn/src/Makefile @@ -46,7 +46,7 @@ AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = sysclock.c boot.c leds.c buttons.c spi.c \ usbdev.c power.c -ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y) +ifeq ($(CONFIG_NSH_ARCHINIT),y) CSRCS += nsh.c endif ifeq ($(CONFIG_APP_DIR),examples/usbstorage) diff --git a/nuttx/configs/vsn/src/nsh.c b/nuttx/configs/vsn/src/nsh.c index d29368833..c4e691ba9 100644 --- a/nuttx/configs/vsn/src/nsh.c +++ b/nuttx/configs/vsn/src/nsh.c @@ -58,12 +58,12 @@ /* PORT and SLOT number probably depend on the board configuration */ -#define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1 +#define CONFIG_NSH_HAVEUSBDEV 1 /* Can't support USB features if USB is not enabled */ #ifndef CONFIG_USBDEV -# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV +# undef CONFIG_NSH_HAVEUSBDEV #endif diff --git a/nuttx/configs/vsn/src/sdcard.c b/nuttx/configs/vsn/src/sdcard.c index 367e4150b..af36062dd 100644 --- a/nuttx/configs/vsn/src/sdcard.c +++ b/nuttx/configs/vsn/src/sdcard.c @@ -52,13 +52,13 @@ #include "vsn.h" -#define CONFIG_EXAMPLES_NSH_HAVEMMCSD 1 -#if defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) && CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0 +#define CONFIG_NSH_HAVEMMCSD 1 +#if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 # error "Only one MMC/SD slot" -# undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO +# undef CONFIG_NSH_MMCSDSLOTNO #endif -#ifndef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO -# define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0 +#ifndef CONFIG_NSH_MMCSDSLOTNO +# define CONFIG_NSH_MMCSDSLOTNO 0 #endif /* Can't support MMC/SD features if mountpoints are disabled or if SDIO support @@ -66,11 +66,11 @@ */ #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_STM32_SDIO) -# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD +# undef CONFIG_NSH_HAVEMMCSD #endif -#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR -# define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0 +#ifndef CONFIG_NSH_MMCSDMINOR +# define CONFIG_NSH_MMCSDMINOR 0 #endif @@ -79,24 +79,24 @@ int up_sdcard(void) { /* Mount the SDIO-based MMC/SD block driver */ -#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD +#ifdef CONFIG_NSH_HAVEMMCSD FAR struct sdio_dev_s *sdio; int ret; /* First, get an instance of the SDIO interface */ - sdio = sdio_initialize(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); + sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO); if (!sdio) { - message("SDIO: Failed to initialize slot %d\n", CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); + message("SDIO: Failed to initialize slot %d\n", CONFIG_NSH_MMCSDSLOTNO); return -ENODEV; } - message("SDIO: Initialized slot %d\n", CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); + message("SDIO: Initialized slot %d\n", CONFIG_NSH_MMCSDSLOTNO); /* Now bind the SPI interface to the MMC/SD driver */ - ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, sdio); + ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio); if (ret != OK) { message("SDIO: Failed to bind to the MMC/SD driver: %d\n", ret); |