Convert configs/stm32f4discovery/nxlines to use Kconfig tool

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5320 42af7a65-404d-4744-a932-0658087f49c3

apps/examples/Makefile

@@ -58,7 +58,7 @@ CNTXTDIRS = pwm
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 CNTXTDIRS += adc can cdcacm composite cxxtestdhcpd discover ftpd json
-CNTXTDIRS += modbus nettest relays qencoder telnetd watchdog wgetjson
+CNTXTDIRS += modbus nettest nxlines relays qencoder telnetd watchdog wgetjson
 endif
 
 ifeq ($(CONFIG_EXAMPLES_HELLO_BUILTIN),y)
@@ -79,9 +79,6 @@ endif
 ifeq ($(CONFIG_EXAMPLES_NXIMAGE_BUILTIN),y)
 CNTXTDIRS += nximage
 endif
-ifeq ($(CONFIG_EXAMPLES_LINES_BUILTIN),y)
-CNTXTDIRS += nxlines
-endif
 ifeq ($(CONFIG_EXAMPLES_NXTEXT_BUILTIN),y)
 CNTXTDIRS += nxtext
 endif

apps/examples/README.txt

@@ -941,8 +941,6 @@ examplex/nxlines
 
   The following configuration options can be selected:
 
-    CONFIG_EXAMPLES_NXLINES_BUILTIN -- Build the NXLINES example as a "built-in"
-      that can be executed from the NSH command line    
     CONFIG_EXAMPLES_NXLINES_VPLANE -- The plane to select from the frame-
       buffer driver for use in the test.  Default: 0
     CONFIG_EXAMPLES_NXLINES_DEVNO - The LCD device to select from the LCD
@@ -980,6 +978,9 @@ examplex/nxlines
       FAR struct fb_vtable_s *up_nxdrvinit(unsigned int devno);
       #endif
 
+    CONFIG_NSH_BUILTIN_APPS - Build the NX lines examples as an NSH built-in
+      function.
+
 examples/nxtext
 ^^^^^^^^^^^^^^^
 

apps/examples/nxlines/Kconfig

@@ -10,4 +10,78 @@ config EXAMPLES_NXLINES
 		Enable the X graphics lines example
 
 if EXAMPLES_NXLINES
+
+config EXAMPLES_NXLINES_VPLANE
+	int "Graphics Plane"
+	default 0
+	---help---
+		The plane to select from the frame-buffer driver for use in the test.  Default: 0
+
+config EXAMPLES_NXLINES_DEVNO
+	int "Graphics Device Number"
+	default 0
+	---help---
+		The LCD device to select from the LCD driver for use in the test: Default: 0
+
+config EXAMPLES_NXLINES_BGCOLOR
+	hex "Background Color"
+	default 0x00
+	---help---
+		The color of the background.  Default depends on EXAMPLES_NXLINES_BPP.
+
+config EXAMPLES_NXLINES_LINEWIDTH
+	int "Line Width"
+	default 16
+	---help---
+		Selects the width of the lines in pixels (default: 16)
+
+config EXAMPLES_NXLINES_LINECOLOR
+	hex "Line Color"
+	default 0x00
+	---help---
+		The color of the central lines drawn in the background window. Default
+		depends on EXAMPLES_NXLINES_BPP (there really is no meaningful default).
+
+config EXAMPLES_NXLINES_BORDERWIDTH
+	int "Border Width"
+	default 16
+	---help---
+		The width of the circular border drawn in the background window. (default: 16).
+
+config EXAMPLES_NXLINES_BORDERCOLOR
+	hex "Border Color"
+	default 0x00
+	---help---
+		The color of the circular border drawn in the background window. Default
+		depends on EXAMPLES_NXLINES_BPP (there really is no meaningful default).
+
+config EXAMPLES_NXLINES_CIRCLECOLOR
+	hex "Circle Color"
+	default 0x00
+	---help---
+		The color of the circular region filled in the background window. Default
+		depends on EXAMPLES_NXLINES_BPP (there really is no meaningful default).
+
+config EXAMPLES_NXLINES_BPP
+	int "Bits Per Pixel"
+	default 8
+	---help---
+		Pixels per pixel to use.  Valid options include 2, 4, 8, 16, 24, and 32.
+		Default is 16.
+
+config EXAMPLES_NXLINES_EXTERNINIT
+	bool "External Device Initialization"
+	default false
+	---help---
+		The driver for the graphics device on this platform requires some unusual
+		initialization.  This is the for, for example, SPI LCD/OLED devices.  If
+		this configuration is selected, then the platform code must provide an LCD
+		initialization function with a prototype like:
+
+		#ifdef NX_LCDDRIVER
+		FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno);
+		#else
+		FAR struct fb_vtable_s *up_nxdrvinit(unsigned int devno);
+		#endif
+
 endif

apps/examples/nxlines/Makefile

@@ -82,7 +82,7 @@ $(COBJS): %$(OBJEXT): %.c
 	@touch .built
 
 .context:
-ifeq ($(CONFIG_EXAMPLES_NXLINES_BUILTIN),y)
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 	@touch $@
 endif

apps/examples/nxlines/nxlines_bkgd.c

@@ -316,7 +316,7 @@ void nxlines_test(NXWINDOW hwnd)
 
       if (angle > (31 *  (2 * b16PI) / 32))
         {
-#ifdef CONFIG_EXAMPLES_NXLINES_BUILTIN
+#ifdef CONFIG_NSH_BUILTIN_APPS
           /* If this example was built as an NSH add-on, then exit after we
            * have gone all the way around once.
            */

nuttx/ChangeLog

@@ -3579,4 +3579,6 @@
 	* arch/arm/src/stm32_otgfsdev.c:  Partial fix from Petteri Aimonen.
 	* drivers/lcd/ug-2864ambag01.c and include/nuttx/lcd/ug_2864ambag01.h:
 	  LCD driver for the Univision OLED of the same name.
+	* configs/stm32f4discovery/nxlines:  Configure to use mconf/Kconfig
+	  tool.
 

nuttx/arch/arm/src/stm32/Kconfig

@@ -327,7 +327,7 @@ config STM32_ETHMAC
 config STM32_FSMC
 	bool "FSMC"
 	default n
-	depends on !STM32_CONNECTIVITYLINE && STM32_HIGHDENSITY
+	depends on !STM32_CONNECTIVITYLINE && (STM32_HIGHDENSITY || STM32_STM32F20XX || STM32_STM32F40XX)
 
 config STM32_HASH
 	bool "HASH"

nuttx/configs/compal_e99/nsh_highram/defconfig

@@ -261,7 +261,6 @@ CONFIG_EXAMPLES_HELLO_BUILTIN=y
 CONFIG_EXAMPLES_NXHELLO_BUILTIN=y
 CONFIG_EXAMPLES_NXTEXT_BUILTIN=y
 CONFIG_EXAMPLES_NXIMAGE_BUILTIN=y
-CONFIG_EXAMPLES_NXLINES_BUILTIN=y
 
 CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=2
 CONFIG_EXAMPLES_NXLINES_LINEWIDTH=4

nuttx/configs/hymini-stm32v/nsh2/defconfig

@@ -542,7 +542,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/hymini-stm32v/nx/defconfig

@@ -552,7 +552,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/hymini-stm32v/nxlines/defconfig

@@ -557,7 +557,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/pic32mx7mmb/nsh/defconfig

@@ -715,7 +715,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=y
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/sam3u-ek/touchscreen/defconfig

@@ -538,7 +538,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/sim/nsh2/defconfig

@@ -331,7 +331,6 @@ CONFIG_EXAMPLES_NXHELLO_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 #CONFIG_EXAMPLES_NXLINES_BGCOLOR
 CONFIG_EXAMPLES_NXLINES_LINEWIDTH=16

nuttx/configs/sim/nx/defconfig

@@ -295,7 +295,6 @@ CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 #CONFIG_EXAMPLES_NXLINES_BGCOLOR=

nuttx/configs/sim/nxwm/defconfig

@@ -363,7 +363,6 @@ CONFIG_EXAMPLES_NXHELLO_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 #CONFIG_EXAMPLES_NXLINES_BGCOLOR
 CONFIG_EXAMPLES_NXLINES_LINEWIDTH=16

nuttx/configs/stm3210e-eval/nsh2/defconfig

@@ -683,7 +683,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm3210e-eval/nx/defconfig

@@ -579,7 +579,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm3210e-eval/nxconsole/defconfig

@@ -610,7 +610,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm3210e-eval/nxlines/defconfig

@@ -600,7 +600,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm3210e-eval/nxtext/defconfig

@@ -600,7 +600,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm3210e-eval/pm/defconfig

@@ -728,7 +728,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm3220g-eval/nsh/defconfig

@@ -787,7 +787,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm3220g-eval/nsh2/defconfig

@@ -774,7 +774,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm3220g-eval/nxwm/defconfig

@@ -820,7 +820,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=y
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm3220g-eval/ostest/defconfig

@@ -645,7 +645,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm3240g-eval/nsh/defconfig

@@ -787,7 +787,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm3240g-eval/nxconsole/defconfig

@@ -758,7 +758,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=y
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm3240g-eval/nxwm/defconfig

@@ -820,7 +820,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=y
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm3240g-eval/ostest/defconfig

@@ -657,7 +657,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm3240g-eval/webserver/defconfig

@@ -788,7 +788,6 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
 #
 # Settings for examples/nxlines
 #
-CONFIG_EXAMPLES_NXLINES_BUILTIN=n
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320

nuttx/configs/stm32f4discovery/README.txt

@@ -1299,17 +1299,24 @@ Where <subdir> is one of the following:
 
     The STM32F4Discovery board does not have any graphics capability.  This
     configuration assumes that you have connected an SD1289-based LCD as
-    described about under "SSD1289".  NOTE:  At present, it has not been
+    described above under "SSD1289".  NOTE:  At present, it has not been
     proven that the STM32F4Discovery can actually drive an LCD.  There are
     some issues with how some of the dedicated FSMC pins are used on the
     boards.  This configuration may not be useful and may only serve as
     an illustration of how to build for th SSD1289 LCD.
 
-    Default toolchain:
+  NOTES:
 
-      CONFIG_STM32_CODESOURCERYW=y : CodeSourcery under Windows
+  1. As of this writing, I have not seen the LCD work!
 
-    NOTE: As of this writing, I have not seen the LCD work!
+  2. This configuration uses the mconf-based configuration tool.  To
+     change this configuration using that tool, you should:
+
+     a. Build and install the mconf tool.  See nuttx/README.txt and
+        misc/tools/
+
+     b. Execute 'make menuconfig' in nuttx/ in order to start the
+        reconfiguration process.
 
   pm:
   --

nuttx/configs/stm32f4discovery/nxlines/appconfig

@@ -1,38 +0,0 @@
-############################################################################
-# configs/stm32f4discovery/nxlines/appconfig
-#
-#   Copyright (C) 2012 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.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/nxlines