From dacf833f9af5137dcad044152b8c75e56ddd0e79 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 18 Mar 2011 20:35:31 +0000 Subject: Update documentation, change CONFIG_EXAMPLES_NSH to CONFIG_NSH git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3394 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/configs/sam3u-ek/nsh/defconfig | 118 ++++++++++++++++---------------- nuttx/configs/sam3u-ek/nx/defconfig | 118 ++++++++++++++++---------------- nuttx/configs/sam3u-ek/ostest/defconfig | 118 ++++++++++++++++---------------- nuttx/configs/sam3u-ek/src/Makefile | 2 +- nuttx/configs/sam3u-ek/src/up_nsh.c | 36 +++++----- 5 files changed, 196 insertions(+), 196 deletions(-) (limited to 'nuttx/configs/sam3u-ek') diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig index 61f49da6c..8b2cf20e3 100755 --- a/nuttx/configs/sam3u-ek/nsh/defconfig +++ b/nuttx/configs/sam3u-ek/nsh/defconfig @@ -743,71 +743,71 @@ 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_EXAMPLES_NSH_ROMFSETC is selected: -# 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_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=n -CONFIG_EXAMPLES_NSH_CONSOLE=y -CONFIG_EXAMPLES_NSH_TELNET=n -CONFIG_EXAMPLES_NSH_ARCHINIT=n -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_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=1024 -CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp +# 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_NSH_ROMFSETC is selected: +# 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_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=n +CONFIG_NSH_CONSOLE=y +CONFIG_NSH_TELNET=n +CONFIG_NSH_ARCHINIT=n +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_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=1024 +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/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig index 12ae973c8..42d2dc9b2 100755 --- a/nuttx/configs/sam3u-ek/nx/defconfig +++ b/nuttx/configs/sam3u-ek/nx/defconfig @@ -752,71 +752,71 @@ 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_EXAMPLES_NSH_ROMFSETC is selected: -# 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_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=n -CONFIG_EXAMPLES_NSH_CONSOLE=y -CONFIG_EXAMPLES_NSH_TELNET=n -CONFIG_EXAMPLES_NSH_ARCHINIT=n -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_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=1024 -CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp +# 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_NSH_ROMFSETC is selected: +# 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_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=n +CONFIG_NSH_CONSOLE=y +CONFIG_NSH_TELNET=n +CONFIG_NSH_ARCHINIT=n +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_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=1024 +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/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig index cdb31139f..1d5456a9a 100755 --- a/nuttx/configs/sam3u-ek/ostest/defconfig +++ b/nuttx/configs/sam3u-ek/ostest/defconfig @@ -741,71 +741,71 @@ 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_EXAMPLES_NSH_ROMFSETC is selected: -# 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_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=n -CONFIG_EXAMPLES_NSH_CONSOLE=y -CONFIG_EXAMPLES_NSH_TELNET=n -CONFIG_EXAMPLES_NSH_ARCHINIT=n -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_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=1024 -CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp +# 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_NSH_ROMFSETC is selected: +# 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_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=n +CONFIG_NSH_CONSOLE=y +CONFIG_NSH_TELNET=n +CONFIG_NSH_ARCHINIT=n +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_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=1024 +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/sam3u-ek/src/Makefile b/nuttx/configs/sam3u-ek/src/Makefile index c80b99c8f..9aa681b8b 100755 --- a/nuttx/configs/sam3u-ek/src/Makefile +++ b/nuttx/configs/sam3u-ek/src/Makefile @@ -41,7 +41,7 @@ ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c up_lcd.c -ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y) +ifeq ($(CONFIG_NSH_ARCHINIT),y) CSRCS += up_nsh.c endif ifeq ($(CONFIG_SAM3U_HSMCI),y) diff --git a/nuttx/configs/sam3u-ek/src/up_nsh.c b/nuttx/configs/sam3u-ek/src/up_nsh.c index cb3665f90..842d8b762 100755 --- a/nuttx/configs/sam3u-ek/src/up_nsh.c +++ b/nuttx/configs/sam3u-ek/src/up_nsh.c @@ -62,26 +62,26 @@ /* PORT and SLOT number probably depend on the board configuration */ #ifdef CONFIG_ARCH_BOARD_SAM3UEK -# define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1 -# define CONFIG_EXAMPLES_NSH_HAVEMMCSD 1 -# if defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) && CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0 +# define CONFIG_NSH_HAVEUSBDEV 1 +# 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 #else /* Add configuration for new SAM3U boards here */ # error "Unrecognized SAM3U board" -# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV -# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD +# undef CONFIG_NSH_HAVEUSBDEV +# undef CONFIG_NSH_HAVEMMCSD #endif /* Can't support USB features if USB is not enabled */ #ifndef CONFIG_USBDEV -# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV +# undef CONFIG_NSH_HAVEUSBDEV #endif /* Can't support MMC/SD features if mountpoints are disabled or if SDIO support @@ -89,11 +89,11 @@ */ #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAM3U_HSMCI) -# 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 /* Debug ********************************************************************/ @@ -126,7 +126,7 @@ int nsh_archinitialize(void) { -#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD +#ifdef CONFIG_NSH_HAVEMMCSD FAR struct sdio_dev_s *sdio; int ret; @@ -134,20 +134,20 @@ int nsh_archinitialize(void) /* First, get an instance of the SDIO interface */ message("nsh_archinitialize: Initializing SDIO slot %d\n", - CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); - sdio = sdio_initialize(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); + CONFIG_NSH_MMCSDSLOTNO); + sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO); if (!sdio) { message("nsh_archinitialize: Failed to initialize SDIO slot %d\n", - CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); + CONFIG_NSH_MMCSDSLOTNO); return -ENODEV; } /* Now bind the SDIO interface to the MMC/SD driver */ message("nsh_archinitialize: Bind SDIO to the MMC/SD driver, minor=%d\n", - CONFIG_EXAMPLES_NSH_MMCSDMINOR); - ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, sdio); + CONFIG_NSH_MMCSDMINOR); + ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio); if (ret != OK) { message("nsh_archinitialize: Failed to bind SDIO to the MMC/SD driver: %d\n", ret); -- cgit v1.2.3