4 files changed, 19 insertions, 2 deletions
diff --git a/nuttx/configs/sim/README.txt b/nuttx/configs/sim/README.txt
index 71542a1b4..2a65300d9 100644
--- a/nuttx/configs/sim/README.txt
+++ b/nuttx/configs/sim/README.txt
@@ -367,8 +367,14 @@ nx11
   examples/nxconsole
   ------------------
   This configuration is also set up to use the examples/nxconsole
-  test instead of examples/nx.  Simply comment out the following
-  in the appconfig file:
+  test instead of examples/nx.  To enable this configuration,
+  First, select Multi-User mode as described above.  Then add the
+  following definitions to the defconfig file:
+
+    -CONFIG_NXCONSOLE=n
+    +CONFIG_NXCONSOLE=y
+
+  Comment out the following in the appconfig file:
 
     -CONFIGURED_APPS += examples/nx
     +#CONFIGURED_APPS += examples/nx
diff --git a/nuttx/configs/sim/nsh2/appconfig b/nuttx/configs/sim/nsh2/appconfig
index c967980a5..3a12d6f79 100644
--- a/nuttx/configs/sim/nsh2/appconfig
+++ b/nuttx/configs/sim/nsh2/appconfig
@@ -48,3 +48,8 @@ CONFIGURED_APPS += examples/nx
 CONFIGURED_APPS += examples/nxhello
 CONFIGURED_APPS += examples/nxlines
 CONFIGURED_APPS += examples/touchscreen
+
+ifeq ($(CONFIG_NXCONSOLE),y)
+CONFIGURED_APPS += examples/nxconsole
+endif
+
diff --git a/nuttx/configs/sim/nx/defconfig b/nuttx/configs/sim/nx/defconfig
index fcac93e09..05cfbf5ac 100644
--- a/nuttx/configs/sim/nx/defconfig
+++ b/nuttx/configs/sim/nx/defconfig
@@ -424,6 +424,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.
@@ -452,6 +454,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=8
 # CONFIG_NXCONSOLE_NOGETRUN
 # CONFIG_NXCONSOLE_MXCHARS
diff --git a/nuttx/configs/sim/nx11/defconfig b/nuttx/configs/sim/nx11/defconfig
index 890e08592..d3962c49b 100644
--- a/nuttx/configs/sim/nx11/defconfig
+++ b/nuttx/configs/sim/nx11/defconfig
@@ -425,6 +425,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.
@@ -453,6 +455,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=32
 # CONFIG_NXCONSOLE_NOGETRUN
 # CONFIG_NXCONSOLE_MXCHARS