From 83bb4ede6652944d738d9fa865b68c2fc0acc470 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 25 Feb 2015 07:22:58 -0600 Subject: Refresh configuration --- nuttx/arch/mips/src/pic32mz/Kconfig | 1 - nuttx/configs/sam4s-xplained-pro/nsh/defconfig | 64 +++++++++++++++++++++----- nuttx/drivers/timers/Kconfig | 14 +++--- 3 files changed, 59 insertions(+), 20 deletions(-) diff --git a/nuttx/arch/mips/src/pic32mz/Kconfig b/nuttx/arch/mips/src/pic32mz/Kconfig index 0eb810eec..5c4dff9d7 100644 --- a/nuttx/arch/mips/src/pic32mz/Kconfig +++ b/nuttx/arch/mips/src/pic32mz/Kconfig @@ -367,7 +367,6 @@ config CONFIG_PIC32MZ_OSCIOFNC config PIC32MZ_WDTENABLE bool "Watchdog enable" default 0 - range 0 1 ---help--- Enabled watchdog on power up. Default 0 (watchdog can be enabled later by software). diff --git a/nuttx/configs/sam4s-xplained-pro/nsh/defconfig b/nuttx/configs/sam4s-xplained-pro/nsh/defconfig index 2946d18da..ce6771de4 100644 --- a/nuttx/configs/sam4s-xplained-pro/nsh/defconfig +++ b/nuttx/configs/sam4s-xplained-pro/nsh/defconfig @@ -43,8 +43,9 @@ CONFIG_RAW_BINARY=y # Debug Options # # CONFIG_DEBUG is not set -CONFIG_ARCH_HAVE_STACKCHECK=y # CONFIG_ARCH_HAVE_HEAPCHECK is not set +CONFIG_ARCH_HAVE_STACKCHECK=y +# CONFIG_STACK_COLORATION is not set CONFIG_DEBUG_SYMBOLS=y CONFIG_ARCH_HAVE_CUSTOMOPT=y # CONFIG_DEBUG_NOOPT is not set @@ -73,6 +74,7 @@ CONFIG_ARCH="arm" # 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 is not set # CONFIG_ARCH_CHIP_KL is not set @@ -112,6 +114,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set # CONFIG_ARMV7M_OABI_TOOLCHAIN is not set +# CONFIG_ARMV7M_ITMSYSLOG is not set CONFIG_ARCH_HAVE_EXTNAND=y CONFIG_ARCH_HAVE_EXTNOR=y CONFIG_ARCH_HAVE_EXTSRAM0=y @@ -214,6 +217,9 @@ CONFIG_SAM34_EXTNANDSIZE=268435456 # # AT91SAM3/4 GPIO Interrupt Configuration # +# CONFIG_SAM34_HAVE_GPIOD_IRQ is not set +# CONFIG_SAM34_HAVE_GPIOE_IRQ is not set +# CONFIG_SAM34_HAVE_GPIOF_IRQ is not set CONFIG_SAM34_GPIO_IRQ=y # CONFIG_SAM34_GPIOA_IRQ is not set # CONFIG_SAM34_GPIOB_IRQ is not set @@ -354,6 +360,9 @@ 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=50 CONFIG_TASK_NAME_SIZE=15 @@ -392,6 +401,7 @@ CONFIG_NAME_MAX=32 # RTOS hooks # CONFIG_BOARD_INITIALIZE=y +# CONFIG_BOARD_INITTHREAD is not set # CONFIG_SCHED_STARTHOOK is not set # CONFIG_SCHED_ATEXIT is not set # CONFIG_SCHED_ONEXIT is not set @@ -411,6 +421,16 @@ CONFIG_SIG_SIGWORK=17 CONFIG_PREALLOC_MQ_MSGS=8 CONFIG_MQ_MAXMSGSIZE=32 +# +# Work Queue Support +# +CONFIG_SCHED_WORKQUEUE=y +CONFIG_SCHED_HPWORK=y +CONFIG_SCHED_HPWORKPRIORITY=224 +CONFIG_SCHED_HPWORKPERIOD=50000 +CONFIG_SCHED_HPWORKSTACKSIZE=2048 +# CONFIG_SCHED_LPWORK is not set + # # Stack and heap information # @@ -441,14 +461,15 @@ CONFIG_DEV_ZERO=y # CONFIG_I2C is not set # CONFIG_SPI is not set # CONFIG_I2S is not set +CONFIG_TIMER=y CONFIG_RTC=y # CONFIG_RTC_DATETIME is not set CONFIG_RTC_HIRES=y CONFIG_RTC_FREQUENCY=32768 CONFIG_RTC_ALARM=y +# CONFIG_RTC_DRIVER is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0" -CONFIG_TIMER=y # CONFIG_ANALOG is not set # CONFIG_AUDIO_DEVICES is not set # CONFIG_VIDEO_DEVICES is not set @@ -462,11 +483,13 @@ CONFIG_MMCSD_NSLOTS=1 CONFIG_MMCSD_MMCSUPPORT=y CONFIG_MMCSD_HAVECARDDETECT=y CONFIG_ARCH_HAVE_SDIO=y +# CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set CONFIG_MMCSD_SDIO=y # CONFIG_SDIO_PREFLIGHT is not set # CONFIG_SDIO_MUXBUS is not set CONFIG_SDIO_BLOCKSETUP=y # CONFIG_MTD is not set +# CONFIG_EEPROM is not set CONFIG_PIPES=y # CONFIG_PM is not set # CONFIG_POWER is not set @@ -497,6 +520,7 @@ CONFIG_ARCH_HAVE_USART1=y # 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 @@ -504,9 +528,14 @@ CONFIG_ARCH_HAVE_USART1=y CONFIG_USART1_ISUART=y CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y +# CONFIG_SERIAL_IFLOWCONTROL is not set +# CONFIG_SERIAL_OFLOWCONTROL is not set +CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y +# CONFIG_SERIAL_TERMIOS is not set # CONFIG_UART0_SERIAL_CONSOLE is not set CONFIG_UART1_SERIAL_CONSOLE=y # CONFIG_USART1_SERIAL_CONSOLE is not set +# CONFIG_OTHER_SERIAL_CONSOLE is not set # CONFIG_NO_SERIAL_CONSOLE is not set # @@ -544,8 +573,6 @@ CONFIG_USART1_PARITY=0 CONFIG_USART1_2STOP=0 # CONFIG_USART1_IFLOWCONTROL is not set # CONFIG_USART1_OFLOWCONTROL is not set -# CONFIG_SERIAL_IFLOWCONTROL is not set -# CONFIG_SERIAL_OFLOWCONTROL is not set CONFIG_USBDEV=y # @@ -598,6 +625,7 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial" # System Logging # # CONFIG_RAMLOG is not set +# CONFIG_SYSLOG_CONSOLE is not set # # Networking Support @@ -623,6 +651,8 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial" # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set CONFIG_FS_READABLE=y CONFIG_FS_WRITABLE=y +# CONFIG_FS_NAMED_SEMAPHORES is not set +CONFIG_FS_MQUEUE_MPATH="/var/mqueue" # CONFIG_FS_RAMMAP is not set CONFIG_FS_FAT=y # CONFIG_FAT_LCNAMES is not set @@ -646,8 +676,8 @@ CONFIG_FS_PROCFS=y # # System Logging # - # CONFIG_SYSLOG is not set +# CONFIG_SYSLOG_TIMESTAMP is not set # # Graphics Support @@ -668,7 +698,7 @@ CONFIG_MM_REGIONS=1 # CONFIG_AUDIO is not set # -# Binary Formats +# Binary Loader # # CONFIG_BINFMT_DISABLE is not set # CONFIG_NXFLAT is not set @@ -690,6 +720,7 @@ CONFIG_NUNGET_CHARS=2 # CONFIG_LIBM is not set # CONFIG_NOPRINTF_FIELDWIDTH is not set # CONFIG_LIBC_FLOATINGPOINT is not set +# CONFIG_LIBC_IOCTL_VARIADIC is not set CONFIG_LIB_RAND_ORDER=1 # CONFIG_EOL_IS_CR is not set # CONFIG_EOL_IS_LF is not set @@ -701,6 +732,8 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048 CONFIG_LIBC_STRERROR=y CONFIG_LIBC_STRERROR_SHORT=y # CONFIG_LIBC_PERROR_STDOUT is not set +CONFIG_LIBC_TMPDIR="/tmp" +CONFIG_LIBC_MAX_TMPFILE=32 CONFIG_ARCH_LOWPUTC=y CONFIG_LIB_SENDFILE_BUFSIZE=512 # CONFIG_ARCH_ROMGETC is not set @@ -709,8 +742,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # # Non-standard Library Support # -CONFIG_SCHED_WORKQUEUE=y -# CONFIG_SCHED_HPWORK is not set # CONFIG_LIB_KBDCODEC is not set # CONFIG_LIB_SLCDCODEC is not set @@ -791,9 +822,9 @@ CONFIG_EXAMPLES_SERIALRX_PRIORITY=50 # CONFIG_EXAMPLES_TCPECHO is not set # CONFIG_EXAMPLES_TELNETD is not set # CONFIG_EXAMPLES_THTTPD is not set +# CONFIG_EXAMPLES_TIMER is not set # 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_USBSERIAL is not set # CONFIG_EXAMPLES_USBTERM is not set @@ -803,12 +834,15 @@ CONFIG_EXAMPLES_SERIALRX_PRIORITY=50 # Graphics Support # # CONFIG_TIFF is not set +# CONFIG_GRAPHICS_TRAVELER is not set # # Interpreters # +# CONFIG_INTERPRETERS_BAS is not set # CONFIG_INTERPRETERS_FICL is not set # CONFIG_INTERPRETERS_PCODE is not set +# CONFIG_INTERPRETERS_MICROPYTHON is not set # # Network Utilities @@ -818,7 +852,6 @@ CONFIG_EXAMPLES_SERIALRX_PRIORITY=50 # Networking Utilities # # CONFIG_NETUTILS_CODECS 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 @@ -846,7 +879,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_LINELEN=80 # CONFIG_NSH_DISABLE_SEMICOLON is not set CONFIG_NSH_CMDPARMS=y -CONFIG_NSH_TMPDIR="/tmp" CONFIG_NSH_MAXARGUMENTS=6 CONFIG_NSH_ARGCAT=y CONFIG_NSH_NESTDEPTH=3 @@ -946,6 +978,11 @@ CONFIG_NSH_ARCHINIT=y # # CONFIG_SYSTEM_CLE is not set +# +# CU Minimal Terminal +# +# CONFIG_SYSTEM_CUTERM is not set + # # FLASH Program Installation # @@ -972,7 +1009,6 @@ CONFIG_NSH_ARCHINIT=y # # NxPlayer media player library / command Line # -# CONFIG_SYSTEM_NXPLAYER is not set # # RAM test @@ -1019,6 +1055,10 @@ CONFIG_READLINE_ECHO=y CONFIG_SYSTEM_SYSINFO=y CONFIG_SYSTEM_SYSINFO_STACKSIZE=1024 +# +# Temperature +# + # # VI Work-Alike Editor # diff --git a/nuttx/drivers/timers/Kconfig b/nuttx/drivers/timers/Kconfig index ee4698d88..5e918b65b 100644 --- a/nuttx/drivers/timers/Kconfig +++ b/nuttx/drivers/timers/Kconfig @@ -61,6 +61,13 @@ config RTC_FREQUENCY endif # !RTC_DATETIME +config RTC_ALARM + bool "RTC Alarm Support" + default n + ---help--- + Enable if the RTC hardware supports setting of an alarm. A callback + function will be executed when the alarm goes off. + config RTC_DRIVER bool "RTC Driver Support" default n @@ -71,13 +78,6 @@ config RTC_DRIVER if RTC_DRIVER -config RTC_ALARM - bool "RTC Alarm Support" - default n - ---help--- - Enable if the RTC hardware supports setting of an alarm. A callback - function will be executed when the alarm goes off. - config RTC_PERIODIC bool "RTC Periodic Interrupts" default n -- cgit v1.2.3