summaryrefslogtreecommitdiff
path: root/nuttx/configs/stm3210e-eval
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-03-28 16:06:56 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-03-28 16:06:56 +0000
commit6a79e47a66fcc0d38cffca54b862a1efa19eb822 (patch)
treed57d866e590029f590543adf137fffaeb234ab84 /nuttx/configs/stm3210e-eval
parent6402e6269bd2f9619b7a7b21bab9a1fedc6f360b (diff)
downloadpx4-nuttx-6a79e47a66fcc0d38cffca54b862a1efa19eb822.tar.gz
px4-nuttx-6a79e47a66fcc0d38cffca54b862a1efa19eb822.tar.bz2
px4-nuttx-6a79e47a66fcc0d38cffca54b862a1efa19eb822.zip
NX console updates
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4534 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/stm3210e-eval')
-rw-r--r--nuttx/configs/stm3210e-eval/nsh2/appconfig5
-rw-r--r--nuttx/configs/stm3210e-eval/nsh2/defconfig3
-rw-r--r--nuttx/configs/stm3210e-eval/nx/defconfig3
-rw-r--r--nuttx/configs/stm3210e-eval/nxlines/defconfig3
-rw-r--r--nuttx/configs/stm3210e-eval/nxtext/defconfig3
5 files changed, 16 insertions, 1 deletions
diff --git a/nuttx/configs/stm3210e-eval/nsh2/appconfig b/nuttx/configs/stm3210e-eval/nsh2/appconfig
index de15b0ddf..dadecb4fc 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/appconfig
+++ b/nuttx/configs/stm3210e-eval/nsh2/appconfig
@@ -50,9 +50,12 @@ CONFIGURED_APPS += examples/nx
CONFIGURED_APPS += examples/nxhello
#CONFIGURED_APPS += examples/nxlines
#CONFIGURED_APPS += examples/nxtext
-#CONFIGURED_APPS += examples/nxconsole
CONFIGURED_APPS += examples/usbstorage
+ifeq ($(CONFIG_NXCONSOLE),y)
+CONFIGURED_APPS += examples/nxconsole
+endif
+
ifeq ($(CONFIG_I2C),y)
CONFIGURED_APPS += system/i2c
endif
diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig
index 09a701b8d..1891c7e21 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig
@@ -1043,6 +1043,8 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# NxConsole Configuration Settings:
#
+# CONFIG_NXCONSOLE
+# Enables building of the NxConsole driver.
# CONFIG_NXCONSOLE_BPP
# Currently, NxConsole supports only a single pixel depth. This
# configuration setting must be provided to support that single pixel depth.
@@ -1071,6 +1073,7 @@ CONFIG_NX_MXCLIENTMSGS=16
# of the window. This setting can be defining to change this behavior so
# that the text is simply truncated until a new line is encountered.
#
+CONFIG_NXCONSOLE=n
CONFIG_NXCONSOLE_BPP=16
# CONFIG_NXCONSOLE_NOGETRUN
# CONFIG_NXCONSOLE_MXCHARS
diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig
index 7532dab55..f1a5d46d3 100644
--- a/nuttx/configs/stm3210e-eval/nx/defconfig
+++ b/nuttx/configs/stm3210e-eval/nx/defconfig
@@ -893,6 +893,8 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# NxConsole Configuration Settings:
#
+# CONFIG_NXCONSOLE
+# Enables building of the NxConsole driver.
# CONFIG_NXCONSOLE_BPP
# Currently, NxConsole supports only a single pixel depth. This
# configuration setting must be provided to support that single pixel depth.
@@ -921,6 +923,7 @@ CONFIG_NX_MXCLIENTMSGS=16
# of the window. This setting can be defining to change this behavior so
# that the text is simply truncated until a new line is encountered.
#
+CONFIG_NXCONSOLE=n
CONFIG_NXCONSOLE_BPP=16
# CONFIG_NXCONSOLE_NOGETRUN
# CONFIG_NXCONSOLE_MXCHARS
diff --git a/nuttx/configs/stm3210e-eval/nxlines/defconfig b/nuttx/configs/stm3210e-eval/nxlines/defconfig
index 7f912995f..0175dc9b5 100644
--- a/nuttx/configs/stm3210e-eval/nxlines/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxlines/defconfig
@@ -892,6 +892,8 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# NxConsole Configuration Settings:
#
+# CONFIG_NXCONSOLE
+# Enables building of the NxConsole driver.
# CONFIG_NXCONSOLE_BPP
# Currently, NxConsole supports only a single pixel depth. This
# configuration setting must be provided to support that single pixel depth.
@@ -920,6 +922,7 @@ CONFIG_NX_MXCLIENTMSGS=16
# of the window. This setting can be defining to change this behavior so
# that the text is simply truncated until a new line is encountered.
#
+CONFIG_NXCONSOLE=n
CONFIG_NXCONSOLE_BPP=16
# CONFIG_NXCONSOLE_NOGETRUN
# CONFIG_NXCONSOLE_MXCHARS
diff --git a/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig
index 07a97e2c8..0b92dac45 100644
--- a/nuttx/configs/stm3210e-eval/nxtext/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxtext/defconfig
@@ -892,6 +892,8 @@ CONFIG_NX_MXCLIENTMSGS=16
#
# NxConsole Configuration Settings:
#
+# CONFIG_NXCONSOLE
+# Enables building of the NxConsole driver.
# CONFIG_NXCONSOLE_BPP
# Currently, NxConsole supports only a single pixel depth. This
# configuration setting must be provided to support that single pixel depth.
@@ -920,6 +922,7 @@ CONFIG_NX_MXCLIENTMSGS=16
# of the window. This setting can be defining to change this behavior so
# that the text is simply truncated until a new line is encountered.
#
+CONFIG_NXCONSOLE=n
CONFIG_NXCONSOLE_BPP=16
# CONFIG_NXCONSOLE_NOGETRUN
# CONFIG_NXCONSOLE_MXCHARS