aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2015-05-05 21:05:12 +0200
committerJakob Odersky <jodersky@gmail.com>2015-05-14 12:27:10 +0200
commit20d2c44083911cf1969dc31f37e54a569a94b407 (patch)
tree3975cfe7a644f92728a4e41034f006888f316d67
parente954f0743fc1767237d31bff9b635555f304e7ff (diff)
downloadpx4-firmware-20d2c44083911cf1969dc31f37e54a569a94b407.tar.gz
px4-firmware-20d2c44083911cf1969dc31f37e54a569a94b407.tar.bz2
px4-firmware-20d2c44083911cf1969dc31f37e54a569a94b407.zip
working bare skeleton
-rw-r--r--nuttx-configs/trifle/nsh/defconfig365
-rw-r--r--src/drivers/boards/trifle/internal.h6
-rw-r--r--src/drivers/boards/trifle/module.mk6
-rw-r--r--src/drivers/boards/trifle/up_boot.c4
-rw-r--r--src/drivers/boards/trifle/up_leds.c28
5 files changed, 95 insertions, 314 deletions
diff --git a/nuttx-configs/trifle/nsh/defconfig b/nuttx-configs/trifle/nsh/defconfig
index db418e255..8d9e198df 100644
--- a/nuttx-configs/trifle/nsh/defconfig
+++ b/nuttx-configs/trifle/nsh/defconfig
@@ -2,12 +2,12 @@
# Automatically generated file; DO NOT EDIT.
# Nuttx/ Configuration
#
+CONFIG_NUTTX_NEWCONFIG=y
#
# Build Setup
#
# CONFIG_EXPERIMENTAL is not set
-# CONFIG_DEFAULT_SMALL is not set
CONFIG_HOST_LINUX=y
# CONFIG_HOST_OSX is not set
# CONFIG_HOST_WINDOWS is not set
@@ -16,7 +16,6 @@ CONFIG_HOST_LINUX=y
#
# Build Configuration
#
-CONFIG_BUILD_FLAT=y
# CONFIG_BUILD_2PASS is not set
#
@@ -25,13 +24,11 @@ CONFIG_BUILD_FLAT=y
# CONFIG_RRLOAD_BINARY is not set
CONFIG_INTELHEX_BINARY=y
# CONFIG_MOTOROLA_SREC is not set
-# CONFIG_RAW_BINARY is not set
-# CONFIG_UBOOT_UIMAGE is not set
+CONFIG_RAW_BINARY=y
#
# Customize Header Files
#
-# CONFIG_ARCH_STDINT_H is not set
# CONFIG_ARCH_STDBOOL_H is not set
# CONFIG_ARCH_MATH_H is not set
# CONFIG_ARCH_FLOAT_H is not set
@@ -41,17 +38,12 @@ CONFIG_INTELHEX_BINARY=y
# Debug Options
#
# CONFIG_DEBUG is not set
-CONFIG_ARCH_HAVE_STACKCHECK=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
# CONFIG_DEBUG_SYMBOLS is not set
-CONFIG_ARCH_HAVE_CUSTOMOPT=y
-# CONFIG_DEBUG_NOOPT is not set
-# CONFIG_DEBUG_CUSTOMOPT is not set
-CONFIG_DEBUG_FULLOPT=y
#
# System Type
#
+# CONFIG_ARCH_8051 is not set
CONFIG_ARCH_ARM=y
# CONFIG_ARCH_AVR is not set
# CONFIG_ARCH_HC is not set
@@ -67,40 +59,29 @@ CONFIG_ARCH="arm"
#
# ARM Options
#
-# CONFIG_ARCH_CHIP_A1X is not set
# CONFIG_ARCH_CHIP_C5471 is not set
# CONFIG_ARCH_CHIP_CALYPSO is not set
# CONFIG_ARCH_CHIP_DM320 is not set
-# CONFIG_ARCH_CHIP_EFM32 is not set
# CONFIG_ARCH_CHIP_IMX is not set
CONFIG_ARCH_CHIP_KINETIS=y
# CONFIG_ARCH_CHIP_KL is not set
# CONFIG_ARCH_CHIP_LM is not set
-# CONFIG_ARCH_CHIP_TIVA is not set
# CONFIG_ARCH_CHIP_LPC17XX is not set
# CONFIG_ARCH_CHIP_LPC214X is not set
# CONFIG_ARCH_CHIP_LPC2378 is not set
# CONFIG_ARCH_CHIP_LPC31XX is not set
# CONFIG_ARCH_CHIP_LPC43XX is not set
# CONFIG_ARCH_CHIP_NUC1XX is not set
-# CONFIG_ARCH_CHIP_SAMA5 is not set
-# CONFIG_ARCH_CHIP_SAMD is not set
# CONFIG_ARCH_CHIP_SAM34 is not set
# CONFIG_ARCH_CHIP_STM32 is not set
# CONFIG_ARCH_CHIP_STR71X is not set
-# CONFIG_ARCH_ARM7TDMI is not set
-# CONFIG_ARCH_ARM926EJS is not set
-# CONFIG_ARCH_ARM920T is not set
-# CONFIG_ARCH_CORTEXM0 is not set
-# CONFIG_ARCH_CORTEXM3 is not set
CONFIG_ARCH_CORTEXM4=y
-# CONFIG_ARCH_CORTEXA5 is not set
-# CONFIG_ARCH_CORTEXA8 is not set
CONFIG_ARCH_FAMILY="armv7-m"
CONFIG_ARCH_CHIP="kinetis"
# CONFIG_ARMV7M_USEBASEPRI is not set
CONFIG_ARCH_HAVE_FPU=y
# CONFIG_ARCH_FPU is not set
+CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARMV7M_MPU is not set
#
@@ -109,8 +90,8 @@ CONFIG_ARCH_HAVE_FPU=y
# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
# CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
-CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
-# CONFIG_ARMV7M_ITMSYSLOG is not set
+CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y
+# CONFIG_ARMV7M_STACKCHECK is not set
#
# Kinetis Configuration Options
@@ -189,8 +170,10 @@ CONFIG_KINETIS_PORTEINTS=y
# Kinetis UART Configuration
#
CONFIG_KINETIS_UARTFIFOS=y
-# CONFIG_CAN_EXTID is not set
-# CONFIG_CAN_LOOPBACK is not set
+
+#
+# External Memory Configuration
+#
#
# Architecture Options
@@ -198,21 +181,12 @@ CONFIG_KINETIS_UARTFIFOS=y
# CONFIG_ARCH_NOINTC is not set
# CONFIG_ARCH_VECNOTIRQ is not set
# CONFIG_ARCH_DMA is not set
-CONFIG_ARCH_HAVE_IRQPRIO=y
-# CONFIG_ARCH_L2CACHE is not set
-# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
-# CONFIG_ARCH_HAVE_ADDRENV is not set
-# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+CONFIG_ARCH_IRQPRIO=y
+# CONFIG_CUSTOM_STACK is not set
+# CONFIG_ADDRENV is not set
CONFIG_ARCH_HAVE_VFORK=y
-# CONFIG_ARCH_HAVE_MMU is not set
-CONFIG_ARCH_HAVE_MPU=y
-# CONFIG_ARCH_NAND_HWECC is not set
-# CONFIG_ARCH_HAVE_EXTCLK is not set
-# CONFIG_ARCH_USE_MPU is not set
-# CONFIG_ARCH_IRQPRIO is not set
# CONFIG_ARCH_STACKDUMP is not set
# CONFIG_ENDIAN_BIG is not set
-# CONFIG_ARCH_IDLE_CUSTOM is not set
CONFIG_ARCH_HAVE_RAMFUNCS=y
CONFIG_ARCH_RAMFUNCS=y
CONFIG_ARCH_HAVE_RAMVECTORS=y
@@ -223,14 +197,10 @@ CONFIG_ARCH_HAVE_RAMVECTORS=y
#
CONFIG_BOARD_LOOPSPERMSEC=9535
# CONFIG_ARCH_CALIBRATION is not set
-
-#
-# Interrupt options
-#
+CONFIG_DRAM_START=0x1fff8000
+CONFIG_DRAM_SIZE=65536
CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
CONFIG_ARCH_INTERRUPTSTACK=0
-CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y
-# CONFIG_ARCH_HIPRI_INTERRUPT is not set
#
# Boot options
@@ -242,24 +212,14 @@ CONFIG_BOOT_RUNFROMFLASH=y
# CONFIG_BOOT_COPYTORAM is not set
#
-# Boot Memory Configuration
-#
-CONFIG_RAM_START=0x1fff8000
-CONFIG_RAM_SIZE=65536
-# CONFIG_ARCH_HAVE_SDRAM is not set
-
-#
# Board Selection
#
-CONFIG_ARCH_BOARD_TRIFLE=y
-#CONFIG_ARCH_BOARD_CUSTOM=
+CONFIG_ARCH_BOARD_CUSTOM=y
CONFIG_ARCH_BOARD=""
#
# Common Board Options
#
-CONFIG_ARCH_HAVE_LEDS=y
-CONFIG_ARCH_LEDS=y
CONFIG_NSH_MMCSDMINOR=0
#
@@ -269,72 +229,34 @@ CONFIG_NSH_MMCSDMINOR=0
#
# RTOS Features
#
-CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_DISABLE_SIGNALS is not set
-# CONFIG_DISABLE_MQUEUE is not set
-CONFIG_DISABLE_ENVIRON=y
-
-#
-# Clocks and Timers
-#
-CONFIG_USEC_PER_TICK=10000
-# CONFIG_SYSTEM_TIME64 is not set
-# CONFIG_CLOCK_MONOTONIC is not set
+# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_MSEC_PER_TICK=10
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_INSTRUMENTATION is not set
+CONFIG_TASK_NAME_SIZE=0
+# CONFIG_SCHED_HAVE_PARENT is not set
# CONFIG_JULIAN_TIME is not set
CONFIG_START_YEAR=2014
CONFIG_START_MONTH=1
CONFIG_START_DAY=1
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_WDOG_INTRESERVE=0
-CONFIG_PREALLOC_TIMERS=4
-
-#
-# Tasks and Scheduling
-#
-# CONFIG_INIT_NONE is not set
-CONFIG_INIT_ENTRYPOINT=y
-# CONFIG_INIT_FILEPATH is not set
-CONFIG_USER_ENTRYPOINT="nsh_main"
-CONFIG_RR_INTERVAL=200
-CONFIG_TASK_NAME_SIZE=0
-CONFIG_MAX_TASKS=16
-# CONFIG_SCHED_HAVE_PARENT is not set
-# CONFIG_SCHED_WAITPID is not set
-
-#
-# Pthread Options
-#
-# CONFIG_MUTEX_TYPES is not set
-CONFIG_NPTHREAD_KEYS=4
-
-#
-# Performance Monitoring
-#
-# CONFIG_SCHED_CPULOAD is not set
-# CONFIG_SCHED_INSTRUMENTATION is not set
-
-#
-# Files and I/O
-#
CONFIG_DEV_CONSOLE=y
+# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PRIORITY_INHERITANCE is not set
# CONFIG_FDCLONE_DISABLE is not set
# CONFIG_FDCLONE_STDIO is not set
CONFIG_SDCLONE_DISABLE=y
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
-# CONFIG_PRIORITY_INHERITANCE is not set
-
-#
-# RTOS hooks
-#
-# CONFIG_BOARD_INITIALIZE is not set
+# CONFIG_SCHED_WAITPID is not set
# CONFIG_SCHED_STARTHOOK is not set
# CONFIG_SCHED_ATEXIT is not set
# CONFIG_SCHED_ONEXIT is not set
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_CLOCK is not set
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+CONFIG_DISABLE_ENVIRON=y
#
# Signal Numbers
@@ -345,17 +267,19 @@ CONFIG_SIG_SIGALARM=3
CONFIG_SIG_SIGCONDTIMEDOUT=16
#
-# POSIX Message Queue Options
+# Sizes of configurable things (0 disables)
#
+CONFIG_MAX_TASKS=16
+CONFIG_MAX_TASK_ARGS=4
+CONFIG_NPTHREAD_KEYS=4
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
CONFIG_PREALLOC_MQ_MSGS=4
CONFIG_MQ_MAXMSGSIZE=32
-
-#
-# Work Queue Support
-#
-# CONFIG_SCHED_WORKQUEUE is not set
-# CONFIG_SCHED_HPWORK is not set
-# CONFIG_SCHED_LPWORK is not set
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=4
+CONFIG_PREALLOC_TIMERS=4
#
# Stack and heap information
@@ -364,7 +288,6 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
CONFIG_USERMAIN_STACKSIZE=2048
CONFIG_PTHREAD_STACK_MIN=256
CONFIG_PTHREAD_STACK_DEFAULT=2048
-# CONFIG_LIB_SYSCALL is not set
#
# Device Drivers
@@ -373,31 +296,15 @@ CONFIG_DISABLE_POLL=y
CONFIG_DEV_NULL=y
# CONFIG_DEV_ZERO is not set
# CONFIG_LOOP is not set
-
-#
-# Buffering
-#
-# CONFIG_DRVR_WRITEBUFFER is not set
-# CONFIG_DRVR_READAHEAD is not set
-CONFIG_RAMDISK=y
-CONFIG_CAN=y
-CONFIG_CAN_FIFOSIZE=8
-CONFIG_CAN_NPENDINGRTR=4
-# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
-CONFIG_PWM=y
-# CONFIG_ARCH_HAVE_I2CRESET is not set
+# CONFIG_RAMDISK is not set
+# CONFIG_CAN is not set
+# CONFIG_PWM is not set
# CONFIG_I2C is not set
# CONFIG_SPI is not set
-# CONFIG_I2S is not set
# CONFIG_RTC is not set
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0"
-CONFIG_TIMER=y
-CONFIG_ANALOG=y
-# CONFIG_ADC is not set
-# CONFIG_DAC is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_ANALOG is not set
# CONFIG_AUDIO_DEVICES is not set
-# CONFIG_VIDEO_DEVICES is not set
# CONFIG_BCH is not set
# CONFIG_INPUT is not set
# CONFIG_LCD is not set
@@ -407,41 +314,13 @@ CONFIG_PIPES=y
# CONFIG_PM is not set
# CONFIG_POWER is not set
# CONFIG_SENSORS is not set
-# CONFIG_SERCOMM_CONSOLE is not set
CONFIG_SERIAL=y
# CONFIG_DEV_LOWCONSOLE is not set
# CONFIG_16550_UART is not set
-# CONFIG_ARCH_HAVE_UART is not set
CONFIG_ARCH_HAVE_UART0=y
-# CONFIG_ARCH_HAVE_UART1 is not set
-# CONFIG_ARCH_HAVE_UART2 is not set
-# CONFIG_ARCH_HAVE_UART3 is not set
-# CONFIG_ARCH_HAVE_UART4 is not set
-# CONFIG_ARCH_HAVE_UART5 is not set
-# CONFIG_ARCH_HAVE_UART6 is not set
-# CONFIG_ARCH_HAVE_UART7 is not set
-# CONFIG_ARCH_HAVE_UART8 is not set
-# CONFIG_ARCH_HAVE_SCI0 is not set
-# CONFIG_ARCH_HAVE_SCI1 is not set
-# CONFIG_ARCH_HAVE_USART0 is not set
-# CONFIG_ARCH_HAVE_USART1 is not set
-# CONFIG_ARCH_HAVE_USART2 is not set
-# CONFIG_ARCH_HAVE_USART3 is not set
-# CONFIG_ARCH_HAVE_USART4 is not set
-# CONFIG_ARCH_HAVE_USART5 is not set
-# CONFIG_ARCH_HAVE_USART6 is not set
-# CONFIG_ARCH_HAVE_USART7 is not set
-# CONFIG_ARCH_HAVE_USART8 is not set
-# CONFIG_ARCH_HAVE_OTHER_UART is not set
-
-#
-# USART Configuration
-#
CONFIG_MCU_SERIAL=y
CONFIG_STANDARD_SERIAL=y
-# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
CONFIG_UART0_SERIAL_CONSOLE=y
-# CONFIG_OTHER_SERIAL_CONSOLE is not set
# CONFIG_NO_SERIAL_CONSOLE is not set
#
@@ -473,16 +352,9 @@ CONFIG_UART0_2STOP=0
#
# Networking Support
#
-# CONFIG_ARCH_HAVE_NET is not set
-# CONFIG_ARCH_HAVE_PHY is not set
# CONFIG_NET is not set
#
-# Crypto API
-#
-# CONFIG_CRYPTO is not set
-
-#
# File Systems
#
@@ -490,20 +362,14 @@ CONFIG_UART0_2STOP=0
# File system configuration
#
CONFIG_DISABLE_MOUNTPOINT=y
-# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
-# CONFIG_FS_READABLE is not set
-# CONFIG_FS_WRITABLE is not set
-# CONFIG_FS_NAMED_SEMAPHORES is not set
-CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
# CONFIG_FS_RAMMAP is not set
# CONFIG_FS_BINFS is not set
-# CONFIG_FS_PROCFS is not set
#
# System Logging
#
+# CONFIG_SYSLOG_ENABLE is not set
# CONFIG_SYSLOG is not set
-# CONFIG_SYSLOG_TIMESTAMP is not set
#
# Graphics Support
@@ -513,9 +379,9 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
#
# Memory Management
#
+# CONFIG_MM_MULTIHEAP is not set
# CONFIG_MM_SMALL is not set
CONFIG_MM_REGIONS=1
-# CONFIG_ARCH_HAVE_HEAP2 is not set
# CONFIG_GRAN is not set
#
@@ -524,7 +390,7 @@ CONFIG_MM_REGIONS=1
# CONFIG_AUDIO is not set
#
-# Binary Loader
+# Binary Formats
#
# CONFIG_BINFMT_DISABLE is not set
# CONFIG_NXFLAT is not set
@@ -552,7 +418,6 @@ CONFIG_LIB_RAND_ORDER=1
# CONFIG_EOL_IS_BOTH_CRLF is not set
CONFIG_EOL_IS_EITHER_CRLF=y
CONFIG_LIBC_EXECFUNCS=y
-CONFIG_EXECFUNCS_HAVE_SYMTAB=y
CONFIG_EXECFUNCS_SYMTAB="g_symtab"
CONFIG_EXECFUNCS_NSYMBOLS=0
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
@@ -568,6 +433,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
#
# Non-standard Library Support
#
+# CONFIG_SCHED_WORKQUEUE is not set
# CONFIG_LIB_KBDCODEC is not set
# CONFIG_LIB_SLCDCODEC is not set
@@ -591,8 +457,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
#
# CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set
-# CONFIG_EXAMPLES_CONFIGDATA is not set
-# CONFIG_EXAMPLES_CPUHOG is not set
+# CONFIG_EXAMPLES_COMPOSITE is not set
# CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set
# CONFIG_EXAMPLES_FTPC is not set
@@ -603,6 +468,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
# CONFIG_EXAMPLES_HIDKBD is not set
# CONFIG_EXAMPLES_KEYPADTEST is not set
# CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_LCDRW is not set
# CONFIG_EXAMPLES_MM is not set
# CONFIG_EXAMPLES_MODBUS is not set
# CONFIG_EXAMPLES_MOUNT is not set
@@ -610,7 +476,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
CONFIG_EXAMPLES_NSH=y
# CONFIG_EXAMPLES_NULL is not set
# CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
+# CONFIG_EXAMPLES_NXCONSOLE is not set
# CONFIG_EXAMPLES_NXFFS is not set
# CONFIG_EXAMPLES_NXFLAT is not set
# CONFIG_EXAMPLES_NXHELLO is not set
@@ -623,15 +489,13 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=8
CONFIG_EXAMPLES_OSTEST_RR_RANGE=10000
CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
+# CONFIG_EXAMPLES_PASHELLO is not set
# CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PWM is not set
# CONFIG_EXAMPLES_POSIXSPAWN is not set
# CONFIG_EXAMPLES_QENCODER is not set
# CONFIG_EXAMPLES_RGMP is not set
# CONFIG_EXAMPLES_ROMFS is not set
# CONFIG_EXAMPLES_SENDMAIL is not set
-# CONFIG_EXAMPLES_SERIALBLASTER is not set
-# CONFIG_EXAMPLES_SERIALRX is not set
# CONFIG_EXAMPLES_SERLOOP is not set
# CONFIG_EXAMPLES_SLCD is not set
# CONFIG_EXAMPLES_SMART_TEST is not set
@@ -642,8 +506,9 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# CONFIG_EXAMPLES_TIFF is not set
# CONFIG_EXAMPLES_TOUCHSCREEN is not set
# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
+# CONFIG_EXAMPLES_UIP is not set
# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_USBMSC is not set
# CONFIG_EXAMPLES_USBTERM is not set
# CONFIG_EXAMPLES_WATCHDOG is not set
@@ -666,14 +531,17 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# Networking Utilities
#
# CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_DHCPC is not set
# CONFIG_NETUTILS_DHCPD is not set
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
+# CONFIG_NETUTILS_RESOLV is not set
# CONFIG_NETUTILS_SMTP is not set
+# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
+# CONFIG_NETUTILS_UIPLIB is not set
# CONFIG_NETUTILS_WEBCLIENT is not set
#
@@ -685,32 +553,16 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# NSH Library
#
CONFIG_NSH_LIBRARY=y
-
-#
-# Command Line Configuration
-#
-# CONFIG_NSH_READLINE is not set
-CONFIG_NSH_CLE=y
-CONFIG_NSH_LINELEN=80
-# CONFIG_NSH_DISABLE_SEMICOLON is not set
-CONFIG_NSH_MAXARGUMENTS=6
-CONFIG_NSH_ARGCAT=y
-CONFIG_NSH_NESTDEPTH=3
-# CONFIG_NSH_DISABLEBG is not set
CONFIG_NSH_BUILTIN_APPS=y
# CONFIG_NSH_FILE_APPS is not set
#
# Disable Individual commands
#
-# CONFIG_NSH_DISABLE_ADDROUTE is not set
# CONFIG_NSH_DISABLE_CAT is not set
# CONFIG_NSH_DISABLE_CD is not set
# CONFIG_NSH_DISABLE_CP is not set
-# CONFIG_NSH_DISABLE_CMP is not set
# CONFIG_NSH_DISABLE_DD is not set
-# CONFIG_NSH_DISABLE_DF is not set
-# CONFIG_NSH_DISABLE_DELROUTE is not set
# CONFIG_NSH_DISABLE_ECHO is not set
# CONFIG_NSH_DISABLE_EXEC is not set
# CONFIG_NSH_DISABLE_EXIT is not set
@@ -724,12 +576,15 @@ CONFIG_NSH_BUILTIN_APPS=y
# CONFIG_NSH_DISABLE_LS is not set
# CONFIG_NSH_DISABLE_MB is not set
# CONFIG_NSH_DISABLE_MKDIR is not set
+# CONFIG_NSH_DISABLE_MKFATFS is not set
# CONFIG_NSH_DISABLE_MKFIFO is not set
# CONFIG_NSH_DISABLE_MKRD is not set
# CONFIG_NSH_DISABLE_MH is not set
# CONFIG_NSH_DISABLE_MOUNT is not set
# CONFIG_NSH_DISABLE_MW is not set
+# CONFIG_NSH_DISABLE_NSFMOUNT is not set
# CONFIG_NSH_DISABLE_PS is not set
+# CONFIG_NSH_DISABLE_PING is not set
# CONFIG_NSH_DISABLE_PUT is not set
# CONFIG_NSH_DISABLE_PWD is not set
# CONFIG_NSH_DISABLE_RM is not set
@@ -749,22 +604,19 @@ CONFIG_NSH_BUILTIN_APPS=y
#
CONFIG_NSH_CMDOPT_DF_H=y
CONFIG_NSH_CODECS_BUFSIZE=128
-CONFIG_NSH_CMDOPT_HEXDUMP=y
CONFIG_NSH_FILEIOSIZE=1024
# CONFIG_NSH_STRERROR is not set
-
-#
-# Scripting Support
-#
+CONFIG_NSH_LINELEN=80
+CONFIG_NSH_MAXARGUMENTS=6
+CONFIG_NSH_NESTDEPTH=3
# CONFIG_NSH_DISABLESCRIPT is not set
-# CONFIG_NSH_DISABLE_ITEF is not set
-# CONFIG_NSH_DISABLE_LOOPS is not set
+# CONFIG_NSH_DISABLEBG is not set
+CONFIG_NSH_CONSOLE=y
#
-# Console Configuration
+# USB Trace Support
#
-CONFIG_NSH_CONSOLE=y
-# CONFIG_NSH_ALTCONDEV is not set
+# CONFIG_NSH_CONDEV is not set
# CONFIG_NSH_ARCHINIT is not set
#
@@ -772,12 +624,7 @@ CONFIG_NSH_CONSOLE=y
#
#
-# Platform-specific Support
-#
-# CONFIG_PLATFORM_CONFIGDATA is not set
-
-#
-# System Libraries and NSH Add-Ons
+# System NSH Add-Ons
#
#
@@ -786,10 +633,8 @@ CONFIG_NSH_CONSOLE=y
# CONFIG_SYSTEM_FREE is not set
#
-# EMACS-like Command Line Editor
+# I2C tool
#
-CONFIG_SYSTEM_CLE=y
-CONFIG_SYSTEM_CLE_DEBUGLEVEL=0
#
# FLASH Program Installation
@@ -801,43 +646,12 @@ CONFIG_SYSTEM_CLE_DEBUGLEVEL=0
#
#
-# Intel HEX to binary conversion
-#
-# CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_SYSTEM_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-
-#
-# RAM test
-#
-# CONFIG_SYSTEM_RAMTEST is not set
-
-#
# readline()
#
CONFIG_SYSTEM_READLINE=y
CONFIG_READLINE_ECHO=y
#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
# Power Off
#
# CONFIG_SYSTEM_POWEROFF is not set
@@ -853,45 +667,14 @@ CONFIG_READLINE_ECHO=y
# CONFIG_SYSTEM_SDCARD is not set
#
-# Sudoku
-#
-# CONFIG_SYSTEM_SUDOKU is not set
-
-#
# Sysinfo
#
# CONFIG_SYSTEM_SYSINFO is not set
#
-# VI Work-Alike Editor
-#
-# CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
# USB Monitor
#
-#
-# Zmodem Commands
-#
-# CONFIG_SYSTEM_ZMODEM is not set
-
# Application configuration
CONFIG_APPS_DIR="../apps"
diff --git a/src/drivers/boards/trifle/internal.h b/src/drivers/boards/trifle/internal.h
new file mode 100644
index 000000000..7f239dce7
--- /dev/null
+++ b/src/drivers/boards/trifle/internal.h
@@ -0,0 +1,6 @@
+#ifndef INTERNAL_H
+#define INTERNAL_H
+
+void led_init(void);
+
+#endif
diff --git a/src/drivers/boards/trifle/module.mk b/src/drivers/boards/trifle/module.mk
index 2e358f2b4..1baa35ed0 100644
--- a/src/drivers/boards/trifle/module.mk
+++ b/src/drivers/boards/trifle/module.mk
@@ -2,8 +2,6 @@
# Board-specific startup code for the CONDOR
#
-SRCS = cfmconfig.c \
- up_boot.c \
- up_leds.c
+SRCS = cfmconfig.c up_boot.c up_leds.c
-MAXOPTIMIZATION = -Os
+MAXOPTIMIZATION = -Os
diff --git a/src/drivers/boards/trifle/up_boot.c b/src/drivers/boards/trifle/up_boot.c
index bc0d317cc..1d760df39 100644
--- a/src/drivers/boards/trifle/up_boot.c
+++ b/src/drivers/boards/trifle/up_boot.c
@@ -41,7 +41,7 @@
#include <debug.h>
#include <arch/board/board.h>
-#include "up_internal.h"
+#include "internal.h"
/************************************************************************************
@@ -68,5 +68,5 @@
__EXPORT void kinetis_boardinitialize(void)
{
- board_led_initialize();
+ led_init();
}
diff --git a/src/drivers/boards/trifle/up_leds.c b/src/drivers/boards/trifle/up_leds.c
index 88d13612a..7cb25f86e 100644
--- a/src/drivers/boards/trifle/up_leds.c
+++ b/src/drivers/boards/trifle/up_leds.c
@@ -40,9 +40,11 @@
#include <nuttx/config.h>
+#include <arch/board/board.h>
#include <stdbool.h>
#include <debug.h>
-#include "up_internal.h"
+#include "kinetis_internal.h"
+#include "internal.h"
/****************************************************************************
* Definitions
@@ -80,9 +82,8 @@
*
****************************************************************************/
-#include "kinetis_internal.h"
-#ifdef CONFIG_ARCH_LEDS
+//#ifdef CONFIG_ARCH_LEDS
#define GPIO_LED0 (PIN_PORTC | PIN5 | GPIO_HIGHDRIVE | GPIO_OUTPUT_ONE)
#define GPIO_LED1 (PIN_PORTD | PIN1 | GPIO_HIGHDRIVE | GPIO_OUTPUT_ONE)
@@ -130,7 +131,7 @@ static void set_led(int led, bool value)
}
}
-void board_led_initialize(void)
+__EXPORT void led_init(void)
{
volatile unsigned long counter = 0;
@@ -174,22 +175,15 @@ void board_led_initialize(void)
}
}
-/****************************************************************************
- * Name: board_led_on
- ****************************************************************************/
-
-__EXPORT void board_led_on(int led)
+/*
+static void led_on(int led)
{
- set_led(led, true);
+ set_led(led, true);
}
-/****************************************************************************
- * Name: board_led_off
- ****************************************************************************/
-
-__EXPORT void board_led_off(int led)
+static void led_off(int led)
{
set_led(led, false);
-}
+ }*/
-#endif /* CONFIG_ARCH_LEDS */
+//#endif /* CONFIG_ARCH_LEDS */