summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-11-04 09:29:27 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-11-04 09:29:27 -0600
commitf3c0a837951a43962f774ccc49ccf5ffebe16867 (patch)
treef6cdfdf44c04bdd34f166a004f87a2ac5ed1e16e
parent3431328cc6cc0e34d0f746b096cf5ee1bf49643f (diff)
downloadnuttx-f3c0a837951a43962f774ccc49ccf5ffebe16867.tar.gz
nuttx-f3c0a837951a43962f774ccc49ccf5ffebe16867.tar.bz2
nuttx-f3c0a837951a43962f774ccc49ccf5ffebe16867.zip
configs/mikroe-stm32f4/fulldemo updated by Ken Pettit
-rw-r--r--nuttx/ChangeLog2
-rw-r--r--nuttx/configs/mikroe-stm32f4/fulldemo/defconfig114
2 files changed, 98 insertions, 18 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 1a0700ed8..323ecb80c 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5960,3 +5960,5 @@
Ken Pettit (2013-11-4).
* configs/sim/configdata: MTD configuration driver unit test for
the simulation platform. From Ken Pettit (2013-11-4).
+ * configs/mikroe-stm32f4/fulldemo: Configuration updated by Ken
+ Pettit (2013-11-4).
diff --git a/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig b/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig
index cf2e58c02..7dcacfc51 100644
--- a/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -38,9 +38,35 @@ CONFIG_RAW_BINARY=y
#
# Debug Options
#
-# CONFIG_DEBUG is not set
+CONFIG_DEBUG=y
CONFIG_ARCH_HAVE_STACKCHECK=y
-# CONFIG_DEBUG_SYMBOLS is not set
+# CONFIG_DEBUG_VERBOSE is not set
+
+#
+# Subsystem Debug Options
+#
+# CONFIG_DEBUG_MM is not set
+# CONFIG_DEBUG_SCHED is not set
+# CONFIG_DEBUG_USB is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_LIB is not set
+# CONFIG_DEBUG_BINFMT is not set
+# CONFIG_DEBUG_GRAPHICS is not set
+# CONFIG_DEBUG_IRQ is not set
+CONFIG_DEBUG_STACK=y
+
+#
+# Driver Debug Options
+#
+# CONFIG_DEBUG_LCD is not set
+# CONFIG_DEBUG_INPUT is not set
+# CONFIG_DEBUG_ANALOG is not set
+# CONFIG_DEBUG_SPI is not set
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_DMA is not set
+# CONFIG_DEBUG_RTC is not set
+# CONFIG_DEBUG_AUDIO is not set
+CONFIG_DEBUG_SYMBOLS=y
#
# System Type
@@ -95,6 +121,7 @@ CONFIG_ARCH_HAVE_FPU=y
# CONFIG_ARCH_FPU is not set
CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARMV7M_MPU is not set
+# CONFIG_DEBUG_HARDFAULT is not set
#
# ARMV7M Configuration Options
@@ -154,6 +181,7 @@ CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
# CONFIG_ARCH_CHIP_STM32F105VBT7 is not set
# CONFIG_ARCH_CHIP_STM32F107VC is not set
# CONFIG_ARCH_CHIP_STM32F207IG is not set
+# CONFIG_ARCH_CHIP_STM32F207ZE is not set
# CONFIG_ARCH_CHIP_STM32F302CB is not set
# CONFIG_ARCH_CHIP_STM32F302CC is not set
# CONFIG_ARCH_CHIP_STM32F302RB is not set
@@ -348,7 +376,9 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
CONFIG_MIKROE_FLASH=y
CONFIG_MIKROE_FLASH_MINOR=0
CONFIG_MIKROE_FLASH_PART=y
-CONFIG_MIKROE_FLASH_PART_LIST="256,768"
+CONFIG_MIKROE_FLASH_CONFIG_PART=y
+CONFIG_MIKROE_FLASH_CONFIG_PART_NUMBER=0
+CONFIG_MIKROE_FLASH_PART_LIST="8,248,768"
# CONFIG_MIKROE_RAMMTD is not set
#
@@ -375,7 +405,7 @@ CONFIG_SCHED_WAITPID=y
# CONFIG_SCHED_ATEXIT is not set
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_ONEXIT_MAX=4
-CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_USER_ENTRYPOINT="nxwm_main"
CONFIG_DISABLE_OS_API=y
# CONFIG_DISABLE_CLOCK is not set
# CONFIG_DISABLE_POSIX_TIMERS is not set
@@ -495,6 +525,8 @@ CONFIG_MTD=y
#
CONFIG_MTD_PARTITION=y
CONFIG_MTD_BYTE_WRITE=y
+CONFIG_MTD_CONFIG=y
+CONFIG_MTD_CONFIG_ERASEDVALUE=0xFF
#
# MTD Device Drivers
@@ -534,6 +566,7 @@ CONFIG_ARCH_HAVE_USART2=y
CONFIG_USART2_ISUART=y
CONFIG_MCU_SERIAL=y
CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
# CONFIG_USART2_SERIAL_CONSOLE is not set
CONFIG_NO_SERIAL_CONSOLE=y
@@ -605,6 +638,8 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
#
# Networking Support
#
+# CONFIG_ARCH_HAVE_NET is not set
+# CONFIG_ARCH_HAVE_PHY is not set
# CONFIG_NET is not set
#
@@ -890,6 +925,7 @@ CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4
# CONFIG_EXAMPLES_PIPE is not set
# CONFIG_EXAMPLES_POSIXSPAWN is not set
# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_RANDOM is not set
# CONFIG_EXAMPLES_RGMP is not set
# CONFIG_EXAMPLES_ROMFS is not set
# CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1005,6 +1041,7 @@ CONFIG_NSH_BUILTIN_APPS=y
#
CONFIG_NSH_CMDOPT_DF_H=y
CONFIG_NSH_CODECS_BUFSIZE=128
+CONFIG_NSH_CMDOPT_HEXDUMP=y
CONFIG_NSH_FILEIOSIZE=512
CONFIG_NSH_STRERROR=y
CONFIG_NSH_LINELEN=64
@@ -1012,13 +1049,24 @@ CONFIG_NSH_MAXARGUMENTS=6
CONFIG_NSH_NESTDEPTH=3
# CONFIG_NSH_DISABLESCRIPT is not set
# CONFIG_NSH_DISABLEBG is not set
-# CONFIG_NSH_ROMFSETC is not set
+CONFIG_NSH_ROMFSETC=y
+# CONFIG_NSH_ROMFSRC is not set
+CONFIG_NSH_ROMFSMOUNTPT="/etc"
+CONFIG_NSH_INITSCRIPT="init.d/rcS"
+CONFIG_NSH_ROMFSDEVNO=0
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_ARCHROMFS=y
+CONFIG_NSH_FATDEVNO=0
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT="/tmp"
CONFIG_NSH_CONSOLE=y
# CONFIG_NSH_USBCONSOLE is not set
#
# USB Trace Support
#
+# CONFIG_NSH_USBDEV_TRACE is not set
# CONFIG_NSH_CONDEV is not set
CONFIG_NSH_ARCHINIT=y
@@ -1070,7 +1118,7 @@ CONFIG_NXWIDGETS_CURSORCONTROL_SIZE=4
CONFIG_NXWM=y
#
-# General settings
+# NxWM General settings
#
# CONFIG_NXWM_SYSTEM_CUSTOM_FONTID is not set
CONFIG_NXWM_UNITTEST=y
@@ -1083,6 +1131,16 @@ CONFIG_NXWM_UNITTEST=y
# CONFIG_NXWM_CUSTOM_TEXTCOLORS is not set
#
+# Background Image
+#
+# CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
+CONFIG_NXWM_BACKGROUND_IMAGE=""
+
+#
+# NxWM Taskbar Configuration
+#
+
+#
# Horizontal and vertical spacing of icons in the task bar
#
CONFIG_NXWM_TASKBAR_VSPACING=2
@@ -1092,27 +1150,22 @@ CONFIG_NXWM_TASKBAR_HSPACING=2
CONFIG_NXWM_TASKBAR_LEFT=y
# CONFIG_NXWM_TASKBAR_RIGHT is not set
# CONFIG_NXWM_CUSTOM_TASKBAR_WIDTH is not set
+# CONFIG_NXWM_TASKBAR_ICONSCALE is not set
# CONFIG_NXWM_DISABLE_MINIMIZE is not set
# CONFIG_NXWM_TASKBAR_NO_BORDER is not set
#
-# Tool Bar Configuration
+# NxWM Toolbar Configuration
#
# CONFIG_NXWM_CUSTOM_TOOLBAR_HEIGHT is not set
#
-# Background Image
-#
-# CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
-CONFIG_NXWM_BACKGROUND_IMAGE=""
-
-#
-# Application Window Configuration
+# NxWM Application Window Configuration
#
# CONFIG_NXWM_CUSTOM_APPWINDOW_ICONS is not set
#
-# Start Window Configuration
+# NxWM Start Window Configuration
#
#
@@ -1135,6 +1188,10 @@ CONFIG_NXWM_NXCONSOLE_STACKSIZE=2048
# CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set
# CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID is not set
# CONFIG_NXWM_CUSTOM_NXCONSOLE_ICON is not set
+
+#
+# NxWM Touchscreen Configuration
+#
CONFIG_NXWM_TOUCHSCREEN=y
#
@@ -1145,6 +1202,11 @@ CONFIG_NXWM_TOUCHSCREEN_DEVPATH="/dev/input0"
CONFIG_NXWM_TOUCHSCREEN_SIGNO=5
CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=100
CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1024
+CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA=y
+
+#
+# NxWM Keyboard Configuration
+#
CONFIG_NXWM_KEYBOARD=y
#
@@ -1157,16 +1219,19 @@ CONFIG_NXWM_KEYBOARD_LISTENERPRIO=100
CONFIG_NXWM_KEYBOARD_LISTENERSTACK=2048
#
-# Calibration display settings
+# NxWM Calibration display settings
#
+CONFIG_NXWM_CALIBRATION_MARGIN=40
# CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set
+# CONFIG_NXWM_CALIBRATION_MESSAGES is not set
+# CONFIG_NXWM_CALIBRATION_ANISOTROPIC is not set
# CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set
CONFIG_NXWM_CALIBRATION_SIGNO=5
CONFIG_NXWM_CALIBRATION_LISTENERPRIO=100
CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048
#
-# Hex Calculator display settings
+# NxWM Hex Calculator display settings
#
CONFIG_NXWM_HEXCALCULATOR_CUSTOM_COLORS=y
CONFIG_NXWM_HEXCALCULATOR_BACKGROUNDCOLOR=0x39C7
@@ -1175,6 +1240,14 @@ CONFIG_NXWM_HEXCALCULATOR_BACKGROUNDCOLOR=0x39C7
CONFIG_NXWM_MEDIAPLAYER=y
#
+# Platform-specific Support
+#
+CONFIG_PLATFORM_CONFIGDATA=y
+CONFIG_MIKROE_STM32F4_CONFIGDATA_PART=y
+# CONFIG_MIKROE_STM32F4_CONFIGDATA_FS is not set
+# CONFIG_MIKROE_STM32F4_CONFIGDATA_ROM is not set
+
+#
# System NSH Add-Ons
#
@@ -1217,7 +1290,7 @@ CONFIG_NXPLAYER_INCLUDE_DEVICE_SEARCH=y
CONFIG_NXPLAYER_FMT_FROM_EXT=y
# CONFIG_NXPLAYER_FMT_FROM_HEADER is not set
CONFIG_NXPLAYER_INCLUDE_MEDIADIR=y
-CONFIG_NXPLAYER_DEFAULT_MEDIADIR="/usr/share/sounds"
+CONFIG_NXPLAYER_DEFAULT_MEDIADIR="/usr/sounds"
# CONFIG_NXPLAYER_RECURSIVE_MEDIA_SEARCH is not set
CONFIG_NXPLAYER_INCLUDE_SYSTEM_RESET=y
@@ -1251,6 +1324,7 @@ CONFIG_READLINE_ECHO=y
# Sysinfo
#
CONFIG_SYSTEM_SYSINFO=y
+CONFIG_SYSTEM_SYSINFO_STACKSIZE=1024
#
# USB Monitor
@@ -1259,6 +1333,10 @@ CONFIG_SYSTEM_SYSINFO=y
#
# Stack Monitor
#
+CONFIG_SYSTEM_STACKMONITOR=y
+CONFIG_SYSTEM_STACKMONITOR_STACKSIZE=2048
+CONFIG_SYSTEM_STACKMONITOR_PRIORITY=50
+CONFIG_SYSTEM_STACKMONITOR_INTERVAL=2
#
# USB Mass Storage Device Commands