Skip to content
Snippets Groups Projects
Commit 296044f6 authored by Gregory Nutt's avatar Gregory Nutt
Browse files

Move SAM3U header files to arch/arm/src/sam3u/chip. Some renaming of SAM3U to...

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
parent b673cbeb
No related branches found
No related tags found
No related merge requests found
...@@ -60,9 +60,9 @@ CNTXTDIRS = pwm ...@@ -60,9 +60,9 @@ CNTXTDIRS = pwm
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
CNTXTDIRS += adc can cdcacm composite cxxtest dhcpd discover flash_test ftpd CNTXTDIRS += adc can cdcacm composite cxxtest dhcpd discover flash_test ftpd
CNTXTDIRS += hello helloxx json keypadtestmodbus mtdpart nettest nxlines CNTXTDIRS += hello helloxx json keypadtestmodbus mtdpart nettest nxhello
CNTXTDIRS += nrf24l01_term relays qencoder slcd smart_test tcpecho telnetd CNTXTDIRS += nxlines nrf24l01_term relays qencoder slcd smart_test tcpecho
CNTXTDIRS += watchdog wgetjson CNTXTDIRS += telnetd touchscreen watchdog wgetjson
endif endif
ifeq ($(CONFIG_EXAMPLES_LCDRW_BUILTIN),y) ifeq ($(CONFIG_EXAMPLES_LCDRW_BUILTIN),y)
...@@ -71,9 +71,6 @@ endif ...@@ -71,9 +71,6 @@ endif
ifeq ($(CONFIG_EXAMPLES_NX_BUILTIN),y) ifeq ($(CONFIG_EXAMPLES_NX_BUILTIN),y)
CNTXTDIRS += nx CNTXTDIRS += nx
endif endif
ifeq ($(CONFIG_EXAMPLES_NXHELLO_BUILTIN),y)
CNTXTDIRS += nxhello
endif
ifeq ($(CONFIG_EXAMPLES_NXIMAGE_BUILTIN),y) ifeq ($(CONFIG_EXAMPLES_NXIMAGE_BUILTIN),y)
CNTXTDIRS += nximage CNTXTDIRS += nximage
endif endif
...@@ -86,9 +83,6 @@ endif ...@@ -86,9 +83,6 @@ endif
ifeq ($(CONFIG_EXAMPLES_TIFF_BUILTIN),y) ifeq ($(CONFIG_EXAMPLES_TIFF_BUILTIN),y)
CNTXTDIRS += tiff CNTXTDIRS += tiff
endif endif
ifeq ($(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN),y)
CNTXTDIRS += touchscreen
endif
ifeq ($(CONFIG_EXAMPLES_USBMSC_BUILTIN),y) ifeq ($(CONFIG_EXAMPLES_USBMSC_BUILTIN),y)
CNTXTDIRS += usbstorage CNTXTDIRS += usbstorage
endif endif
......
...@@ -70,7 +70,7 @@ config EXAMPLES_NX_DEFAULT_FONT ...@@ -70,7 +70,7 @@ config EXAMPLES_NX_DEFAULT_FONT
default y default y
config EXAMPLES_NX_FONTID config EXAMPLES_NX_FONTID
bool "Font ID" int "Font ID"
depends on !EXAMPLES_NX_DEFAULT_FONT depends on !EXAMPLES_NX_DEFAULT_FONT
---help--- ---help---
Selects the font (see font ID numbers in include/nuttx/nx/nxfonts.h) Selects the font (see font ID numbers in include/nuttx/nx/nxfonts.h)
......
...@@ -9,5 +9,84 @@ config EXAMPLES_NXHELLO ...@@ -9,5 +9,84 @@ config EXAMPLES_NXHELLO
---help--- ---help---
Enable the NX graphics \"Hello, World!\" example 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 endif
...@@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c ...@@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c
$(call ARCHIVE, $(BIN), $(OBJS)) $(call ARCHIVE, $(BIN), $(OBJS))
@touch .built @touch .built
ifeq ($(CONFIG_EXAMPLES_NXHELLO_BUILTIN),y) ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
......
...@@ -100,14 +100,14 @@ config EXAMPLES_NXTEXT_DEFAULT_FONT ...@@ -100,14 +100,14 @@ config EXAMPLES_NXTEXT_DEFAULT_FONT
if !EXAMPLES_NXTEXT_DEFAULT_FONT if !EXAMPLES_NXTEXT_DEFAULT_FONT
config EXAMPLES_NXTEXT_BGFONTID config EXAMPLES_NXTEXT_BGFONTID
bool "Background font ID" int "Background font ID"
default 0 default 0
---help--- ---help---
Selects the font used in the background window (see font ID numbers Selects the font used in the background window (see font ID numbers
in include/nuttx/nx/nxfonts.h) in include/nuttx/nx/nxfonts.h)
config EXAMPLES_NXTEXT_PUFONTID config EXAMPLES_NXTEXT_PUFONTID
bool "Pop-up font ID" int "Pop-up font ID"
default 0 default 0
---help--- ---help---
Selects the font used in the pop-up window (see font ID numbers Selects the font used in the pop-up window (see font ID numbers
......
...@@ -11,15 +11,6 @@ config EXAMPLES_TOUCHSCREEN ...@@ -11,15 +11,6 @@ config EXAMPLES_TOUCHSCREEN
if 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 config EXAMPLES_TOUCHSCREEN_MINOR
int "Touchscreen minor device number" int "Touchscreen minor device number"
default 0 default 0
...@@ -38,9 +29,9 @@ config EXAMPLES_TOUCHSCREEN_DEVPATH ...@@ -38,9 +29,9 @@ config EXAMPLES_TOUCHSCREEN_DEVPATH
config EXAMPLES_TOUCHSCREEN_NSAMPLES config EXAMPLES_TOUCHSCREEN_NSAMPLES
int "Number of samples" int "Number of samples"
default 0 default 0
depends on !EXAMPLES_TOUCHSCREEN_BUILTIN depends on NSH_BUILTIN_APPS
---help--- ---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. samples is provided on the command line and this value is ignored.
Otherwise, this number of samples is collected and the program Otherwise, this number of samples is collected and the program
terminates. Default: Zero (Samples are collected indefinitely). terminates. Default: Zero (Samples are collected indefinitely).
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment