diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index d84a9328b80..52ff1f10aa2 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -4059,7 +4059,7 @@ Mem: 29232 5920 23312 23312 An SPI driver and a USB device driver exist for the AT90USB as well as a USB mass storage configuration. However, this configuration is not fully debugged as of the NuttX-6.5 release. - Refer to the NuttX board README file for further information. + Refer to the NuttX board README file for further information.

diff --git a/Documentation/README.html b/Documentation/README.html index 697e58fb3d5..8f7092a940a 100644 --- a/Documentation/README.html +++ b/Documentation/README.html @@ -238,8 +238,8 @@ | | | `- README.txt | | |- sure-pic32mx/ | | | `- README.txt - | | |- teensy/ - | | | `- README.txt + | | |- teensy-2.0/ + | | | `- README.txt | | |- teensy-lc/ | | | `- README.txt | | |- tm4c123g-launchpad/ diff --git a/README.txt b/README.txt index 4d60e565630..d8d2883cfbb 100644 --- a/README.txt +++ b/README.txt @@ -1297,7 +1297,7 @@ nuttx | | `- README.txt | |- sure-pic32mx/ | | `- README.txt - | |- teensy/ + | |- teensy-2.0/ | | `- README.txt | |- teensy-lc/ | | `- README.txt diff --git a/configs/Kconfig b/configs/Kconfig index b6c48b224d8..cc938e4799c 100644 --- a/configs/Kconfig +++ b/configs/Kconfig @@ -277,8 +277,8 @@ config ARCH_BOARD_LPCXPRESSO_LPC1115 depends on ARCH_CHIP_LPC1115 select ARCH_HAVE_LEDS ---help--- - The NXP LPCXpresso daughter board. This board is based on the NXP - LPC1115. + The Embedded Artists LPCXpresso LPC1115 board featuring the NXP + LPC1115 MCU. config ARCH_BOARD_LPCXPRESSO bool "NXP LPCExpresso LPC1768" @@ -899,7 +899,7 @@ config ARCH_BOARD_SUREPIC32MX http://www.sureelectronics.net/goods.php?id=1168 for further information about the Sure DB-DP11215 board. -config ARCH_BOARD_TEENSY +config ARCH_BOARD_TEENSY_20 bool "PJRC Teensy++ 2.0 board" depends on ARCH_CHIP_AT90USB1286 select ARCH_HAVE_LEDS @@ -1237,7 +1237,7 @@ config ARCH_BOARD default "stm32vldiscovery" if ARCH_BOARD_STM32VL_DISCOVERY default "mikroe-stm32f4" if ARCH_BOARD_MIKROE_STM32F4 default "sure-pic32mx" if ARCH_BOARD_SUREPIC32MX - default "teensy" if ARCH_BOARD_TEENSY + default "teensy-2.0" if ARCH_BOARD_TEENSY_20 default "teensy-lc" if ARCH_BOARD_TEENSY_LC default "tm4c123g-launchpad" if ARCH_BOARD_TM4C123G_LAUNCHPAD default "tm4c1294-launchpad" if ARCH_BOARD_TM4C1294_LAUNCHPAD @@ -1566,8 +1566,8 @@ endif if ARCH_BOARD_SUREPIC32MX source "configs/sure-pic32mx/Kconfig" endif -if ARCH_BOARD_TEENSY -source "configs/teensy/Kconfig" +if ARCH_BOARD_TEENSY_20 +source "configs/teensy-2.0/Kconfig" endif if ARCH_BOARD_TEENSY_LC source "configs/teensy-lc/Kconfig" diff --git a/configs/README.txt b/configs/README.txt index 63d4468eb87..2843cbd07ee 100644 --- a/configs/README.txt +++ b/configs/README.txt @@ -286,8 +286,8 @@ configs/lm4f120-launchpad Instruments. configs/lpcxpresso-lpc1115 - NuttX board support for the NXP LPCXpresso daughter board. This board - is based on the NXP LPC1115. + NuttX board support for the Embedded Artists LPCXpresso LPC1115 board + featuring the NXP LPC1115 MCU. configs/lpcxpresso-lpc1768 Embedded Artists base board with NXP LPCExpresso LPC1768. This board @@ -602,7 +602,7 @@ configs/sure-pic32mx http://www.sureelectronics.net/goods.php?id=1168 for further information about the Sure DB-DP11215 board. -configs/teensy +configs/teensy-2.0 This is the port of NuttX to the PJRC Teensy++ 2.0 board. This board is developed by http://pjrc.com/teensy/. The Teensy++ 2.0 is based on an Atmel AT90USB1286 MCU. diff --git a/configs/lpcxpresso-lpc1115/README.txt b/configs/lpcxpresso-lpc1115/README.txt index 60ee8e99251..1a9d560aac7 100644 --- a/configs/lpcxpresso-lpc1115/README.txt +++ b/configs/lpcxpresso-lpc1115/README.txt @@ -1,7 +1,8 @@ README ^^^^^^ -README for NuttX port to the NXP the LPCXpresso board. +README for NuttX port to the Embedded Artists LPCXpresso LPC1115 board +featuring the NXP LPC1115 MCU. Contents ^^^^^^^^ diff --git a/configs/teensy/Kconfig b/configs/teensy-2.0/Kconfig similarity index 82% rename from configs/teensy/Kconfig rename to configs/teensy-2.0/Kconfig index 11cf2e7987b..d36ad8acdac 100644 --- a/configs/teensy/Kconfig +++ b/configs/teensy-2.0/Kconfig @@ -3,5 +3,5 @@ # see misc/tools/kconfig-language.txt. # -if ARCH_BOARD_TEENSY +if ARCH_BOARD_TEENSY_20 endif diff --git a/configs/teensy/README.txt b/configs/teensy-2.0/README.txt similarity index 99% rename from configs/teensy/README.txt rename to configs/teensy-2.0/README.txt index e5e3d751b64..45da461fd22 100644 --- a/configs/teensy/README.txt +++ b/configs/teensy-2.0/README.txt @@ -415,11 +415,11 @@ Teensy++ Configuration Options CONFIG_ARCH_BOARD - Identifies the configs subdirectory and hence, the board that supports the particular chip or SoC. - CONFIG_ARCH_BOARD=teensy + CONFIG_ARCH_BOARD=teensy-2.0 CONFIG_ARCH_BOARD_name - For use in C code - CONFIG_ARCH_BOARD_TEENSY=y + CONFIG_ARCH_BOARD_TEENSY_20=y CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation of delay loops @@ -520,7 +520,7 @@ Common Configuration Notes can be selected as follow: cd tools - ./configure.sh teensy/ + ./configure.sh teensy-2.0/ cd - . ./setenv.sh @@ -569,7 +569,7 @@ Configuration Sub-Directories IS UNTESTED, AND (3) THE RAM USAGE MIGHT BE EXCESSIVE. Update 7/11: (1) The SPI/SD driver has been verified, however, (2) I - believe that the current teensy/usbmsc configuration uses too + believe that the current teensy-2.0/usbmsc configuration uses too much SRAM for the system to behave sanely. A lower memory footprint version of the mass storage driver will be required before this can be debugged. diff --git a/configs/teensy/hello/Make.defs b/configs/teensy-2.0/hello/Make.defs similarity index 99% rename from configs/teensy/hello/Make.defs rename to configs/teensy-2.0/hello/Make.defs index 78d5b38905c..9fa2cd6e93b 100644 --- a/configs/teensy/hello/Make.defs +++ b/configs/teensy-2.0/hello/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# configs/teensy/hello/Make.defs +# configs/teensy-2.0/hello/Make.defs # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/teensy/hello/defconfig b/configs/teensy-2.0/hello/defconfig similarity index 99% rename from configs/teensy/hello/defconfig rename to configs/teensy-2.0/hello/defconfig index 42980fefdfe..6e9d195085e 100644 --- a/configs/teensy/hello/defconfig +++ b/configs/teensy-2.0/hello/defconfig @@ -146,9 +146,9 @@ CONFIG_RAM_SIZE=8192 # Board Selection # # CONFIG_ARCH_BOARD_MICROPENDOUS3 is not set -CONFIG_ARCH_BOARD_TEENSY=y +CONFIG_ARCH_BOARD_TEENSY_20=y # CONFIG_ARCH_BOARD_CUSTOM is not set -CONFIG_ARCH_BOARD="teensy" +CONFIG_ARCH_BOARD="teensy-2.0" # # Common Board Options diff --git a/configs/teensy/hello/ld.script b/configs/teensy-2.0/hello/ld.script similarity index 99% rename from configs/teensy/hello/ld.script rename to configs/teensy-2.0/hello/ld.script index 2115c848f68..cc55e8fae82 100644 --- a/configs/teensy/hello/ld.script +++ b/configs/teensy-2.0/hello/ld.script @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/teensy/hello/ld.script + * configs/teensy-2.0/hello/ld.script * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/teensy/nsh/setenv.sh b/configs/teensy-2.0/hello/setenv.sh similarity index 98% rename from configs/teensy/nsh/setenv.sh rename to configs/teensy-2.0/hello/setenv.sh index fb61f85777d..ccf008940d5 100755 --- a/configs/teensy/nsh/setenv.sh +++ b/configs/teensy-2.0/hello/setenv.sh @@ -1,5 +1,5 @@ #!/bin/bash -# configs/teensy/nsh/setenv.sh +# configs/teensy-2.0/hello/setenv.sh # # Copyright (C) 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/teensy/include/board.h b/configs/teensy-2.0/include/board.h similarity index 95% rename from configs/teensy/include/board.h rename to configs/teensy-2.0/include/board.h index 2a6b9294666..392c42d997c 100644 --- a/configs/teensy/include/board.h +++ b/configs/teensy-2.0/include/board.h @@ -1,6 +1,5 @@ /**************************************************************************** - * configs/teensy/include/board.h - * include/arch/board/board.h + * configs/teensy-2.0/include/board.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,8 +33,8 @@ * ****************************************************************************/ -#ifndef __CONFIGS_TEENSY_INCLUDE_BOARD_H -#define __CONFIGS_TEENSY_INCLUDE_BOARD_H +#ifndef __CONFIGS_TEENSY_20_INCLUDE_BOARD_H +#define __CONFIGS_TEENSY_20_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -96,4 +95,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __CONFIGS_TEENSY_INCLUDE_BOARD_H */ +#endif /* __CONFIGS_TEENSY_20_INCLUDE_BOARD_H */ diff --git a/configs/teensy/nsh/Make.defs b/configs/teensy-2.0/nsh/Make.defs similarity index 99% rename from configs/teensy/nsh/Make.defs rename to configs/teensy-2.0/nsh/Make.defs index f7e7d864819..dd47f4775c3 100644 --- a/configs/teensy/nsh/Make.defs +++ b/configs/teensy-2.0/nsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# configs/teensy/nsh/Make.defs +# configs/teensy-2.0/nsh/Make.defs # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/teensy/nsh/defconfig b/configs/teensy-2.0/nsh/defconfig similarity index 99% rename from configs/teensy/nsh/defconfig rename to configs/teensy-2.0/nsh/defconfig index a47c4bfdf0d..2f55022b089 100644 --- a/configs/teensy/nsh/defconfig +++ b/configs/teensy-2.0/nsh/defconfig @@ -146,9 +146,9 @@ CONFIG_RAM_SIZE=8192 # Board Selection # # CONFIG_ARCH_BOARD_MICROPENDOUS3 is not set -CONFIG_ARCH_BOARD_TEENSY=y +CONFIG_ARCH_BOARD_TEENSY_20=y # CONFIG_ARCH_BOARD_CUSTOM is not set -CONFIG_ARCH_BOARD="teensy" +CONFIG_ARCH_BOARD="teensy-2.0" # # Common Board Options diff --git a/configs/teensy/usbmsc/ld.script b/configs/teensy-2.0/nsh/ld.script similarity index 99% rename from configs/teensy/usbmsc/ld.script rename to configs/teensy-2.0/nsh/ld.script index 9ee8e917867..6c8aec1e1a9 100755 --- a/configs/teensy/usbmsc/ld.script +++ b/configs/teensy-2.0/nsh/ld.script @@ -1,5 +1,5 @@ /************************************************************************************** - * configs/teensy/usbmsc/ld.script + * configs/teensy-2.0/nsh/ld.script * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/teensy/usbmsc/setenv.sh b/configs/teensy-2.0/nsh/setenv.sh similarity index 98% rename from configs/teensy/usbmsc/setenv.sh rename to configs/teensy-2.0/nsh/setenv.sh index e248c5f714d..8d95b9c786e 100755 --- a/configs/teensy/usbmsc/setenv.sh +++ b/configs/teensy-2.0/nsh/setenv.sh @@ -1,5 +1,5 @@ #!/bin/bash -# configs/teensy/usbmsc/setenv.sh +# configs/teensy-2.0/nsh/setenv.sh # # Copyright (C) 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/teensy/src/.gitignore b/configs/teensy-2.0/src/.gitignore similarity index 100% rename from configs/teensy/src/.gitignore rename to configs/teensy-2.0/src/.gitignore diff --git a/configs/teensy/src/Makefile b/configs/teensy-2.0/src/Makefile similarity index 98% rename from configs/teensy/src/Makefile rename to configs/teensy-2.0/src/Makefile index df52808ecdb..b623980fd43 100644 --- a/configs/teensy/src/Makefile +++ b/configs/teensy-2.0/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# configs/teensy/src/Makefile +# configs/teensy-2.0/src/Makefile # # Copyright (C) 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/teensy/src/at90usb_boot.c b/configs/teensy-2.0/src/at90usb_boot.c similarity index 98% rename from configs/teensy/src/at90usb_boot.c rename to configs/teensy-2.0/src/at90usb_boot.c index 0495ddea643..cce5886390d 100644 --- a/configs/teensy/src/at90usb_boot.c +++ b/configs/teensy-2.0/src/at90usb_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/teensy/src/at90usb_boot.c + * configs/teensy-2.0/src/at90usb_boot.c * * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/teensy/src/at90usb_leds.c b/configs/teensy-2.0/src/at90usb_leds.c similarity index 99% rename from configs/teensy/src/at90usb_leds.c rename to configs/teensy-2.0/src/at90usb_leds.c index 5d3762e35c5..72348b369ad 100644 --- a/configs/teensy/src/at90usb_leds.c +++ b/configs/teensy-2.0/src/at90usb_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/teensy/src/at90usb_leds.c + * configs/teensy-2.0/src/at90usb_leds.c * * Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/teensy/src/at90usb_spi.c b/configs/teensy-2.0/src/at90usb_spi.c similarity index 99% rename from configs/teensy/src/at90usb_spi.c rename to configs/teensy-2.0/src/at90usb_spi.c index f3cc85ed8f9..052965f9173 100644 --- a/configs/teensy/src/at90usb_spi.c +++ b/configs/teensy-2.0/src/at90usb_spi.c @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/teensy/src/at90usb_spi.c + * configs/teensy-2.0/src/at90usb_spi.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/teensy/src/at90usb_usbmsc.c b/configs/teensy-2.0/src/at90usb_usbmsc.c similarity index 98% rename from configs/teensy/src/at90usb_usbmsc.c rename to configs/teensy-2.0/src/at90usb_usbmsc.c index 47acbfd2e1b..7bd7d934ffc 100644 --- a/configs/teensy/src/at90usb_usbmsc.c +++ b/configs/teensy-2.0/src/at90usb_usbmsc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/teensy/src/at90usb_usbmsc.c + * configs/teens-2.0/src/at90usb_usbmsc.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -63,7 +63,7 @@ /* PORT and SLOT number probably depend on the board configuration */ -#ifdef CONFIG_ARCH_BOARD_TEENSY +#ifdef CONFIG_ARCH_BOARD_TEENSY_20 # undef AVR_MMCSDSPIPORTNO # define AVR_MMCSDSPIPORTNO 0 # undef AVR_MMCSDSLOTNO diff --git a/configs/teensy/src/teensy_internal.h b/configs/teensy-2.0/src/teensy_internal.h similarity index 94% rename from configs/teensy/src/teensy_internal.h rename to configs/teensy-2.0/src/teensy_internal.h index bbe6a3aad93..7e3e44ed82e 100644 --- a/configs/teensy/src/teensy_internal.h +++ b/configs/teensy-2.0/src/teensy_internal.h @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/teensy/src/pcblogic-internal.h + * configs/teensy-2.0/src/pcblogic-internal.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __CONFIGS_TEENSY_SRC_TEENSY_INTERNAL_H -#define __CONFIGS_TEENSY_SRC_TEENSY_INTERNAL_H +#ifndef __CONFIGS_TEENSY_20_SRC_TEENSY_INTERNAL_H +#define __CONFIGS_TEENSY_20_SRC_TEENSY_INTERNAL_H /**************************************************************************** * Included Files @@ -99,4 +99,4 @@ void at90usb_ledinit(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __CONFIGS_TEENSY_SRC_TEENSY_INTERNAL_H */ +#endif /* __CONFIGS_TEENSY_20_SRC_TEENSY_INTERNAL_H */ diff --git a/configs/teensy/usbmsc/Make.defs b/configs/teensy-2.0/usbmsc/Make.defs similarity index 99% rename from configs/teensy/usbmsc/Make.defs rename to configs/teensy-2.0/usbmsc/Make.defs index e96abacdef1..55533a26992 100644 --- a/configs/teensy/usbmsc/Make.defs +++ b/configs/teensy-2.0/usbmsc/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# configs/teensy/usbmsc/Make.defs +# configs/teensy-2.0/usbmsc/Make.defs # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/configs/teensy/usbmsc/defconfig b/configs/teensy-2.0/usbmsc/defconfig similarity index 99% rename from configs/teensy/usbmsc/defconfig rename to configs/teensy-2.0/usbmsc/defconfig index 77b8a689d86..51db0f3732d 100644 --- a/configs/teensy/usbmsc/defconfig +++ b/configs/teensy-2.0/usbmsc/defconfig @@ -145,9 +145,9 @@ CONFIG_RAM_SIZE=8192 # Board Selection # # CONFIG_ARCH_BOARD_MICROPENDOUS3 is not set -CONFIG_ARCH_BOARD_TEENSY=y +CONFIG_ARCH_BOARD_TEENSY_20=y # CONFIG_ARCH_BOARD_CUSTOM is not set -CONFIG_ARCH_BOARD="teensy" +CONFIG_ARCH_BOARD="teensy-2.0" # # Common Board Options diff --git a/configs/teensy/nsh/ld.script b/configs/teensy-2.0/usbmsc/ld.script similarity index 99% rename from configs/teensy/nsh/ld.script rename to configs/teensy-2.0/usbmsc/ld.script index eaeccd9ef52..95f6bd460da 100755 --- a/configs/teensy/nsh/ld.script +++ b/configs/teensy-2.0/usbmsc/ld.script @@ -1,5 +1,5 @@ /************************************************************************************** - * configs/teensy/nsh/ld.script + * configs/teensy-2.0/usbmsc/ld.script * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/teensy/hello/setenv.sh b/configs/teensy-2.0/usbmsc/setenv.sh similarity index 98% rename from configs/teensy/hello/setenv.sh rename to configs/teensy-2.0/usbmsc/setenv.sh index ecb26642380..0d295221e61 100755 --- a/configs/teensy/hello/setenv.sh +++ b/configs/teensy-2.0/usbmsc/setenv.sh @@ -1,5 +1,5 @@ #!/bin/bash -# configs/teensy/hello/setenv.sh +# configs/teensy-2.0/usbmsc/setenv.sh # # Copyright (C) 2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt