Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove CONFIG_XYZ_BUILTIN configurations, replace with the single CONFIG_NSH_BUILTIN_APPS. Add SAM3/4 sam_periphclks.h which is just a header file that includes the right header file. Misc SAM3U-EK cleanup

Browse Source
This commit is contained in:
Gregory Nutt
2013-06-12 17:32:00 -06:00
parent c4f903081c
commit 9ab85d01ef
100 changed files with 404 additions and 1209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/cloudctrl/src/up_usbmsc.c
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/cloudctrl/src/up_usbmsc.c * configs/cloudctrl/src/up_usbmsc.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* Darcy Gong <darcy.gong@gmail.com> * Darcy Gong <darcy.gong@gmail.com>
* *
@@ -96,7 +96,7 @@ int usbmsc_archinitialize(void)
* this case, there is nothing further to be done here. * this case, there is nothing further to be done here.
*/ */
#ifndef CONFIG_EXAMPLES_USBMSC_BUILTIN #ifndef CONFIG_NSH_BUILTIN_APPS
return stm32_sdinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1); return stm32_sdinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1);
#else #else
return OK; return OK;
configs/compal_e99/nsh_highram/defconfig
-3
View File
@@ -262,9 +262,6 @@ CONFIG_NSH_BUILTIN_APPS=y
# Settings for examples/hello # Settings for examples/hello
# #
CONFIG_EXAMPLES_NXHELLO_BUILTIN=y
CONFIG_EXAMPLES_NXTEXT_BUILTIN=y
CONFIG_EXAMPLES_NXIMAGE_BUILTIN=y
CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=2 CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=2
CONFIG_EXAMPLES_NXLINES_LINEWIDTH=4 CONFIG_EXAMPLES_NXLINES_LINEWIDTH=4
configs/ekk-lm3s9b96/ostest/defconfig
-1
View File
@@ -429,7 +429,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
configs/ez80f910200kitg/ostest/defconfig
-1
View File
@@ -368,7 +368,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
configs/ez80f910200zco/ostest/defconfig
-1
View File
@@ -376,7 +376,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
configs/fire-stm32v2/nsh/defconfig
-2
View File
@@ -773,7 +773,6 @@ CONFIG_EXAMPLES_NSH=y
# USB Mass Storage Class Example # USB Mass Storage Class Example
# #
CONFIG_EXAMPLES_USBMSC=y CONFIG_EXAMPLES_USBMSC=y
CONFIG_EXAMPLES_USBMSC_BUILTIN=y
CONFIG_EXAMPLES_USBMSC_NLUNS=1 CONFIG_EXAMPLES_USBMSC_NLUNS=1
CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0" CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
@@ -996,7 +995,6 @@ CONFIG_NSH_NOMAC=y
# I2C tool # I2C tool
# #
CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_I2CTOOL=y
CONFIG_I2CTOOL_BUILTIN=y
CONFIG_I2CTOOL_MINBUS=1 CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2CTOOL_MAXBUS=2 CONFIG_I2CTOOL_MAXBUS=2
CONFIG_I2CTOOL_MINADDR=0x03 CONFIG_I2CTOOL_MINADDR=0x03
configs/fire-stm32v2/src/up_usbmsc.c
+2 -2
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/fire-stm32v2/src/up_usbmsc.c * configs/fire-stm32v2/src/up_usbmsc.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Configure and register the STM32 SPI-based MMC/SD block driver. * Configure and register the STM32 SPI-based MMC/SD block driver.
@@ -95,7 +95,7 @@ int usbmsc_archinitialize(void)
* this case, there is nothing further to be done here. * this case, there is nothing further to be done here.
*/ */
#ifndef CONFIG_EXAMPLES_USBMSC_BUILTIN #ifndef CONFIG_NSH_BUILTIN_APPS
return stm32_sdinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1); return stm32_sdinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1);
#else #else
return OK; return OK;
configs/freedom-kl25z/ostest/defconfig
-1
View File
@@ -449,7 +449,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=1536 CONFIG_EXAMPLES_OSTEST_STACKSIZE=1536
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
configs/hymini-stm32v/README.txt
+1 -1
View File
@@ -627,7 +627,7 @@ Where <subdir> is one of the following:
long file names in the FAT file system. Please refer to the long file names in the FAT file system. Please refer to the
details in the top-level COPYING file. Please do not use FAT details in the top-level COPYING file. Please do not use FAT
long file name unless you are familiar with these patent issues. long file name unless you are familiar with these patent issues.
(4) When built as an NSH add-on command (CONFIG_EXAMPLES_USBMSC_BUILTIN=y), (4) When built as an NSH add-on command (CONFIG_NSH_BUILTIN_APPS=y),
Caution should be used to assure that the SD drive is not in use when Caution should be used to assure that the SD drive is not in use when
the USB storage device is configured. Specifically, the SD driver the USB storage device is configured. Specifically, the SD driver
should be unmounted like: should be unmounted like:
configs/hymini-stm32v/nsh2/defconfig
-3
View File
@@ -691,7 +691,6 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
CONFIG_EXAMPLES_NSH=y CONFIG_EXAMPLES_NSH=y
# CONFIG_EXAMPLES_NULL is not set # CONFIG_EXAMPLES_NULL is not set
CONFIG_EXAMPLES_NX=y CONFIG_EXAMPLES_NX=y
CONFIG_EXAMPLES_NX_BUILTIN=y
CONFIG_EXAMPLES_NX_VPLANE=0 CONFIG_EXAMPLES_NX_VPLANE=0
CONFIG_EXAMPLES_NX_DEVNO=0 CONFIG_EXAMPLES_NX_DEVNO=0
CONFIG_EXAMPLES_NX_DEFAULT_COLORS=y CONFIG_EXAMPLES_NX_DEFAULT_COLORS=y
@@ -719,14 +718,12 @@ CONFIG_EXAMPLES_NXIMAGE=y
# CONFIG_EXAMPLES_THTTPD is not set # CONFIG_EXAMPLES_THTTPD is not set
# CONFIG_EXAMPLES_TIFF is not set # CONFIG_EXAMPLES_TIFF is not set
CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_EXAMPLES_TOUCHSCREEN=y
CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN=y
CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0 CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0" CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
# CONFIG_EXAMPLES_UDP is not set # CONFIG_EXAMPLES_UDP is not set
# CONFIG_EXAMPLES_UIP is not set # CONFIG_EXAMPLES_UIP is not set
# CONFIG_EXAMPLES_USBSERIAL is not set # CONFIG_EXAMPLES_USBSERIAL is not set
CONFIG_EXAMPLES_USBMSC=y CONFIG_EXAMPLES_USBMSC=y
CONFIG_EXAMPLES_USBMSC_BUILTIN=y
CONFIG_EXAMPLES_USBMSC_NLUNS=1 CONFIG_EXAMPLES_USBMSC_NLUNS=1
CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0" CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
configs/hymini-stm32v/ostest/defconfig
-1
View File
@@ -516,7 +516,6 @@ CONFIG_SCHED_WORKSTACKSIZE=1024
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=8 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=8
configs/hymini-stm32v/src/up_usbmsc.c
+3 -3
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/hymini-stm32v/src/up_usbmsc.c * configs/hymini-stm32v/src/up_usbmsc.c
* *
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Configure and register the STM32 MMC/SD SDIO block driver. * Configure and register the STM32 MMC/SD SDIO block driver.
@@ -114,7 +114,7 @@ int usbmsc_archinitialize(void)
* this case, there is nothing further to be done here. * this case, there is nothing further to be done here.
*/ */
#ifndef CONFIG_EXAMPLES_USBMSC_BUILTIN #ifndef CONFIG_NSH_BUILTIN_APPS
FAR struct sdio_dev_s *sdio; FAR struct sdio_dev_s *sdio;
int ret; int ret;
@@ -156,7 +156,7 @@ int usbmsc_archinitialize(void)
sdio_mediachange(sdio, true); sdio_mediachange(sdio, true);
#endif /* CONFIG_EXAMPLES_USBMSC_BUILTIN */ #endif /* CONFIG_NSH_BUILTIN_APPS */
return OK; return OK;
} }
configs/hymini-stm32v/usbserial/defconfig
-1
View File
@@ -477,7 +477,6 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
# #
# Settings for examples/usbterm # Settings for examples/usbterm
# #
CONFIG_EXAMPLES_USBTERM_BUILTIN=n
CONFIG_EXAMPLES_USBTERM_BUFLEN=256 CONFIG_EXAMPLES_USBTERM_BUFLEN=256
CONFIG_EXAMPLES_USBTERM_TRACEINIT=n CONFIG_EXAMPLES_USBTERM_TRACEINIT=n
CONFIG_EXAMPLES_USBTERM_TRACECLASS=n CONFIG_EXAMPLES_USBTERM_TRACECLASS=n
configs/hymini-stm32v/usbstorage/defconfig
-1
View File
@@ -464,7 +464,6 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
# #
# Settings for examples/usbstorage # Settings for examples/usbstorage
# #
CONFIG_EXAMPLES_USBMSC_BUILTIN=n
CONFIG_EXAMPLES_USBMSC_NLUNS=1 CONFIG_EXAMPLES_USBMSC_NLUNS=1
CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0" CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
configs/kwikstik-k40/ostest/defconfig
-1
View File
@@ -463,7 +463,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
configs/kwikstik-k40/src/up_usbmsc.c
+2 -2
View File
@@ -110,9 +110,9 @@ int usbmsc_archinitialize(void)
* this case, there is nothing further to be done here. * this case, there is nothing further to be done here.
*/ */
#ifndef CONFIG_EXAMPLES_USBMSC_BUILTIN #ifndef CONFIG_NSH_BUILTIN_APPS
# warning "Missing logic" # warning "Missing logic"
#endif /* CONFIG_EXAMPLES_USBMSC_BUILTIN */ #endif /* CONFIG_NSH_BUILTIN_APPS */
return OK; return OK;
} }
configs/lm3s6965-ek/ostest/defconfig
-1
View File
@@ -413,7 +413,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
configs/lm4f120-launchpad/ostest/defconfig
-1
View File
@@ -432,7 +432,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
configs/lpc4330-xplorer/nsh/defconfig
-1
View File
@@ -537,7 +537,6 @@ CONFIG_NSH_MMCSDMINOR=0
# #
# I2C tool settings # I2C tool settings
# #
CONFIG_I2CTOOL_BUILTIN=y
CONFIG_I2CTOOL_MINBUS=1 CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2CTOOL_MAXBUS=3 CONFIG_I2CTOOL_MAXBUS=3
#CONFIG_I2CTOOL_MINADDR #CONFIG_I2CTOOL_MINADDR
configs/lpc4330-xplorer/ostest/defconfig
-1
View File
@@ -520,7 +520,6 @@ CONFIG_NSH_MMCSDMINOR=0
# #
# I2C tool settings # I2C tool settings
# #
CONFIG_I2CTOOL_BUILTIN=y
CONFIG_I2CTOOL_MINBUS=1 CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2CTOOL_MAXBUS=3 CONFIG_I2CTOOL_MAXBUS=3
#CONFIG_I2CTOOL_MINADDR #CONFIG_I2CTOOL_MINADDR
configs/mikroe-stm32f4/fulldemo/defconfig
-2
View File
@@ -747,7 +747,6 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
CONFIG_EXAMPLES_NSH=y CONFIG_EXAMPLES_NSH=y
# CONFIG_EXAMPLES_NULL is not set # CONFIG_EXAMPLES_NULL is not set
CONFIG_EXAMPLES_NX=y CONFIG_EXAMPLES_NX=y
CONFIG_EXAMPLES_NX_BUILTIN=y
CONFIG_EXAMPLES_NX_VPLANE=0 CONFIG_EXAMPLES_NX_VPLANE=0
CONFIG_EXAMPLES_NX_DEVNO=0 CONFIG_EXAMPLES_NX_DEVNO=0
CONFIG_EXAMPLES_NX_DEFAULT_COLORS=y CONFIG_EXAMPLES_NX_DEFAULT_COLORS=y
@@ -787,7 +786,6 @@ CONFIG_EXAMPLES_NXIMAGE=y
# CONFIG_EXAMPLES_THTTPD is not set # CONFIG_EXAMPLES_THTTPD is not set
# CONFIG_EXAMPLES_TIFF is not set # CONFIG_EXAMPLES_TIFF is not set
CONFIG_EXAMPLES_TOUCHSCREEN=y CONFIG_EXAMPLES_TOUCHSCREEN=y
CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN=y
CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0 CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0" CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
# CONFIG_EXAMPLES_UDP is not set # CONFIG_EXAMPLES_UDP is not set
configs/mikroe-stm32f4/kostest/defconfig
-1
View File
@@ -671,7 +671,6 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
CONFIG_EXAMPLES_OSTEST_BUILTIN=y
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=8 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=8
configs/mikroe-stm32f4/nx/defconfig
-1
View File
@@ -586,7 +586,6 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# CONFIG_EXAMPLES_NSH is not set # CONFIG_EXAMPLES_NSH is not set
# CONFIG_EXAMPLES_NULL is not set # CONFIG_EXAMPLES_NULL is not set
CONFIG_EXAMPLES_NX=y CONFIG_EXAMPLES_NX=y
# CONFIG_EXAMPLES_NX_BUILTIN is not set
CONFIG_EXAMPLES_NX_VPLANE=0 CONFIG_EXAMPLES_NX_VPLANE=0
CONFIG_EXAMPLES_NX_DEVNO=0 CONFIG_EXAMPLES_NX_DEVNO=0
CONFIG_EXAMPLES_NX_DEFAULT_COLORS=y CONFIG_EXAMPLES_NX_DEFAULT_COLORS=y
configs/mikroe-stm32f4/nxtext/defconfig
-1
View File
@@ -596,7 +596,6 @@ CONFIG_EXAMPLES_NXTEXT=y
# #
# Basic Configuration of the example # Basic Configuration of the example
# #
# CONFIG_EXAMPLES_NXTEXT_BUILTIN is not set
CONFIG_EXAMPLES_NXTEXT_VPLANE=0 CONFIG_EXAMPLES_NXTEXT_VPLANE=0
CONFIG_EXAMPLES_NXTEXT_DEVNO=0 CONFIG_EXAMPLES_NXTEXT_DEVNO=0
CONFIG_EXAMPLES_NXTEXT_BPP=16 CONFIG_EXAMPLES_NXTEXT_BPP=16
configs/nutiny-nuc120/ostest/defconfig
-1
View File
@@ -468,7 +468,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=1536 CONFIG_EXAMPLES_OSTEST_STACKSIZE=1536
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
configs/open1788/README.txt
+13 -2
View File
@@ -540,11 +540,22 @@ CONFIGURATION
CONFIG_GPIO_IRQ=y : GPIO interrupt support CONFIG_GPIO_IRQ=y : GPIO interrupt support
CONFIG_LPC17_SSP1=y : Enable support for SSP1 CONFIG_LPC17_SSP1=y : Enable support for SSP1
RTOS Features:
CONFIG_DISABLE_SIGNALS=n : Signals are required
Library Support:
CONFIG_SCHED_WORKQUEUE=y : Work queue support required
Applicaton Configuration: Applicaton Configuration:
CONFIG_EXAMPLES_TOUCHSCREEN=y : Enable the touchscreen built-int test CONFIG_EXAMPLES_TOUCHSCREEN=y : Enable the touchscreen built-int test
CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN=y
Defaults should be okay for related touchscreen settings. Defaults should be okay for related touchscreen settings. Touchscreen
debug output can be enabled with:
Build Setup:
CONFIG_DEBUG=y : Enable debug features
CONFIG_DEBUG_VERBOSE=y : Enable verbose debug output
CONFIG_DEBUG_INPUT=y : Enable debug output from input devices
c) You will also have to disable SD card support to use this test. The c) You will also have to disable SD card support to use this test. The
SD card detect (CD) signal is on P0[13]. This signal is shared. It SD card detect (CD) signal is on P0[13]. This signal is shared. It
configs/open1788/ostest/defconfig
-1
View File
@@ -469,7 +469,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
configs/p112/ostest/defconfig
-1
View File
@@ -405,7 +405,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024 CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=4 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=4
configs/pcblogic-pic32mx/ostest/defconfig
-1
View File
@@ -537,7 +537,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
configs/pic32-starterkit/nsh/defconfig
-3
View File
@@ -599,7 +599,6 @@ CONFIG_NSH_MMCSDMINOR=0
# #
# I2C tool settings # I2C tool settings
# #
CONFIG_I2CTOOL_BUILTIN=y
CONFIG_I2CTOOL_MINBUS=1 CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2CTOOL_MAXBUS=4 CONFIG_I2CTOOL_MAXBUS=4
#CONFIG_I2CTOOL_MINADDR #CONFIG_I2CTOOL_MINADDR
@@ -628,7 +627,6 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
# #
# Settings for examples/usbstorage # Settings for examples/usbstorage
# #
CONFIG_EXAMPLES_USBMSC_BUILTIN=y
CONFIG_EXAMPLES_USBMSC_NLUNS=1 CONFIG_EXAMPLES_USBMSC_NLUNS=1
CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0" CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
@@ -641,7 +639,6 @@ CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
# #
# Settings for examples/usbterm # Settings for examples/usbterm
# #
CONFIG_EXAMPLES_USBTERM_BUILTIN=y
CONFIG_EXAMPLES_USBTERM_DEVINIT=y CONFIG_EXAMPLES_USBTERM_DEVINIT=y
#CONFIG_EXAMPLES_USBTERM_BUFLEN #CONFIG_EXAMPLES_USBTERM_BUFLEN
CONFIG_EXAMPLES_USBTERM_TRACEINIT=n CONFIG_EXAMPLES_USBTERM_TRACEINIT=n
configs/pic32-starterkit/nsh2/defconfig
-3
View File
@@ -598,7 +598,6 @@ CONFIG_NSH_MMCSDMINOR=0
# #
# I2C tool settings # I2C tool settings
# #
CONFIG_I2CTOOL_BUILTIN=y
CONFIG_I2CTOOL_MINBUS=1 CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2CTOOL_MAXBUS=4 CONFIG_I2CTOOL_MAXBUS=4
#CONFIG_I2CTOOL_MINADDR #CONFIG_I2CTOOL_MINADDR
@@ -627,7 +626,6 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
# #
# Settings for examples/usbstorage # Settings for examples/usbstorage
# #
CONFIG_EXAMPLES_USBMSC_BUILTIN=y
CONFIG_EXAMPLES_USBMSC_NLUNS=1 CONFIG_EXAMPLES_USBMSC_NLUNS=1
CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0" CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
@@ -640,7 +638,6 @@ CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
# #
# Settings for examples/usbterm # Settings for examples/usbterm
# #
CONFIG_EXAMPLES_USBTERM_BUILTIN=y
CONFIG_EXAMPLES_USBTERM_DEVINIT=y CONFIG_EXAMPLES_USBTERM_DEVINIT=y
#CONFIG_EXAMPLES_USBTERM_BUFLEN #CONFIG_EXAMPLES_USBTERM_BUFLEN
CONFIG_EXAMPLES_USBTERM_TRACEINIT=n CONFIG_EXAMPLES_USBTERM_TRACEINIT=n
configs/pic32-starterkit/ostest/defconfig
-3
View File
@@ -595,7 +595,6 @@ CONFIG_NSH_MMCSDMINOR=0
# #
# I2C tool settings # I2C tool settings
# #
CONFIG_I2CTOOL_BUILTIN=y
CONFIG_I2CTOOL_MINBUS=1 CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2CTOOL_MAXBUS=4 CONFIG_I2CTOOL_MAXBUS=4
#CONFIG_I2CTOOL_MINADDR #CONFIG_I2CTOOL_MINADDR
@@ -624,7 +623,6 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
# #
# Settings for examples/usbstorage # Settings for examples/usbstorage
# #
CONFIG_EXAMPLES_USBMSC_BUILTIN=n
CONFIG_EXAMPLES_USBMSC_NLUNS=1 CONFIG_EXAMPLES_USBMSC_NLUNS=1
CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0" CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
@@ -637,7 +635,6 @@ CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
# #
# Settings for examples/usbterm # Settings for examples/usbterm
# #
CONFIG_EXAMPLES_USBTERM_BUILTIN=y
CONFIG_EXAMPLES_USBTERM_DEVINIT=y CONFIG_EXAMPLES_USBTERM_DEVINIT=y
#CONFIG_EXAMPLES_USBTERM_BUFLEN #CONFIG_EXAMPLES_USBTERM_BUFLEN
CONFIG_EXAMPLES_USBTERM_TRACEINIT=n CONFIG_EXAMPLES_USBTERM_TRACEINIT=n
configs/pic32-starterkit/src/up_usbmsc.c
+3 -3
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/pic32-starterkit/src/up_usbmsc.c * configs/pic32-starterkit/src/up_usbmsc.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -87,9 +87,9 @@ int usbmsc_archinitialize(void)
* this case, there is nothing further to be done here. * this case, there is nothing further to be done here.
*/ */
#ifndef CONFIG_EXAMPLES_USBMSC_BUILTIN #ifndef CONFIG_NSH_BUILTIN_APPS
# warning "Missing Logic" # warning "Missing Logic"
#endif /* CONFIG_EXAMPLES_USBMSC_BUILTIN */ #endif /* CONFIG_NSH_BUILTIN_APPS */
return 0; return 0;
} }
configs/pic32-starterkit/src/up_usbterm.c
+2 -2
View File
@@ -2,7 +2,7 @@
* configs/pic32-starterkit/src/up_usbterm.c * configs/pic32-starterkit/src/up_usbterm.c
* arch/arm/src/board/up_usbterm.c * arch/arm/src/board/up_usbterm.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -80,7 +80,7 @@ int usbterm_devinit(void)
* pic32mx_usbattach() will be called in nsh_archinitialize(). * pic32mx_usbattach() will be called in nsh_archinitialize().
*/ */
#ifndef CONFIG_EXAMPLES_USBTERM_BUILTIN #ifndef CONFIG_NSH_BUILTIN_APPS
pic32mx_usbattach(); pic32mx_usbattach();
#endif #endif
return OK; return OK;
configs/pic32mx7mmb/nsh/defconfig
-7
View File
@@ -646,7 +646,6 @@ CONFIG_NSH_MMCSDMINOR=0
# #
# I2C tool settings # I2C tool settings
# #
CONFIG_I2CTOOL_BUILTIN=y
CONFIG_I2CTOOL_MINBUS=1 CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2CTOOL_MAXBUS=4 CONFIG_I2CTOOL_MAXBUS=4
#CONFIG_I2CTOOL_MINADDR #CONFIG_I2CTOOL_MINADDR
@@ -661,7 +660,6 @@ CONFIG_I2CTOOL_DEFFREQ=100000
# #
# Settings for examples/nx # Settings for examples/nx
# #
CONFIG_EXAMPLES_NX_BUILTIN=y
CONFIG_EXAMPLES_NX_VPLANE=0 CONFIG_EXAMPLES_NX_VPLANE=0
CONFIG_EXAMPLES_NX_DEVNO=0 CONFIG_EXAMPLES_NX_DEVNO=0
CONFIG_EXAMPLES_NX_BGCOLOR=0x0011 CONFIG_EXAMPLES_NX_BGCOLOR=0x0011
@@ -681,7 +679,6 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=n
# #
# Settings for examples/nxhello # Settings for examples/nxhello
# #
CONFIG_EXAMPLES_NXHELLO_BUILTIN=y
CONFIG_EXAMPLES_NXHELLO_VPLANE=0 CONFIG_EXAMPLES_NXHELLO_VPLANE=0
CONFIG_EXAMPLES_NXHELLO_DEVNO=0 CONFIG_EXAMPLES_NXHELLO_DEVNO=0
CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011 CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011
@@ -693,7 +690,6 @@ CONFIG_EXAMPLES_NXHELLO_EXTERNINIT=n
# #
# Settings for examples/nximage # Settings for examples/nximage
# #
CONFIG_EXAMPLES_NXIMAGE_BUILTIN=y
CONFIG_EXAMPLES_NXIMAGE_VPLANE=0 CONFIG_EXAMPLES_NXIMAGE_VPLANE=0
CONFIG_EXAMPLES_NXIMAGE_DEVNO=0 CONFIG_EXAMPLES_NXIMAGE_DEVNO=0
CONFIG_EXAMPLES_NXIMAGE_BPP=16 CONFIG_EXAMPLES_NXIMAGE_BPP=16
@@ -722,7 +718,6 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n
# #
# Settings for examples/touchscreen # Settings for examples/touchscreen
# #
CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN=y
CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0 CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0" CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
@@ -744,7 +739,6 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
# #
# Settings for examples/usbstorage # Settings for examples/usbstorage
# #
CONFIG_EXAMPLES_USBMSC_BUILTIN=y
CONFIG_EXAMPLES_USBMSC_NLUNS=1 CONFIG_EXAMPLES_USBMSC_NLUNS=1
CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0" CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
@@ -757,7 +751,6 @@ CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
# #
# Settings for examples/usbterm # Settings for examples/usbterm
# #
CONFIG_EXAMPLES_USBTERM_BUILTIN=y
CONFIG_EXAMPLES_USBTERM_DEVINIT=y CONFIG_EXAMPLES_USBTERM_DEVINIT=y
#CONFIG_EXAMPLES_USBTERM_BUFLEN #CONFIG_EXAMPLES_USBTERM_BUFLEN
CONFIG_EXAMPLES_USBTERM_TRACEINIT=n CONFIG_EXAMPLES_USBTERM_TRACEINIT=n
configs/pic32mx7mmb/ostest/defconfig
-3
View File
@@ -595,7 +595,6 @@ CONFIG_NSH_MMCSDMINOR=0
# #
# I2C tool settings # I2C tool settings
# #
CONFIG_I2CTOOL_BUILTIN=y
CONFIG_I2CTOOL_MINBUS=1 CONFIG_I2CTOOL_MINBUS=1
CONFIG_I2CTOOL_MAXBUS=4 CONFIG_I2CTOOL_MAXBUS=4
#CONFIG_I2CTOOL_MINADDR #CONFIG_I2CTOOL_MINADDR
@@ -624,7 +623,6 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
# #
# Settings for examples/usbstorage # Settings for examples/usbstorage
# #
CONFIG_EXAMPLES_USBMSC_BUILTIN=n
CONFIG_EXAMPLES_USBMSC_NLUNS=1 CONFIG_EXAMPLES_USBMSC_NLUNS=1
CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0 CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0" CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
@@ -637,7 +635,6 @@ CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
# #
# Settings for examples/usbterm # Settings for examples/usbterm
# #
CONFIG_EXAMPLES_USBTERM_BUILTIN=y
CONFIG_EXAMPLES_USBTERM_DEVINIT=y CONFIG_EXAMPLES_USBTERM_DEVINIT=y
#CONFIG_EXAMPLES_USBTERM_BUFLEN #CONFIG_EXAMPLES_USBTERM_BUFLEN
CONFIG_EXAMPLES_USBTERM_TRACEINIT=n CONFIG_EXAMPLES_USBTERM_TRACEINIT=n
configs/pic32mx7mmb/src/up_usbmsc.c
+3 -3
View File
@@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/pic32mx7mmb/src/up_usbmsc.c * configs/pic32mx7mmb/src/up_usbmsc.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -87,9 +87,9 @@ int usbmsc_archinitialize(void)
* this case, there is nothing further to be done here. * this case, there is nothing further to be done here.
*/ */
#ifndef CONFIG_EXAMPLES_USBMSC_BUILTIN #ifndef CONFIG_NSH_BUILTIN_APPS
# warning "Missing Logic" # warning "Missing Logic"
#endif /* CONFIG_EXAMPLES_USBMSC_BUILTIN */ #endif /* CONFIG_NSH_BUILTIN_APPS */
return 0; return 0;
} }
configs/pic32mx7mmb/src/up_usbterm.c
+2 -2
View File
@@ -2,7 +2,7 @@
* configs/pic32mx7mmb/src/up_usbterm.c * configs/pic32mx7mmb/src/up_usbterm.c
* arch/arm/src/board/up_usbterm.c * arch/arm/src/board/up_usbterm.c
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -81,7 +81,7 @@ int usbterm_devinit(void)
* pic32mx_usbattach() will be called in nsh_archinitialize(). * pic32mx_usbattach() will be called in nsh_archinitialize().
*/ */
#ifndef CONFIG_EXAMPLES_USBTERM_BUILTIN #ifndef CONFIG_NSH_BUILTIN_APPS
pic32mx_usbattach(); pic32mx_usbattach();
#endif #endif
return OK; return OK;
configs/sam3u-ek/README.txt
+95 -34
View File
@@ -1,8 +1,8 @@
README README
^^^^^^ ^^^^^^
This README discusses issues unique to NuttX configurations for the This README discusses issues unique to NuttX configurations for the Atmel
Atmel SAM3U-EK development board. SAM3U-EK development board featuring the ATAM3U
Contents Contents
^^^^^^^^ ^^^^^^^^
@@ -91,7 +91,7 @@ IDEs
NuttX is built using command-line make. It can be used with an IDE, but some NuttX is built using command-line make. It can be used with an IDE, but some
effort will be required to create the project (There is a simple RIDE project effort will be required to create the project (There is a simple RIDE project
in the RIDE subdirectory). in the RIDE subdirectory).
Makefile Build Makefile Build
-------------- --------------
Under Eclipse, it is pretty easy to set up an "empty makefile project" and Under Eclipse, it is pretty easy to set up an "empty makefile project" and
@@ -188,7 +188,7 @@ NXFLAT Toolchain
tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can tools -- just the NXFLAT tools. The buildroot with the NXFLAT tools can
be downloaded from the NuttX SourceForge download site be downloaded from the NuttX SourceForge download site
(https://sourceforge.net/projects/nuttx/files/). (https://sourceforge.net/projects/nuttx/files/).
This GNU toolchain builds and executes in the Linux or Cygwin environment. This GNU toolchain builds and executes in the Linux or Cygwin environment.
1. You must have already configured Nuttx in <some-dir>/nuttx. 1. You must have already configured Nuttx in <some-dir>/nuttx.
@@ -371,25 +371,42 @@ SAM3U-EK-specific Configuration Options
Configurations Configurations
^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
Each SAM3U-EK configuration is maintained in a sub-directory and Each SAM3U-EK configuration is maintained in a sub-directory and
can be selected as follow: can be selected as follow:
cd tools cd tools
./configure.sh sam3u-ek/<subdir> ./configure.sh sam3u-ek/<subdir>
cd - cd -
. ./setenv.sh . ./setenv.sh
Before sourcing the setenv.sh file above, you should examine it and perform Before sourcing the setenv.sh file above, you should examine it and perform
edits as necessary so that BUILDROOT_BIN is the correct path to the directory edits as necessary so that BUILDROOT_BIN is the correct path to the directory
than holds your toolchain binaries. than holds your toolchain binaries.
And then build NuttX by simply typing the following. At the conclusion of And then build NuttX by simply typing the following. At the conclusion of
the make, the nuttx binary will reside in an ELF file called, simply, nuttx. the make, the nuttx binary will reside in an ELF file called, simply, nuttx.
make make
The <subdir> that is provided above as an argument to the tools/configure.sh The <subdir> that is provided above as an argument to the tools/configure.sh
must be is one of the following: must be is one of the following.
NOTES:
1. These configurations use the mconf-based configuration tool. To
change any of these configurations using that tool, you should:
a. Build and install the kconfig-mconf tool. See nuttx/README.txt
and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process.
2. Unless stated otherwise, all configurations generate console
output of UART0 (J3).
Configuration sub-directories
-----------------------------
knsh: knsh:
This is identical to the nsh configuration below except that NuttX This is identical to the nsh configuration below except that NuttX
@@ -406,23 +423,14 @@ must be is one of the following:
binaries (pass2) binaries (pass2)
NOTES: NOTES:
1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should:
a. Build and install the kconfig-mconf tool. See nuttx/README.txt 1. This configuration uses the older, OABI, buildroot toolchain. But
and misc/tools/README.txt. that is easily reconfigured:
b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process.
2. Uses the older, OABI, buildroot toolchain. But that is easily
reconfigured:
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : Buildroot toolchain CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : Buildroot toolchain
CONFIG_ARMV7M_OABI_TOOLCHAIN=y : Older, OABI toolchain CONFIG_ARMV7M_OABI_TOOLCHAIN=y : Older, OABI toolchain
3. At the end of the build, there will be several files in the top-level 2. At the end of the build, there will be several files in the top-level
NuttX build directory: NuttX build directory:
PASS1: PASS1:
@@ -438,7 +446,7 @@ must be is one of the following:
The J-Link programmer will except files in .hex, .mot, .srec, and .bin The J-Link programmer will except files in .hex, .mot, .srec, and .bin
formats. formats.
4. Combining .hex files. If you plan to use the .hex files with your 3. Combining .hex files. If you plan to use the .hex files with your
debugger or FLASH utility, then you may need to combine the two hex debugger or FLASH utility, then you may need to combine the two hex
files into a single .hex file. Here is how you can do that. files into a single .hex file. Here is how you can do that.
@@ -486,18 +494,71 @@ must be is one of the following:
Configures the NuttShell (nsh) located at examples/nsh. The Configures the NuttShell (nsh) located at examples/nsh. The
Configuration enables both the serial and telnetd NSH interfaces. Configuration enables both the serial and telnetd NSH interfaces.
NOTES:
1. This configuration uses the older, OABI, buildroot toolchain. But
that is easily reconfigured:
System Type:
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : Buildroot toolchain
CONFIG_ARMV7M_OABI_TOOLCHAIN=y : Older, OABI toolchain
2. NSH built-in applications are supported. However, there are
no built-in applications built with the default configuration.
Binary Formats:
CONFIG_BUILTIN=y : Enable support for built-in programs
Applicaton Configuration:
CONFIG_NSH_BUILTIN_APPS=y : Enable starting apps from NSH command line
3. This configuration has been used for verifying the touchscreen on
on the SAM3U-EK LCD. With these modifications, you can include the
touchscreen test program at apps/examples/touchscreen as an NSH built-in
application. You can enable the touchscreen and test by modifying the
default configuration in the following ways:
Drivers:
CONFIG_INPUT=y : Enable support for input devices
CONFIG_INPUT_ADS7843E=y : Enable support for the XPT2048
CONFIG_ADS7843E_SPIDEV=0 : Use SPI for communication
CONFIG_ADS7843E_SPIMODE=0 : Use SPI mode 0
CONFIG_ADS7843E_THRESHX=39 : These will probably need to be tuned
CONFIG_ADS7843E_THRESHY=51
CONFIG_SPI=y : Enable SPI support
CONFIG_SPI_EXCHANGE=n : exchange() method is not supported
System Type:
CONFIG_GPIO_IRQ=y : GPIO interrupt support
CONFIG_GPIOA_IRQ=y : Enable GPIO interrupts from port A
CONFIG_SAM34_SPI=y : Enable support for SPI
RTOS Features:
CONFIG_DISABLE_SIGNALS=n : Signals are required
Library Support:
CONFIG_SCHED_WORKQUEUE=y : Work queue support required
Applicaton Configuration:
CONFIG_EXAMPLES_TOUCHSCREEN=y : Enable the touchscreen built-int test
Defaults should be okay for related touchscreen settings. Touchscreen
debug output on UART0 can be enabled with:
Build Setup:
CONFIG_DEBUG=y : Enable debug features
CONFIG_DEBUG_VERBOSE=y : Enable verbose debug output
CONFIG_DEBUG_INPUT=y : Enable debug output from input devices
NOTE:
As of this writing, the touchscreen is not functional (no
interrupts). More work is needed.
nx: nx:
Configures to use examples/nx using the HX834x LCD hardwar on Configures to use examples/nx using the HX834x LCD hardware on
the SAM3U-EK development board. the SAM3U-EK development board.
ostest: ostest:
This configuration directory, performs a simple OS test using This configuration directory, performs a simple OS test using
examples/ostest. By default, this project assumes that you are examples/ostest. By default, this project assumes that you are
using the DFU bootloader. using the DFU bootloader.
touchscreen:
This configuration implements an NSH configuratin with several
built-in applications. The configuration is called touchscreen
because we intend to use this configuration to develop the
SAM3U-EK touchscreen. However, there is no touchscreen driver
in place as of this writing.
configs/sam3u-ek/knsh/defconfig
+57 -11
View File
@@ -85,6 +85,7 @@ CONFIG_ARCH_CORTEXM3=y
CONFIG_ARCH_FAMILY="armv7-m" CONFIG_ARCH_FAMILY="armv7-m"
CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP="sam34"
# CONFIG_ARMV7M_USEBASEPRI is not set # CONFIG_ARMV7M_USEBASEPRI is not set
# CONFIG_ARCH_HAVE_FPU is not set
CONFIG_ARCH_HAVE_MPU=y CONFIG_ARCH_HAVE_MPU=y
CONFIG_ARMV7M_MPU=y CONFIG_ARMV7M_MPU=y
CONFIG_ARMV7M_MPU_NREGIONS=8 CONFIG_ARMV7M_MPU_NREGIONS=8
@@ -97,37 +98,76 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI is not set
CONFIG_ARMV7M_OABI_TOOLCHAIN=y CONFIG_ARMV7M_OABI_TOOLCHAIN=y
# CONFIG_GPIO_IRQ is not set
# CONFIG_SDIO_DMA is not set # CONFIG_SDIO_DMA is not set
# CONFIG_SDIO_WIDTH_D1_ONLY is not set # CONFIG_SDIO_WIDTH_D1_ONLY is not set
# #
# AT91SAM3/SAM4 Configuration Options # AT91SAM3/4 Configuration Options
# #
CONFIG_ARCH_CHIP_AT91SAM3U4E=y CONFIG_ARCH_CHIP_AT91SAM3U4E=y
# CONFIG_ARCH_CHIP_SAM34_NDMACHANC2C is not set
# CONFIG_ARCH_CHIP_ATSAM4LC2B is not set
# CONFIG_ARCH_CHIP_ATSAM4LC2A is not set
# CONFIG_ARCH_CHIP_ATSAM4LC4C is not set
# CONFIG_ARCH_CHIP_ATSAM4LC4B is not set
# CONFIG_ARCH_CHIP_ATSAM4LC4A is not set
# CONFIG_ARCH_CHIP_ATSAM4LS2C is not set
# CONFIG_ARCH_CHIP_ATSAM4LS2B is not set
# CONFIG_ARCH_CHIP_ATSAM4LS2A is not set
# CONFIG_ARCH_CHIP_ATSAM4LS4C is not set
# CONFIG_ARCH_CHIP_ATSAM4LS4B is not set
# CONFIG_ARCH_CHIP_ATSAM4LS4A is not set
# CONFIG_ARCH_CHIP_ATSAM4SD32C is not set
# CONFIG_ARCH_CHIP_ATSAM4SD32B is not set
# CONFIG_ARCH_CHIP_ATSAM4SD16C is not set
# CONFIG_ARCH_CHIP_ATSAM4SD16B is not set
# CONFIG_ARCH_CHIP_ATSAM4SA16C is not set
# CONFIG_ARCH_CHIP_ATSAM4SA16B is not set
# CONFIG_ARCH_CHIP_ATSAM4S16C is not set
# CONFIG_ARCH_CHIP_ATSAM4S16B is not set
# CONFIG_ARCH_CHIP_ATSAM4S8C is not set
# CONFIG_ARCH_CHIP_ATSAM4S8B is not set
CONFIG_ARCH_CHIP_SAM3U=y CONFIG_ARCH_CHIP_SAM3U=y
# CONFIG_ARCH_CHIP_SAM4L is not set
# CONFIG_ARCH_CHIP_SAM4S is not set
# #
# AT91SAM3 Peripheral Support # AT91SAM3/4 Peripheral Support
# #
# CONFIG_SAM34_DMA is not set # CONFIG_SAM34_SPI is not set
# CONFIG_SAM34_NAND is not set # CONFIG_SAM34_SSC is not set
# CONFIG_SAM34_HSMCI is not set # CONFIG_SAM34_TC0 is not set
# CONFIG_SAM34_TC1 is not set
# CONFIG_SAM34_TC2 is not set
# CONFIG_SAM34_PWM is not set
# CONFIG_SAM34_TWIM0 is not set
# CONFIG_SAM34_TWIS0 is not set
# CONFIG_SAM34_TWIM1 is not set
# CONFIG_SAM34_TWIS1 is not set
CONFIG_SAM34_UART0=y CONFIG_SAM34_UART0=y
# CONFIG_SAM34_USART0 is not set # CONFIG_SAM34_USART0 is not set
# CONFIG_SAM34_USART1 is not set # CONFIG_SAM34_USART1 is not set
# CONFIG_SAM34_USART2 is not set # CONFIG_SAM34_USART2 is not set
# CONFIG_SAM34_USART3 is not set # CONFIG_SAM34_USART3 is not set
# CONFIG_SAM34_ADC12B is not set
# CONFIG_SAM34_ADC is not set
# CONFIG_SAM34_SMC is not set
# CONFIG_SAM34_NAND is not set
# CONFIG_SAM34_DMA is not set
# CONFIG_SAM34_UDPHS is not set
# CONFIG_SAM34_RTC is not set
# CONFIG_SAM34_RTT is not set
# CONFIG_SAM34_WDT is not set
# CONFIG_SAM34_HSMCI is not set
# #
# AT91SAM3 UART Configuration # AT91SAM3/4 USART Configuration
# #
# #
# AT91SAM3 GPIO Interrupt Configuration # AT91SAM3/4 GPIO Interrupt Configuration
# #
# CONFIG_GPIOA_IRQ is not set
# CONFIG_GPIOB_IRQ is not set
# CONFIG_GPIOC_IRQ is not set
# #
# External Memory Configuration # External Memory Configuration
@@ -145,7 +185,8 @@ CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_HAVE_VFORK=y CONFIG_ARCH_HAVE_VFORK=y
CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STACKDUMP=y
# CONFIG_ENDIAN_BIG is not set # CONFIG_ENDIAN_BIG is not set
# CONFIG_ARCH_HAVE_RAMFUNCS is not set CONFIG_ARCH_HAVE_RAMFUNCS=y
# CONFIG_ARCH_RAMFUNCS is not set
CONFIG_ARCH_HAVE_RAMVECTORS=y CONFIG_ARCH_HAVE_RAMVECTORS=y
# CONFIG_ARCH_RAMVECTORS is not set # CONFIG_ARCH_RAMVECTORS is not set
@@ -312,6 +353,10 @@ CONFIG_UART0_BAUD=115200
CONFIG_UART0_BITS=8 CONFIG_UART0_BITS=8
CONFIG_UART0_PARITY=0 CONFIG_UART0_PARITY=0
CONFIG_UART0_2STOP=0 CONFIG_UART0_2STOP=0
# CONFIG_UART0_IFLOWCONTROL is not set
# CONFIG_UART0_OFLOWCONTROL is not set
# CONFIG_SERIAL_IFLOWCONTROL is not set
# CONFIG_SERIAL_OFLOWCONTROL is not set
# CONFIG_USBDEV is not set # CONFIG_USBDEV is not set
# CONFIG_USBHOST is not set # CONFIG_USBHOST is not set
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
@@ -588,6 +633,7 @@ CONFIG_NSH_DISABLE_PS=y
CONFIG_NSH_CODECS_BUFSIZE=128 CONFIG_NSH_CODECS_BUFSIZE=128
CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_LINELEN=64 CONFIG_NSH_LINELEN=64
CONFIG_NSH_MAXARGUMENTS=6
CONFIG_NSH_NESTDEPTH=3 CONFIG_NSH_NESTDEPTH=3
# CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLESCRIPT is not set
# CONFIG_NSH_DISABLEBG is not set # CONFIG_NSH_DISABLEBG is not set
configs/sam3u-ek/nsh/defconfig
+32 -16
View File
@@ -92,6 +92,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI is not set
CONFIG_ARMV7M_OABI_TOOLCHAIN=y CONFIG_ARMV7M_OABI_TOOLCHAIN=y
# CONFIG_GPIO_IRQ is not set
# #
# AT91SAM3/4 Configuration Options # AT91SAM3/4 Configuration Options
@@ -109,16 +110,16 @@ CONFIG_ARCH_CHIP_AT91SAM3U4E=y
# CONFIG_ARCH_CHIP_ATSAM4LS4C is not set # CONFIG_ARCH_CHIP_ATSAM4LS4C is not set
# CONFIG_ARCH_CHIP_ATSAM4LS4B is not set # CONFIG_ARCH_CHIP_ATSAM4LS4B is not set
# CONFIG_ARCH_CHIP_ATSAM4LS4A is not set # CONFIG_ARCH_CHIP_ATSAM4LS4A is not set
# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SD32C is not set # CONFIG_ARCH_CHIP_ATSAM4SD32C is not set
# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SD32B is not set # CONFIG_ARCH_CHIP_ATSAM4SD32B is not set
# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SD16C is not set # CONFIG_ARCH_CHIP_ATSAM4SD16C is not set
# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SD16B is not set # CONFIG_ARCH_CHIP_ATSAM4SD16B is not set
# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SA16C is not set # CONFIG_ARCH_CHIP_ATSAM4SA16C is not set
# CONFIG_CONFIG_ARCH_CHIP_ATSAM4SA16B is not set # CONFIG_ARCH_CHIP_ATSAM4SA16B is not set
# CONFIG_CONFIG_ARCH_CHIP_ATSAM4S16C is not set # CONFIG_ARCH_CHIP_ATSAM4S16C is not set
# CONFIG_CONFIG_ARCH_CHIP_ATSAM4S16B is not set # CONFIG_ARCH_CHIP_ATSAM4S16B is not set
# CONFIG_CONFIG_ARCH_CHIP_ATSAM4S8C is not set # CONFIG_ARCH_CHIP_ATSAM4S8C is not set
# CONFIG_CONFIG_ARCH_CHIP_ATSAM4S8B is not set # CONFIG_ARCH_CHIP_ATSAM4S8B is not set
CONFIG_ARCH_CHIP_SAM3U=y CONFIG_ARCH_CHIP_SAM3U=y
# CONFIG_ARCH_CHIP_SAM4L is not set # CONFIG_ARCH_CHIP_SAM4L is not set
# CONFIG_ARCH_CHIP_SAM4S is not set # CONFIG_ARCH_CHIP_SAM4S is not set
@@ -127,13 +128,28 @@ CONFIG_ARCH_CHIP_SAM3U=y
# AT91SAM3/4 Peripheral Support # AT91SAM3/4 Peripheral Support
# #
# CONFIG_SAM34_SPI is not set # CONFIG_SAM34_SPI is not set
# CONFIG_SAM34_SSC is not set
# CONFIG_SAM34_TC0 is not set
# CONFIG_SAM34_TC1 is not set
# CONFIG_SAM34_TC2 is not set
# CONFIG_SAM34_PWM is not set
# CONFIG_SAM34_TWIM0 is not set
# CONFIG_SAM34_TWIS0 is not set
# CONFIG_SAM34_TWIM1 is not set
# CONFIG_SAM34_TWIS1 is not set
CONFIG_SAM34_UART0=y CONFIG_SAM34_UART0=y
# CONFIG_SAM34_USART0 is not set # CONFIG_SAM34_USART0 is not set
# CONFIG_SAM34_USART1 is not set # CONFIG_SAM34_USART1 is not set
# CONFIG_SAM34_USART2 is not set # CONFIG_SAM34_USART2 is not set
# CONFIG_SAM34_USART3 is not set # CONFIG_SAM34_USART3 is not set
# CONFIG_SAM34_ADC12B is not set
# CONFIG_SAM34_ADC is not set
# CONFIG_SAM34_SMC is not set
# CONFIG_SAM34_NAND is not set # CONFIG_SAM34_NAND is not set
# CONFIG_SAM34_DMA is not set # CONFIG_SAM34_DMA is not set
# CONFIG_SAM34_UDPHS is not set
# CONFIG_SAM34_RTC is not set
# CONFIG_SAM34_RTT is not set
# CONFIG_SAM34_WDT is not set # CONFIG_SAM34_WDT is not set
# CONFIG_SAM34_HSMCI is not set # CONFIG_SAM34_HSMCI is not set
@@ -144,9 +160,6 @@ CONFIG_SAM34_UART0=y
# #
# AT91SAM3/4 GPIO Interrupt Configuration # AT91SAM3/4 GPIO Interrupt Configuration
# #
# CONFIG_GPIOA_IRQ is not set
# CONFIG_GPIOB_IRQ is not set
# CONFIG_GPIOC_IRQ is not set
# #
# External Memory Configuration # External Memory Configuration
@@ -355,6 +368,7 @@ CONFIG_FS_FAT=y
# CONFIG_FS_NXFFS is not set # CONFIG_FS_NXFFS is not set
# CONFIG_FS_ROMFS is not set # CONFIG_FS_ROMFS is not set
# CONFIG_FS_SMARTFS is not set # CONFIG_FS_SMARTFS is not set
# CONFIG_FS_BINFS is not set
# #
# System Logging # System Logging
@@ -387,7 +401,7 @@ CONFIG_MM_REGIONS=3
# CONFIG_BINFMT_EXEPATH is not set # CONFIG_BINFMT_EXEPATH is not set
# CONFIG_NXFLAT is not set # CONFIG_NXFLAT is not set
# CONFIG_ELF is not set # CONFIG_ELF is not set
# CONFIG_BUILTIN is not set CONFIG_BUILTIN=y
# CONFIG_PIC is not set # CONFIG_PIC is not set
# CONFIG_SYMTAB_ORDEREDBYNAME is not set # CONFIG_SYMTAB_ORDEREDBYNAME is not set
@@ -440,6 +454,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# #
# Built-In Applications # Built-In Applications
# #
CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# #
# Examples # Examples
@@ -475,7 +490,6 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_EXAMPLES_OSTEST is not set # CONFIG_EXAMPLES_OSTEST is not set
# CONFIG_EXAMPLES_PASHELLO is not set # CONFIG_EXAMPLES_PASHELLO is not set
# CONFIG_EXAMPLES_PIPE is not set # CONFIG_EXAMPLES_PIPE is not set
# CONFIG_EXAMPLES_POLL is not set
# CONFIG_EXAMPLES_POSIXSPAWN is not set # CONFIG_EXAMPLES_POSIXSPAWN is not set
# CONFIG_EXAMPLES_QENCODER is not set # CONFIG_EXAMPLES_QENCODER is not set
# CONFIG_EXAMPLES_RGMP is not set # CONFIG_EXAMPLES_RGMP is not set
@@ -483,6 +497,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_EXAMPLES_SENDMAIL is not set # CONFIG_EXAMPLES_SENDMAIL is not set
# CONFIG_EXAMPLES_SERLOOP is not set # CONFIG_EXAMPLES_SERLOOP is not set
# CONFIG_EXAMPLES_SLCD is not set # CONFIG_EXAMPLES_SLCD is not set
# CONFIG_EXAMPLES_SMART_TEST is not set
# CONFIG_EXAMPLES_SMART is not set # CONFIG_EXAMPLES_SMART is not set
# CONFIG_EXAMPLES_TCPECHO is not set # CONFIG_EXAMPLES_TCPECHO is not set
# CONFIG_EXAMPLES_TELNETD is not set # CONFIG_EXAMPLES_TELNETD is not set
@@ -537,6 +552,7 @@ CONFIG_EXAMPLES_NSH=y
# NSH Library # NSH Library
# #
CONFIG_NSH_LIBRARY=y CONFIG_NSH_LIBRARY=y
CONFIG_NSH_BUILTIN_APPS=y
# #
# Disable Individual commands # Disable Individual commands
@@ -598,7 +614,7 @@ CONFIG_NSH_CONSOLE=y
# USB Trace Support # USB Trace Support
# #
# CONFIG_NSH_CONDEV is not set # CONFIG_NSH_CONDEV is not set
# CONFIG_NSH_ARCHINIT is not set CONFIG_NSH_ARCHINIT=y
# #
# NxWidgets/NxWM # NxWidgets/NxWM
configs/sam3u-ek/nx/defconfig
+58 -13
View File
@@ -80,6 +80,7 @@ CONFIG_ARCH_CORTEXM3=y
CONFIG_ARCH_FAMILY="armv7-m" CONFIG_ARCH_FAMILY="armv7-m"
CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP="sam34"
# CONFIG_ARMV7M_USEBASEPRI is not set # CONFIG_ARMV7M_USEBASEPRI is not set
# CONFIG_ARCH_HAVE_FPU is not set
CONFIG_ARCH_HAVE_MPU=y CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARMV7M_MPU is not set # CONFIG_ARMV7M_MPU is not set
@@ -91,35 +92,74 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI is not set
CONFIG_ARMV7M_OABI_TOOLCHAIN=y CONFIG_ARMV7M_OABI_TOOLCHAIN=y
# CONFIG_GPIO_IRQ is not set
# #
# AT91SAM3/SAM4 Configuration Options # AT91SAM3/4 Configuration Options
# #
CONFIG_ARCH_CHIP_AT91SAM3U4E=y CONFIG_ARCH_CHIP_AT91SAM3U4E=y
# CONFIG_ARCH_CHIP_SAM34_NDMACHANC2C is not set
# CONFIG_ARCH_CHIP_ATSAM4LC2B is not set
# CONFIG_ARCH_CHIP_ATSAM4LC2A is not set
# CONFIG_ARCH_CHIP_ATSAM4LC4C is not set
# CONFIG_ARCH_CHIP_ATSAM4LC4B is not set
# CONFIG_ARCH_CHIP_ATSAM4LC4A is not set
# CONFIG_ARCH_CHIP_ATSAM4LS2C is not set
# CONFIG_ARCH_CHIP_ATSAM4LS2B is not set
# CONFIG_ARCH_CHIP_ATSAM4LS2A is not set
# CONFIG_ARCH_CHIP_ATSAM4LS4C is not set
# CONFIG_ARCH_CHIP_ATSAM4LS4B is not set
# CONFIG_ARCH_CHIP_ATSAM4LS4A is not set
# CONFIG_ARCH_CHIP_ATSAM4SD32C is not set
# CONFIG_ARCH_CHIP_ATSAM4SD32B is not set
# CONFIG_ARCH_CHIP_ATSAM4SD16C is not set
# CONFIG_ARCH_CHIP_ATSAM4SD16B is not set
# CONFIG_ARCH_CHIP_ATSAM4SA16C is not set
# CONFIG_ARCH_CHIP_ATSAM4SA16B is not set
# CONFIG_ARCH_CHIP_ATSAM4S16C is not set
# CONFIG_ARCH_CHIP_ATSAM4S16B is not set
# CONFIG_ARCH_CHIP_ATSAM4S8C is not set
# CONFIG_ARCH_CHIP_ATSAM4S8B is not set
CONFIG_ARCH_CHIP_SAM3U=y CONFIG_ARCH_CHIP_SAM3U=y
# CONFIG_ARCH_CHIP_SAM4L is not set
# CONFIG_ARCH_CHIP_SAM4S is not set
# #
# AT91SAM3 Peripheral Support # AT91SAM3/4 Peripheral Support
# #
# CONFIG_SAM34_DMA is not set # CONFIG_SAM34_SPI is not set
# CONFIG_SAM34_NAND is not set # CONFIG_SAM34_SSC is not set
# CONFIG_SAM34_HSMCI is not set # CONFIG_SAM34_TC0 is not set
# CONFIG_SAM34_TC1 is not set
# CONFIG_SAM34_TC2 is not set
# CONFIG_SAM34_PWM is not set
# CONFIG_SAM34_TWIM0 is not set
# CONFIG_SAM34_TWIS0 is not set
# CONFIG_SAM34_TWIM1 is not set
# CONFIG_SAM34_TWIS1 is not set
CONFIG_SAM34_UART0=y CONFIG_SAM34_UART0=y
# CONFIG_SAM34_USART0 is not set # CONFIG_SAM34_USART0 is not set
# CONFIG_SAM34_USART1 is not set # CONFIG_SAM34_USART1 is not set
# CONFIG_SAM34_USART2 is not set # CONFIG_SAM34_USART2 is not set
# CONFIG_SAM34_USART3 is not set # CONFIG_SAM34_USART3 is not set
# CONFIG_SAM34_ADC12B is not set
# CONFIG_SAM34_ADC is not set
# CONFIG_SAM34_SMC is not set
# CONFIG_SAM34_NAND is not set
# CONFIG_SAM34_DMA is not set
# CONFIG_SAM34_UDPHS is not set
# CONFIG_SAM34_RTC is not set
# CONFIG_SAM34_RTT is not set
# CONFIG_SAM34_WDT is not set
# CONFIG_SAM34_HSMCI is not set
# #
# AT91SAM3 UART Configuration # AT91SAM3/4 USART Configuration
# #
# #
# AT91SAM3 GPIO Interrupt Configuration # AT91SAM3/4 GPIO Interrupt Configuration
# #
# CONFIG_GPIOA_IRQ is not set
# CONFIG_GPIOB_IRQ is not set
# CONFIG_GPIOC_IRQ is not set
# #
# External Memory Configuration # External Memory Configuration
@@ -137,7 +177,8 @@ CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_HAVE_VFORK=y CONFIG_ARCH_HAVE_VFORK=y
CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STACKDUMP=y
# CONFIG_ENDIAN_BIG is not set # CONFIG_ENDIAN_BIG is not set
# CONFIG_ARCH_HAVE_RAMFUNCS is not set CONFIG_ARCH_HAVE_RAMFUNCS=y
# CONFIG_ARCH_RAMFUNCS is not set
CONFIG_ARCH_HAVE_RAMVECTORS=y CONFIG_ARCH_HAVE_RAMVECTORS=y
# CONFIG_ARCH_RAMVECTORS is not set # CONFIG_ARCH_RAMVECTORS is not set
@@ -281,8 +322,8 @@ CONFIG_LCD_MAXPOWER=31
# CONFIG_LCD_ST7567 is not set # CONFIG_LCD_ST7567 is not set
# CONFIG_LCD_UG2864AMBAG01 is not set # CONFIG_LCD_UG2864AMBAG01 is not set
# CONFIG_LCD_SSD1289 is not set # CONFIG_LCD_SSD1289 is not set
CONFIG_LCD_LANDSCAPE=y # CONFIG_LCD_LANDSCAPE is not set
# CONFIG_LCD_PORTRAIT is not set CONFIG_LCD_PORTRAIT=y
# CONFIG_LCD_RPORTRAIT is not set # CONFIG_LCD_RPORTRAIT is not set
# CONFIG_LCD_RLANDSCAPE is not set # CONFIG_LCD_RLANDSCAPE is not set
@@ -314,6 +355,10 @@ CONFIG_UART0_BAUD=115200
CONFIG_UART0_BITS=8 CONFIG_UART0_BITS=8
CONFIG_UART0_PARITY=0 CONFIG_UART0_PARITY=0
CONFIG_UART0_2STOP=0 CONFIG_UART0_2STOP=0
# CONFIG_UART0_IFLOWCONTROL is not set
# CONFIG_UART0_OFLOWCONTROL is not set
# CONFIG_SERIAL_IFLOWCONTROL is not set
# CONFIG_SERIAL_OFLOWCONTROL is not set
# CONFIG_USBDEV is not set # CONFIG_USBDEV is not set
# CONFIG_USBHOST is not set # CONFIG_USBHOST is not set
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
configs/sam3u-ek/ostest/defconfig
+56 -12
View File
@@ -80,6 +80,7 @@ CONFIG_ARCH_CORTEXM3=y
CONFIG_ARCH_FAMILY="armv7-m" CONFIG_ARCH_FAMILY="armv7-m"
CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP="sam34"
# CONFIG_ARMV7M_USEBASEPRI is not set # CONFIG_ARMV7M_USEBASEPRI is not set
# CONFIG_ARCH_HAVE_FPU is not set
CONFIG_ARCH_HAVE_MPU=y CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARMV7M_MPU is not set # CONFIG_ARMV7M_MPU is not set
@@ -91,35 +92,74 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI is not set
CONFIG_ARMV7M_OABI_TOOLCHAIN=y CONFIG_ARMV7M_OABI_TOOLCHAIN=y
# CONFIG_GPIO_IRQ is not set
# #
# AT91SAM3/SAM4 Configuration Options # AT91SAM3/4 Configuration Options
# #
CONFIG_ARCH_CHIP_AT91SAM3U4E=y CONFIG_ARCH_CHIP_AT91SAM3U4E=y
# CONFIG_ARCH_CHIP_SAM34_NDMACHANC2C is not set
# CONFIG_ARCH_CHIP_ATSAM4LC2B is not set
# CONFIG_ARCH_CHIP_ATSAM4LC2A is not set
# CONFIG_ARCH_CHIP_ATSAM4LC4C is not set
# CONFIG_ARCH_CHIP_ATSAM4LC4B is not set
# CONFIG_ARCH_CHIP_ATSAM4LC4A is not set
# CONFIG_ARCH_CHIP_ATSAM4LS2C is not set
# CONFIG_ARCH_CHIP_ATSAM4LS2B is not set
# CONFIG_ARCH_CHIP_ATSAM4LS2A is not set
# CONFIG_ARCH_CHIP_ATSAM4LS4C is not set
# CONFIG_ARCH_CHIP_ATSAM4LS4B is not set
# CONFIG_ARCH_CHIP_ATSAM4LS4A is not set
# CONFIG_ARCH_CHIP_ATSAM4SD32C is not set
# CONFIG_ARCH_CHIP_ATSAM4SD32B is not set
# CONFIG_ARCH_CHIP_ATSAM4SD16C is not set
# CONFIG_ARCH_CHIP_ATSAM4SD16B is not set
# CONFIG_ARCH_CHIP_ATSAM4SA16C is not set
# CONFIG_ARCH_CHIP_ATSAM4SA16B is not set
# CONFIG_ARCH_CHIP_ATSAM4S16C is not set
# CONFIG_ARCH_CHIP_ATSAM4S16B is not set
# CONFIG_ARCH_CHIP_ATSAM4S8C is not set
# CONFIG_ARCH_CHIP_ATSAM4S8B is not set
CONFIG_ARCH_CHIP_SAM3U=y CONFIG_ARCH_CHIP_SAM3U=y
# CONFIG_ARCH_CHIP_SAM4L is not set
# CONFIG_ARCH_CHIP_SAM4S is not set
# #
# AT91SAM3 Peripheral Support # AT91SAM3/4 Peripheral Support
# #
# CONFIG_SAM34_DMA is not set # CONFIG_SAM34_SPI is not set
# CONFIG_SAM34_NAND is not set # CONFIG_SAM34_SSC is not set
# CONFIG_SAM34_HSMCI is not set # CONFIG_SAM34_TC0 is not set
# CONFIG_SAM34_TC1 is not set
# CONFIG_SAM34_TC2 is not set
# CONFIG_SAM34_PWM is not set
# CONFIG_SAM34_TWIM0 is not set
# CONFIG_SAM34_TWIS0 is not set
# CONFIG_SAM34_TWIM1 is not set
# CONFIG_SAM34_TWIS1 is not set
CONFIG_SAM34_UART0=y CONFIG_SAM34_UART0=y
# CONFIG_SAM34_USART0 is not set # CONFIG_SAM34_USART0 is not set
# CONFIG_SAM34_USART1 is not set # CONFIG_SAM34_USART1 is not set
# CONFIG_SAM34_USART2 is not set # CONFIG_SAM34_USART2 is not set
# CONFIG_SAM34_USART3 is not set # CONFIG_SAM34_USART3 is not set
# CONFIG_SAM34_ADC12B is not set
# CONFIG_SAM34_ADC is not set
# CONFIG_SAM34_SMC is not set
# CONFIG_SAM34_NAND is not set
# CONFIG_SAM34_DMA is not set
# CONFIG_SAM34_UDPHS is not set
# CONFIG_SAM34_RTC is not set
# CONFIG_SAM34_RTT is not set
# CONFIG_SAM34_WDT is not set
# CONFIG_SAM34_HSMCI is not set
# #
# AT91SAM3 UART Configuration # AT91SAM3/4 USART Configuration
# #
# #
# AT91SAM3 GPIO Interrupt Configuration # AT91SAM3/4 GPIO Interrupt Configuration
# #
# CONFIG_GPIOA_IRQ is not set
# CONFIG_GPIOB_IRQ is not set
# CONFIG_GPIOC_IRQ is not set
# #
# External Memory Configuration # External Memory Configuration
@@ -137,7 +177,8 @@ CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_HAVE_VFORK=y CONFIG_ARCH_HAVE_VFORK=y
CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STACKDUMP=y
# CONFIG_ENDIAN_BIG is not set # CONFIG_ENDIAN_BIG is not set
# CONFIG_ARCH_HAVE_RAMFUNCS is not set CONFIG_ARCH_HAVE_RAMFUNCS=y
# CONFIG_ARCH_RAMFUNCS is not set
CONFIG_ARCH_HAVE_RAMVECTORS=y CONFIG_ARCH_HAVE_RAMVECTORS=y
# CONFIG_ARCH_RAMVECTORS is not set # CONFIG_ARCH_RAMVECTORS is not set
@@ -286,6 +327,10 @@ CONFIG_UART0_BAUD=115200
CONFIG_UART0_BITS=8 CONFIG_UART0_BITS=8
CONFIG_UART0_PARITY=0 CONFIG_UART0_PARITY=0
CONFIG_UART0_2STOP=0 CONFIG_UART0_2STOP=0
# CONFIG_UART0_IFLOWCONTROL is not set
# CONFIG_UART0_OFLOWCONTROL is not set
# CONFIG_SERIAL_IFLOWCONTROL is not set
# CONFIG_SERIAL_OFLOWCONTROL is not set
# CONFIG_USBDEV is not set # CONFIG_USBDEV is not set
# CONFIG_USBHOST is not set # CONFIG_USBHOST is not set
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
@@ -429,7 +474,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
# CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXLINES is not set
# CONFIG_EXAMPLES_NXTEXT is not set # CONFIG_EXAMPLES_NXTEXT is not set
CONFIG_EXAMPLES_OSTEST=y CONFIG_EXAMPLES_OSTEST=y
# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
CONFIG_EXAMPLES_OSTEST_LOOPS=1 CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
configs/sam3u-ek/src/Makefile
+1 -1
View File
@@ -42,7 +42,7 @@ AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c
ifeq ($(CONFIG_SAM34_HSMCI),y) ifeq ($(CONFIG_LCD),y)
CSRCS += up_lcd.c CSRCS += up_lcd.c
endif endif
configs/sam3u-ek/src/sam3u-ek.h
+6 -1
View File
@@ -138,7 +138,12 @@
#define GPIO_LCD_BKL (GPIO_OUTPUT|GPIO_CFG_DEFAULT|GPIO_OUTPUT_CLEAR|GPIO_PORT_PIOC|GPIO_PIN19) #define GPIO_LCD_BKL (GPIO_OUTPUT|GPIO_CFG_DEFAULT|GPIO_OUTPUT_CLEAR|GPIO_PORT_PIOC|GPIO_PIN19)
/* Touchscreen controller (TSC) */ /* Touchscreen controller (TSC)
*
* BUSY is high impedance when CS is high (not selected). When CS is
* is low, BUSY is active high. Since the pin is pulled up, it will appear
* busy if CS is not selected.
*/
#define GPIO_TCS_IRQ (GPIO_INPUT|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN24) #define GPIO_TCS_IRQ (GPIO_INPUT|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN24)
#define GPIO_TCS_BUSY (GPIO_INPUT|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN2) #define GPIO_TCS_BUSY (GPIO_INPUT|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN2)
configs/sam3u-ek/src/up_lcd.c
+3 -3
View File
@@ -88,7 +88,7 @@
* other custom usage). * other custom usage).
* *
* The SAM3U4E communicates with the LCD through PIOB where a 16-bit parallel * The SAM3U4E communicates with the LCD through PIOB where a 16-bit parallel
* “8080-like” protocol data bus has to be implemented by software. * 8080-like protocol data bus has to be implemented by software.
* *
* LCD backlight is made of 4 white chip LEDs in parallel, driven by an AAT3194 * LCD backlight is made of 4 white chip LEDs in parallel, driven by an AAT3194
* charge pump, MN4. The AAT3194 is controlled by the SAM3U4E through a single line * charge pump, MN4. The AAT3194 is controlled by the SAM3U4E through a single line
@@ -125,7 +125,7 @@
#include "up_arch.h" #include "up_arch.h"
#include "sam_gpio.h" #include "sam_gpio.h"
#include "chip/sam_pmc.h" #include "chip/sam3u_pmc.h"
#include "chip/sam_smc.h" #include "chip/sam_smc.h"
#include "sam3u-ek.h" #include "sam3u-ek.h"
@@ -910,7 +910,7 @@ int up_lcdinitialize(void)
putreg32(regval, SAM_SMCCS_SETUP(2)); putreg32(regval, SAM_SMCCS_SETUP(2));
regval = (5 << SMCCS_PULSE_NWEPULSE_SHIFT) | (18 << SMCCS_PULSE_NCSWRPULSE_SHIFT) | regval = (5 << SMCCS_PULSE_NWEPULSE_SHIFT) | (18 << SMCCS_PULSE_NCSWRPULSE_SHIFT) |
(5 << SMCCS_PULSE_RDPULSE_SHIFT) | (18 << SMCCS_PULSE_NCSRDPULSE_SHIFT); (5 << SMCCS_PULSE_NRDPULSE_SHIFT) | (18 << SMCCS_PULSE_NCSRDPULSE_SHIFT);
putreg32(regval, SAM_SMCCS_PULSE(2)); putreg32(regval, SAM_SMCCS_PULSE(2));
regval = (22 << SMCCS_CYCLE_NWECYCLE_SHIFT) | (22 << SMCCS_CYCLE_NRDCYCLE_SHIFT); regval = (22 << SMCCS_CYCLE_NWECYCLE_SHIFT) | (22 << SMCCS_CYCLE_NRDCYCLE_SHIFT);
configs/sam3u-ek/src/up_nsh.c
+22 -17
View File
@@ -50,8 +50,6 @@
#include "sam_hsmci.h" #include "sam_hsmci.h"
#include "sam3u-ek.h" #include "sam3u-ek.h"
#ifdef CONFIG_SAM34_HSMCI
/**************************************************************************** /****************************************************************************
* Pre-Processor Definitions * Pre-Processor Definitions
****************************************************************************/ ****************************************************************************/
@@ -63,19 +61,10 @@
#define NSH_HAVE_USBDEV 1 #define NSH_HAVE_USBDEV 1
#define NSH_HAVE_MMCSD 1 #define NSH_HAVE_MMCSD 1
#if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0 /* Can't support MMC/SD if the card interface is not enable */
# error "Only one MMC/SD slot"
# undef CONFIG_NSH_MMCSDSLOTNO
#endif
#ifndef CONFIG_NSH_MMCSDSLOTNO #ifndef CONFIG_SAM34_HSMCI
# define CONFIG_NSH_MMCSDSLOTNO 0 # undef NSH_HAVE_MMCSD
#endif
/* Can't support USB features if USB is not enabled */
#ifndef CONFIG_USBDEV
# undef NSH_HAVE_USBDEV
#endif #endif
/* Can't support MMC/SD features if mountpoints are disabled or if SDIO support /* Can't support MMC/SD features if mountpoints are disabled or if SDIO support
@@ -86,8 +75,25 @@
# undef NSH_HAVE_MMCSD # undef NSH_HAVE_MMCSD
#endif #endif
#ifndef CONFIG_NSH_MMCSDMINOR #ifdef NSH_HAVE_MMCSD
# define CONFIG_NSH_MMCSDMINOR 0 # if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0
# error "Only one MMC/SD slot"
# undef CONFIG_NSH_MMCSDSLOTNO
# endif
# ifndef CONFIG_NSH_MMCSDMINOR
# define CONFIG_NSH_MMCSDMINOR 0
# endif
# ifndef CONFIG_NSH_MMCSDSLOTNO
# define CONFIG_NSH_MMCSDSLOTNO 0
# endif
#endif
/* Can't support USB features if USB is not enabled */
#ifndef CONFIG_USBDEV
# undef NSH_HAVE_USBDEV
#endif #endif
/* Debug ********************************************************************/ /* Debug ********************************************************************/
@@ -155,4 +161,3 @@ int nsh_archinitialize(void)
#endif #endif
return OK; return OK;
} }
#endif
configs/sam3u-ek/src/up_touchscreen.c
+3 -1
View File
@@ -183,7 +183,9 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state)
static bool last = (bool)-1; static bool last = (bool)-1;
#endif #endif
/* REVISIT: This might need to be inverted */ /* BUSY is high impedance when CS is high (not selected). When CS is
* is low, BUSY is active high.
*/
bool busy = sam_gpioread(GPIO_TCS_BUSY); bool busy = sam_gpioread(GPIO_TCS_BUSY);
#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_VERBOSE) #if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_VERBOSE)
configs/sam3u-ek/touchscreen/Make.defs
-109
View File
@@ -1,109 +0,0 @@
############################################################################
# configs/sam3u-ek/touchscreen/Make.defs
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# 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.
#
############################################################################
include ${TOPDIR}/.config
include ${TOPDIR}/tools/Config.mk
include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
ifeq ($(WINTOOL),y)
# Windows-native toolchains
DIRLINK = $(TOPDIR)/tools/copydir.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
MAXOPTIMIZATION = -O2
else
# Linux/Cygwin-native toolchain
MKDEP = $(TOPDIR)/tools/mkdeps.sh
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
endif
CC = $(CROSSDEV)gcc
CXX = $(CROSSDEV)g++
CPP = $(CROSSDEV)gcc -E
LD = $(CROSSDEV)ld
AR = $(CROSSDEV)ar rcs
NM = $(CROSSDEV)nm
OBJCOPY = $(CROSSDEV)objcopy
OBJDUMP = $(CROSSDEV)objdump
ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
ARCHOPTIMIZATION = -g
else
ARCHOPTIMIZATION = $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
endif
ARCHCFLAGS = -fno-builtin
ARCHCXXFLAGS = -fno-builtin -fno-exceptions
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
ARCHDEFINES =
ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
AFLAGS = $(CFLAGS) -D__ASSEMBLY__
NXFLATLDFLAGS1 = -r -d -warn-common
NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
LDNXFLATFLAGS = -e main -s 2048
OBJEXT = .o
LIBEXT = .a
EXEEXT =
ifneq ($(CROSSDEV),arm-nuttx-elf-)
LDFLAGS += -nostartfiles -nodefaultlibs
endif
ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
LDFLAGS += -g
endif
HOSTCC = gcc
HOSTINCLUDES = -I.
HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe
HOSTLDFLAGS =
configs/sam3u-ek/touchscreen/defconfig
-768
View File
File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More