diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-08 13:24:26 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-08 13:24:26 +0000 |
commit | 9d4bbfeffeddf0b090f1931c9508e592b2cf7d48 (patch) | |
tree | bf179139a1b3fa182b794497945eab86b5479974 /nuttx/configs/mcu123-lpc214x | |
parent | 14d0a961ecf430c882eae8d7c7d66ba420c13403 (diff) | |
download | px4-nuttx-9d4bbfeffeddf0b090f1931c9508e592b2cf7d48.tar.gz px4-nuttx-9d4bbfeffeddf0b090f1931c9508e592b2cf7d48.tar.bz2 px4-nuttx-9d4bbfeffeddf0b090f1931c9508e592b2cf7d48.zip |
Move board specific files from examples/nsh to board source directories
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1861 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/mcu123-lpc214x')
-rw-r--r-- | nuttx/configs/mcu123-lpc214x/nsh/defconfig | 4 | ||||
-rw-r--r-- | nuttx/configs/mcu123-lpc214x/ostest/defconfig | 4 | ||||
-rw-r--r-- | nuttx/configs/mcu123-lpc214x/src/Makefile | 3 | ||||
-rw-r--r-- | nuttx/configs/mcu123-lpc214x/src/up_nsh.c | 160 | ||||
-rw-r--r-- | nuttx/configs/mcu123-lpc214x/src/up_spi.c | 1 | ||||
-rw-r--r-- | nuttx/configs/mcu123-lpc214x/usbserial/defconfig | 4 | ||||
-rw-r--r-- | nuttx/configs/mcu123-lpc214x/usbstorage/defconfig | 3 |
7 files changed, 179 insertions, 0 deletions
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig index c84aad6df..23366a1ea 100644 --- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig +++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig @@ -519,6 +519,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # 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 +# specific initialization (nsh_archinitialize()). # # If CONFIG_EXAMPLES_NSH_TELNET is selected: # CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size @@ -537,6 +539,7 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # 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 @@ -547,6 +550,7 @@ CONFIG_EXAMPLES_NSH_DISABLEBG=n CONFIG_EXAMPLES_NSH_ROMFSETC=n 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 diff --git a/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig index ad5da5d30..142023777 100644 --- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig +++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig @@ -505,6 +505,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # 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 +# specific initialization (nsh_archinitialize()). # # If CONFIG_EXAMPLES_NSH_TELNET is selected: # CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size @@ -523,6 +525,7 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # 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 @@ -533,6 +536,7 @@ 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 diff --git a/nuttx/configs/mcu123-lpc214x/src/Makefile b/nuttx/configs/mcu123-lpc214x/src/Makefile index d71ee10ee..2dbb86362 100644 --- a/nuttx/configs/mcu123-lpc214x/src/Makefile +++ b/nuttx/configs/mcu123-lpc214x/src/Makefile @@ -41,6 +41,9 @@ CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm -I ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) CSRCS = up_spi.c up_leds.c +ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y) +CSRCS += up_nsh.c +endif COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) diff --git a/nuttx/configs/mcu123-lpc214x/src/up_nsh.c b/nuttx/configs/mcu123-lpc214x/src/up_nsh.c new file mode 100644 index 000000000..18abb7435 --- /dev/null +++ b/nuttx/configs/mcu123-lpc214x/src/up_nsh.c @@ -0,0 +1,160 @@ +/**************************************************************************** + * config/mcu123-lpc214x/src/up_nsh.c + * arch/arm/src/board/up_nsh.c + * + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> +#include <sys/types.h> + +#include <stdio.h> +#include <debug.h> +#include <errno.h> + +#include <nuttx/spi.h> +#include <nuttx/mmcsd.h> + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/* Configuration ************************************************************/ + +/* PORT and SLOT number probably depend on the board configuration */ + +#ifdef CONFIG_ARCH_BOARD_MCU123 +# define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1 +# define CONFIG_EXAMPLES_NSH_HAVEMMCSD 1 +# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 1 +# error "The LPC214x MMC/SD is on SPI1" +# undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO +# define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 1 +# endif +# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0 +# error "The LPC214x MMC/SD is on SPI1" +# undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO +# define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0 +# endif +#else + /* Add configuration for new LPC214x boards here */ +# error "Unrecognized LPC214x board" +# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV +# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD +#endif + +/* Can't support USB features if USB is not enabled */ + +#ifndef CONFIG_USBDEV +# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV +#endif + +/* Can't support MMC/SD features if mountpoints are disabled */ + +#if defined(CONFIG_DISABLE_MOUNTPOINT) +# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD +#endif + +#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR +# define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0 +#endif + +/* Debug ********************************************************************/ + +#ifdef CONFIG_CPP_HAVE_VARARGS +# ifdef CONFIG_DEBUG +# define message(...) lib_lowprintf(__VA_ARGS__) +# else +# define message(...) printf(__VA_ARGS__) +# endif +#else +# ifdef CONFIG_DEBUG +# define message lib_lowprintf +# else +# define message printf +# endif +#endif + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: nsh_archinitialize + * + * Description: + * Perform architecture specific initialization + * + ****************************************************************************/ + +int nsh_archinitialize(void) +{ + FAR struct spi_dev_s *spi; + int ret; + + /* Get the SPI port */ + + message("nsh_archinitialize: Initializing SPI port %d\n", + CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO); + + spi = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO); + if (!spi) + { + message("nsh_archinitialize: Failed to initialize SPI port %d\n", + CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO); + return -ENODEV; + } + + message("nsh_archinitialize: Successfully initialized SPI port %d\n", + CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO); + + /* Bind the SPI port to the slot */ + + message("nsh_archinitialize: Binding SPI port %d to MMC/SD slot %d\n", + CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); + + ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, spi); + if (ret < 0) + { + message("nsh_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n", + CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret); + return ret; + } + + message("nsh_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n", + CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); + return OK; +} diff --git a/nuttx/configs/mcu123-lpc214x/src/up_spi.c b/nuttx/configs/mcu123-lpc214x/src/up_spi.c index f2ca5196d..c8cd831ba 100644 --- a/nuttx/configs/mcu123-lpc214x/src/up_spi.c +++ b/nuttx/configs/mcu123-lpc214x/src/up_spi.c @@ -1,5 +1,6 @@ /**************************************************************************** * config/mcu123-lpc214x/src/up_spi.c + * arch/arm/src/board/up_spi.c * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig index 0d95664cb..7760edbe5 100644 --- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig +++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig @@ -510,6 +510,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # 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 +# specific initialization (nsh_archinitialize()). # # If CONFIG_EXAMPLES_NSH_TELNET is selected: # CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size @@ -528,6 +530,7 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # 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 @@ -538,6 +541,7 @@ 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 diff --git a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig index 3cf08afc2..99750003d 100644 --- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig +++ b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig @@ -510,6 +510,8 @@ CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 # 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 +# specific initialization (nsh_archinitialize()). # # If CONFIG_EXAMPLES_NSH_TELNET is selected: # CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size @@ -538,6 +540,7 @@ 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 |