Move SAM3U header files to arch/arm/src/sam3u/chip. Some renaming of SAM3U to SAM to ssupport SAM4. Convert all configs/sam3u-ek configurations to use the kconfig-frontends tool

6 files changed, 89 insertions, 25 deletions

diff --git a/apps/examples/Makefile b/apps/examples/Makefile
index 4c093e129..eadb2db21 100644
--- a/apps/examples/Makefile
+++ b/apps/examples/Makefile
@@ -60,9 +60,9 @@ CNTXTDIRS = pwm
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 CNTXTDIRS += adc can cdcacm composite cxxtest dhcpd discover flash_test ftpd
-CNTXTDIRS += hello helloxx json keypadtestmodbus mtdpart nettest nxlines
-CNTXTDIRS += nrf24l01_term relays qencoder slcd smart_test tcpecho telnetd
-CNTXTDIRS += watchdog wgetjson
+CNTXTDIRS += hello helloxx json keypadtestmodbus mtdpart nettest nxhello
+CNTXTDIRS += nxlines nrf24l01_term relays qencoder slcd smart_test tcpecho
+CNTXTDIRS += telnetd touchscreen watchdog wgetjson
 endif
 
 ifeq ($(CONFIG_EXAMPLES_LCDRW_BUILTIN),y)
@@ -71,9 +71,6 @@ endif
 ifeq ($(CONFIG_EXAMPLES_NX_BUILTIN),y)
 CNTXTDIRS += nx
 endif
-ifeq ($(CONFIG_EXAMPLES_NXHELLO_BUILTIN),y)
-CNTXTDIRS += nxhello
-endif
 ifeq ($(CONFIG_EXAMPLES_NXIMAGE_BUILTIN),y)
 CNTXTDIRS += nximage
 endif
@@ -86,9 +83,6 @@ endif
 ifeq ($(CONFIG_EXAMPLES_TIFF_BUILTIN),y)
 CNTXTDIRS += tiff
 endif
-ifeq ($(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN),y)
-CNTXTDIRS += touchscreen
-endif
 ifeq ($(CONFIG_EXAMPLES_USBMSC_BUILTIN),y)
 CNTXTDIRS += usbstorage
 endif
diff --git a/apps/examples/nx/Kconfig b/apps/examples/nx/Kconfig
index f636daf84..4dcc42579 100644
--- a/apps/examples/nx/Kconfig
+++ b/apps/examples/nx/Kconfig
@@ -70,7 +70,7 @@ config EXAMPLES_NX_DEFAULT_FONT
 	default y
 
 config EXAMPLES_NX_FONTID
-	bool "Font ID"
+	int "Font ID"
 	depends on !EXAMPLES_NX_DEFAULT_FONT
 	---help---
 		Selects the font (see font ID numbers in include/nuttx/nx/nxfonts.h)
diff --git a/apps/examples/nxhello/Kconfig b/apps/examples/nxhello/Kconfig
index 22f16c9b2..52924e38e 100644
--- a/apps/examples/nxhello/Kconfig
+++ b/apps/examples/nxhello/Kconfig
@@ -9,5 +9,84 @@ config EXAMPLES_NXHELLO
 	---help---
 		Enable the NX graphics \"Hello, World!\" example
 
-if EXAMPLES_HELLOXX
+if EXAMPLES_NXHELLO
+
+config EXAMPLES_NXHELLO_VPLANE
+	int "Video Plane"
+	default 0
+	---help---
+		The plane to select from the framebuffer driver for use in the test.
+		Default: 0
+
+config EXAMPLES_NXHELLO_DEVNO
+	int "Video Device Number"
+	default 0
+	---help---
+		The LCD device to select from the LCD driver for use in the test:
+		Default: 0
+
+config EXAMPLES_NXHELLO_BPP
+	int "Bits-Per-Pixel"
+	default 32
+	---help---
+		Pixels per pixel to use.  Valid options include 2, 4, 8, 16, 24,
+		and 32.  Default is 32.
+
+
+comment "Example Color Configuration"
+
+config EXAMPLES_NXHELLO_DEFAULT_COLORS
+	bool "Use Default Colors"
+	default y
+
+if !EXAMPLES_NXHELLO_DEFAULT_COLORS
+
+config EXAMPLES_NXHELLO_BGCOLOR
+	hex "Background color"
+	default 0x0
+	---help---
+		The color of the background.  Default depends on config
+		EXAMPLES_NXHELLO_BPP.
+
+config EXAMPLES_NXHELLO_FONTCOLOR
+	hex "Background font color"
+	default 0x0
+	---help---
+		The color of the fonts used in the background window. Default
+		depends on config EXAMPLES_NXHELLO_BPP.
+
+endif
+
+comment "Example Font Configuration"
+
+config EXAMPLES_NXHELLO_DEFAULT_FONT
+	bool "Use Default Font"
+	default y
+
+if !EXAMPLES_NXHELLO_DEFAULT_FONT
+
+config EXAMPLES_NXHELLO_FONTID
+	int "Background font ID"
+	default 0
+	---help---
+		Selects the font used in the background window (see font ID numbers
+		in include/nuttx/nx/nxfonts.h)
+
+endif
+
+config EXAMPLES_NXHELLO_EXTERNINIT
+	bool "External Device Initialization"
+	default n
+	---help---
+		The driver for the graphics device on this platform requires some
+		unusual initialization.  This is the case, for example, for SPI LCD/OLED
+		devices.  If this configuration is selected, then the platform code
+		must provide an LCD initialization function with a prototype like:
+
+		#ifdef CONFIG_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
diff --git a/apps/examples/nxhello/Makefile b/apps/examples/nxhello/Makefile
index 4a72eb8c7..7b8d5ed04 100644
--- a/apps/examples/nxhello/Makefile
+++ b/apps/examples/nxhello/Makefile
@@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	@touch .built
 
-ifeq ($(CONFIG_EXAMPLES_NXHELLO_BUILTIN),y)
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
diff --git a/apps/examples/nxtext/Kconfig b/apps/examples/nxtext/Kconfig
index 6b220b2a2..d7c6d507a 100644
--- a/apps/examples/nxtext/Kconfig
+++ b/apps/examples/nxtext/Kconfig
@@ -100,14 +100,14 @@ config EXAMPLES_NXTEXT_DEFAULT_FONT
 if !EXAMPLES_NXTEXT_DEFAULT_FONT
 
 config EXAMPLES_NXTEXT_BGFONTID
-	bool "Background font ID"
+	int "Background font ID"
 	default 0
 	---help---
 		Selects the font used in the background window (see font ID numbers
 		in include/nuttx/nx/nxfonts.h)
 
 config EXAMPLES_NXTEXT_PUFONTID
-	bool "Pop-up font ID"
+	int "Pop-up font ID"
 	default 0
 	---help---
 		Selects the font used in the pop-up window (see font ID numbers
diff --git a/apps/examples/touchscreen/Kconfig b/apps/examples/touchscreen/Kconfig
index 2f40b3d65..15f149e29 100644
--- a/apps/examples/touchscreen/Kconfig
+++ b/apps/examples/touchscreen/Kconfig
@@ -11,15 +11,6 @@ config EXAMPLES_TOUCHSCREEN
 
 if EXAMPLES_TOUCHSCREEN
 
-config EXAMPLES_TOUCHSCREEN_BUILTIN
-	bool "NSH built-in application"
-	default y
-	depends on NSH_BUILTIN_APPS
-	---help---
-		Build the touchscreen test as an NSH built-in function.  Default:
-		Built as a standalone problem unless NSH_BUILTIN_APPS is defined.
-		Then the default is to build as an NSH built-in application.
-
 config EXAMPLES_TOUCHSCREEN_MINOR
 	int "Touchscreen minor device number"
 	default 0
@@ -38,9 +29,9 @@ config EXAMPLES_TOUCHSCREEN_DEVPATH
 config EXAMPLES_TOUCHSCREEN_NSAMPLES
 	int "Number of samples"
 	default 0
-	depends on !EXAMPLES_TOUCHSCREEN_BUILTIN
+	depends on NSH_BUILTIN_APPS
 	---help---
-		If EXAMPLES_TOUCHSCREEN_BUILTIN is defined, then the number of
+		If NSH_BUILTIN_APPS is defined, then the number of touchscreen
 		samples is provided on the command line and this value is ignored.
 		Otherwise, this number of samples is collected and the program
 		terminates.  Default:  Zero (Samples are collected indefinitely).