summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-12-30 10:04:34 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-12-30 10:04:34 -0600
commit740fa31fee4328e095cfb62a2a9128c858d7f062 (patch)
treef02f5817428aa1ce67ce7f74d25973dcb9d6b286
parent9642e859e341e35fb01fd027d315f0195cb63358 (diff)
downloadnuttx-740fa31fee4328e095cfb62a2a9128c858d7f062.tar.gz
nuttx-740fa31fee4328e095cfb62a2a9128c858d7f062.tar.bz2
nuttx-740fa31fee4328e095cfb62a2a9128c858d7f062.zip
NxWM: Can now disable the NxConsole window. STM3240G-EVAL knxwm: Disabled the NxConsole for now because there are issues with the kernel build.
-rw-r--r--NxWidgets/Kconfig14
-rw-r--r--NxWidgets/UnitTests/nxwm/nxwm_main.cxx19
-rw-r--r--NxWidgets/libnxwidgets/include/ccallback.hxx10
-rw-r--r--NxWidgets/libnxwidgets/src/ccallback.cxx6
-rw-r--r--NxWidgets/nxwm/Makefile6
-rw-r--r--NxWidgets/nxwm/include/nxwmconfig.hxx63
-rw-r--r--apps/NxWidgets/Kconfig14
-rw-r--r--nuttx/TODO76
-rw-r--r--nuttx/configs/mikroe-stm32f4/fulldemo/defconfig48
-rw-r--r--nuttx/configs/sam3u-ek/nxwm/defconfig1
-rw-r--r--nuttx/configs/sama5d3x-ek/nxwm/defconfig1
-rw-r--r--nuttx/configs/shenzhou/nxwm/defconfig1
-rw-r--r--nuttx/configs/sim/nxwm/defconfig1
-rw-r--r--nuttx/configs/stm3220g-eval/nxwm/defconfig1
-rw-r--r--nuttx/configs/stm3240g-eval/README.txt19
-rw-r--r--nuttx/configs/stm3240g-eval/knxwm/defconfig143
-rw-r--r--nuttx/configs/stm3240g-eval/nxwm/defconfig1
17 files changed, 204 insertions, 220 deletions
diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig
index 2d1467425..8399e23c4 100644
--- a/NxWidgets/Kconfig
+++ b/NxWidgets/Kconfig
@@ -640,7 +640,14 @@ config NXWM_STARTWINDOW_STACKSIZE
endmenu # Start Window Configuration
-menu "NxConsole Window Configuration"
+menuconfig NXWM_NXCONSOLE
+ bool "NxConsole Window"
+ default y
+ ---help---
+ Enable support for the NxConsole window which provides a text window
+ in which you can interact with NSH.
+
+if NXWM_NXCONSOLE
config NXWM_NXCONSOLE_PRIO
int "NxConsole Task Priority"
@@ -716,8 +723,7 @@ config NXWM_NXCONSOLE_ICON
The glyph to use as the NxConsole icon. Default: NxWM::g_cmdBitmap
endif # NXWM_NXCONSOLE_ICON
-
-endmenu # NxConsole Window Configuration
+endif # NXWM_NXCONSOLE
menu "NxWM Touchscreen Configuration"
@@ -1049,7 +1055,7 @@ endif # NXWM_HEXCALCULATOR_FONTID
endmenu # NxWM Hex Calculator display settings
config NXWM_MEDIAPLAYER
- bool "Enable NxWM Media Player"
+ bool "NxWM Media Player"
default n
---help---
Enable support for the MP3 Media Player. This features requires
diff --git a/NxWidgets/UnitTests/nxwm/nxwm_main.cxx b/NxWidgets/UnitTests/nxwm/nxwm_main.cxx
index 167984b14..1fddfeb28 100644
--- a/NxWidgets/UnitTests/nxwm/nxwm_main.cxx
+++ b/NxWidgets/UnitTests/nxwm/nxwm_main.cxx
@@ -50,7 +50,11 @@
#include "ctaskbar.hxx"
#include "cstartwindow.hxx"
-#include "cnxconsole.hxx"
+
+#ifdef CONFIG_NXWM_NXCONSOLE
+# include "cnxconsole.hxx"
+#endif
+
#include "chexcalculator.hxx"
#ifdef CONFIG_NXWM_MEDIAPLAYER
@@ -544,6 +548,7 @@ static bool createCalibration(void)
// Name: createNxConsole
/////////////////////////////////////////////////////////////////////////////
+#ifdef CONFIG_NXWM_NXCONSOLE
static bool createNxConsole(void)
{
// Add the NxConsole application to the start window
@@ -568,6 +573,7 @@ static bool createNxConsole(void)
showTestCaseMemory("createNxConsole: After adding the NxConsole application");
return true;
}
+#endif
/////////////////////////////////////////////////////////////////////////////
// Name: createHexCalculator
@@ -589,7 +595,7 @@ static bool createHexCalculator(void)
printf("createHexCalculator: Adding the hex calculator application to the start window\n");
if (!g_nxwmtest.startwindow->addApplication(calculator))
{
- printf("createHexCalculator: ERROR: Failed to add CNxConsoleFactory to the start window\n");
+ printf("createHexCalculator: ERROR: Failed to add CHexCalculatorFactory to the start window\n");
delete calculator;
return false;
}
@@ -619,7 +625,7 @@ static bool createMediaPlayer(void)
printf("createMediaPlayer: Adding the hex calculator application to the start window\n");
if (!g_nxwmtest.startwindow->addApplication(mediaplayer))
{
- printf("createMediaPlayer: ERROR: Failed to add CNxConsoleFactory to the start window\n");
+ printf("createMediaPlayer: ERROR: Failed to add CMediaPlayerFactory to the start window\n");
delete mediaplayer;
return false;
}
@@ -672,6 +678,7 @@ int nxwm_main(int argc, char *argv[])
// Initialize the NSH library
+#ifdef CONFIG_NXWM_NXCONSOLE
printf("nxwm_main: Initialize the NSH library\n");
if (!NxWM::nshlibInitialize())
{
@@ -679,6 +686,7 @@ int nxwm_main(int argc, char *argv[])
return EXIT_FAILURE;
}
showTestCaseMemory("nxwm_main: After initializing the NSH library");
+#endif
// Create the task bar.
@@ -728,11 +736,13 @@ int nxwm_main(int argc, char *argv[])
// Create the NxConsole application and add it to the start window
+#ifdef CONFIG_NXWM_NXCONSOLE
if (!createNxConsole())
{
printf("nxwm_main: ERROR: Failed to create the NxConsole application\n");
testCleanUpAndExit(EXIT_FAILURE);
}
+#endif
// Create the hex calculator application and add it to the start window
@@ -822,7 +832,8 @@ int nxwm_main(int argc, char *argv[])
showTestCaseMemory("nxwm_main: After clicking the start window icon");
// Wait bit to see the result of the button press. Then press the first icon
- // in the start menu. That should be the NxConsole icon.
+ // in the start menu. That should be the NxConsole icon (if the NXCONSOLE
+ // is not disabled).
sleep(2);
g_nxwmtest.startwindow->clickIcon(0, true);
diff --git a/NxWidgets/libnxwidgets/include/ccallback.hxx b/NxWidgets/libnxwidgets/include/ccallback.hxx
index 714ed1a7f..bef4a2ca9 100644
--- a/NxWidgets/libnxwidgets/include/ccallback.hxx
+++ b/NxWidgets/libnxwidgets/include/ccallback.hxx
@@ -58,11 +58,11 @@
/****************************************************************************
* Pre-Processor Definitions
****************************************************************************/
-
+
/****************************************************************************
* Implementation Classes
****************************************************************************/
-
+
#if defined(__cplusplus)
namespace NXWidgets
@@ -98,7 +98,7 @@ namespace NXWidgets
#endif
// Methods in the callback vtable
-
+
/**
* Re-Draw Callback. The redraw event is handled by CWidgetControl::redrawEvent.
*
@@ -113,7 +113,7 @@ namespace NXWidgets
* @param arg User provided argument (see nx_openwindow, nx_requestbg,
* nxtk_openwindow, or nxtk_opentoolbar).
*/
-
+
static void redraw(NXHANDLE hwnd, FAR const struct nxgl_rect_s *rect,
bool bMore, FAR void *arg);
@@ -157,7 +157,7 @@ namespace NXWidgets
* @param arg User provided argument (see nx_openwindow, nx_requestbg,
* nxtk_openwindow, or nxtk_opentoolbar).
*/
-
+
#ifdef CONFIG_NX_MOUSE
static void newMouseEvent(NXHANDLE hwnd,
FAR const struct nxgl_point_s *pos,
diff --git a/NxWidgets/libnxwidgets/src/ccallback.cxx b/NxWidgets/libnxwidgets/src/ccallback.cxx
index 269a5cdb1..b7cd31161 100644
--- a/NxWidgets/libnxwidgets/src/ccallback.cxx
+++ b/NxWidgets/libnxwidgets/src/ccallback.cxx
@@ -1,7 +1,7 @@
/****************************************************************************
* NxWidgets/libnxwidgets/src/ccallback.cxx
*
- * Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -102,7 +102,7 @@ CCallback::CCallback(CWidgetControl *widgetControl)
* @param arg User provided argument (see nx_openwindow, nx_requestbg,
* nxtk_openwindow, or nxtk_opentoolbar).
*/
-
+
void CCallback::redraw(NXHANDLE hwnd,
FAR const struct nxgl_rect_s *rect,
bool bMore, FAR void *arg)
@@ -171,7 +171,7 @@ void CCallback::newMouseEvent(NXHANDLE hwnd,
FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg)
{
- gvdbg("hwnd=%p pos=(%d,%d) buttons=%02x arg=%p\n",
+ gvdbg("hwnd=%p pos=(%d,%d) buttons=%02x arg=%p\n",
hwnd, pos->x, pos->y, buttons, arg);
// The argument must be the CCallback instance
diff --git a/NxWidgets/nxwm/Makefile b/NxWidgets/nxwm/Makefile
index 6efb464cf..87a277504 100644
--- a/NxWidgets/nxwm/Makefile
+++ b/NxWidgets/nxwm/Makefile
@@ -64,12 +64,16 @@ endif
# Applications
-CXXSRCS += cstartwindow.cxx cnxconsole.cxx chexcalculator.cxx
+CXXSRCS += cstartwindow.cxx chexcalculator.cxx
ifeq ($(CONFIG_NXWM_TOUCHSCREEN),y)
CXXSRCS += ccalibration.cxx
endif
+ifeq ($(CONFIG_NXWM_NXCONSOLE),y)
+CXXSRCS += cnxconsole.cxx
+endif
+
# Images
CXXSRCS += glyph_calculator.cxx glyph_calibration.cxx glyph_cmd.cxx
CXXSRCS += glyph_minimize.cxx glyph_nsh.cxx glyph_play24x24.cxx glyph_start.cxx
diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx
index 5b42e3a70..e1feedcf0 100644
--- a/NxWidgets/nxwm/include/nxwmconfig.hxx
+++ b/NxWidgets/nxwm/include/nxwmconfig.hxx
@@ -85,10 +85,11 @@
#endif
/**
- * NxConsole support is (probably) required
+ * NxConsole support is (probably) required if CONFIG_NXWM_NXCONSOLE is
+ * selected
*/
-#ifndef CONFIG_NXCONSOLE
+#if defined(CONFIG_NXWM_NXCONSOLE) && !defined(CONFIG_NXCONSOLE)
# warning "NxConsole support may be needed (CONFIG_NXCONSOLE)"
#endif
@@ -122,7 +123,7 @@
* Default: MKRGB(255,255,255)
* CONFIG_NXWM_DEFAULT_SHADOWEDGECOLOR - Color of the shadowed edge of a border.
* Default: MKRGB(0,0,0)
- * CONFIG_NXWM_DEFAULT_FONTCOLOR - Default fong color. Default:
+ * CONFIG_NXWM_DEFAULT_FONTCOLOR - Default font color. Default:
* MKRGB(0,0,0)
* CONFIG_NXWM_TRANSPARENT_COLOR - The "transparent" color. Default:
* MKRGB(0,0,0)
@@ -172,7 +173,7 @@
# define CONFIG_NXWM_TRANSPARENT_COLOR MKRGB(0,0,0)
#endif
-/* Task Bar Configuation ***************************************************/
+/* Task Bar Configuration **************************************************/
/**
* Horizontal and vertical spacing of icons in the task bar.
*
@@ -288,7 +289,7 @@
* Used to communicated from CWindowMessenger to the start window thread.
* Default: "/dev/nxwm"
* CONFIG_NXWM_STARTWINDOW_MXMSGS - The maximum number of messages to queue
- * before blocking. Defualt 32
+ * before blocking. Default 32
* CONFIG_NXWM_STARTWINDOW_MXMPRIO - The message priority. Default: 42.
* CONFIG_NXWM_STARTWINDOW_PRIO - Priority of the StartWindoW task. Default:
* SCHED_PRIORITY_DEFAULT. NOTE: This priority should be less than
@@ -368,37 +369,39 @@
* CONFIG_NXWM_NXCONSOLE_ICON - The glyph to use as the NxConsole icon
*/
-#ifndef CONFIG_NXWM_NXCONSOLE_PRIO
-# define CONFIG_NXWM_NXCONSOLE_PRIO SCHED_PRIORITY_DEFAULT
-#endif
+#ifdef CONFIG_NXWM_NXCONSOLE
+# ifndef CONFIG_NXWM_NXCONSOLE_PRIO
+# define CONFIG_NXWM_NXCONSOLE_PRIO SCHED_PRIORITY_DEFAULT
+# endif
-#if CONFIG_NXWIDGETS_SERVERPRIO <= CONFIG_NXWM_NXCONSOLE_PRIO
-# warning "CONFIG_NXWIDGETS_SERVERPRIO <= CONFIG_NXWM_NXCONSOLE_PRIO"
-# warning" -- This can result in data overrun errors"
-#endif
+# if CONFIG_NXWIDGETS_SERVERPRIO <= CONFIG_NXWM_NXCONSOLE_PRIO
+# warning "CONFIG_NXWIDGETS_SERVERPRIO <= CONFIG_NXWM_NXCONSOLE_PRIO"
+# warning" -- This can result in data overrun errors"
+# endif
-#ifndef CONFIG_NXWM_NXCONSOLE_STACKSIZE
-# define CONFIG_NXWM_NXCONSOLE_STACKSIZE 2048
-#endif
+# ifndef CONFIG_NXWM_NXCONSOLE_STACKSIZE
+# define CONFIG_NXWM_NXCONSOLE_STACKSIZE 2048
+# endif
-#ifndef CONFIG_NXWM_NXCONSOLE_WCOLOR
-# define CONFIG_NXWM_NXCONSOLE_WCOLOR CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR
-#endif
+# ifndef CONFIG_NXWM_NXCONSOLE_WCOLOR
+# define CONFIG_NXWM_NXCONSOLE_WCOLOR CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR
+# endif
-#ifndef CONFIG_NXWM_NXCONSOLE_FONTCOLOR
-# define CONFIG_NXWM_NXCONSOLE_FONTCOLOR CONFIG_NXWM_DEFAULT_FONTCOLOR
-#endif
+# ifndef CONFIG_NXWM_NXCONSOLE_FONTCOLOR
+# define CONFIG_NXWM_NXCONSOLE_FONTCOLOR CONFIG_NXWM_DEFAULT_FONTCOLOR
+# endif
-#ifndef CONFIG_NXWM_NXCONSOLE_FONTID
-# define CONFIG_NXWM_NXCONSOLE_FONTID CONFIG_NXWM_DEFAULT_FONTID
-#endif
+# ifndef CONFIG_NXWM_NXCONSOLE_FONTID
+# define CONFIG_NXWM_NXCONSOLE_FONTID CONFIG_NXWM_DEFAULT_FONTID
+# endif
-/**
- * The NxConsole window glyph
- */
+ /**
+ * The NxConsole window glyph
+ */
-#ifndef CONFIG_NXWM_NXCONSOLE_ICON
-# define CONFIG_NXWM_NXCONSOLE_ICON NxWM::g_cmdBitmap
+# ifndef CONFIG_NXWM_NXCONSOLE_ICON
+# define CONFIG_NXWM_NXCONSOLE_ICON NxWM::g_cmdBitmap
+# endif
#endif
/* Touchscreen device *******************************************************/
@@ -500,7 +503,7 @@
* CONFIG_NXWM_CALIBRATION_MARGIN
* The Calbration display consists of a target press offset from the edges
* of the display by this number of pixels (in the horizontal direction)
- * or rows (in the vertical). The closer that you can comfortabley
+ * or rows (in the vertical). The closer that you can comfortably
* position the press positions to the edge, the more accurate will be the
* linear interpolation (provide that the hardware provides equally good
* measurements near the edges).
diff --git a/apps/NxWidgets/Kconfig b/apps/NxWidgets/Kconfig
index 2d1467425..8399e23c4 100644
--- a/apps/NxWidgets/Kconfig
+++ b/apps/NxWidgets/Kconfig
@@ -640,7 +640,14 @@ config NXWM_STARTWINDOW_STACKSIZE
endmenu # Start Window Configuration
-menu "NxConsole Window Configuration"
+menuconfig NXWM_NXCONSOLE
+ bool "NxConsole Window"
+ default y
+ ---help---
+ Enable support for the NxConsole window which provides a text window
+ in which you can interact with NSH.
+
+if NXWM_NXCONSOLE
config NXWM_NXCONSOLE_PRIO
int "NxConsole Task Priority"
@@ -716,8 +723,7 @@ config NXWM_NXCONSOLE_ICON
The glyph to use as the NxConsole icon. Default: NxWM::g_cmdBitmap
endif # NXWM_NXCONSOLE_ICON
-
-endmenu # NxConsole Window Configuration
+endif # NXWM_NXCONSOLE
menu "NxWM Touchscreen Configuration"
@@ -1049,7 +1055,7 @@ endif # NXWM_HEXCALCULATOR_FONTID
endmenu # NxWM Hex Calculator display settings
config NXWM_MEDIAPLAYER
- bool "Enable NxWM Media Player"
+ bool "NxWM Media Player"
default n
---help---
Enable support for the MP3 Media Player. This features requires
diff --git a/nuttx/TODO b/nuttx/TODO
index f7016ae63..8de0ce835 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -12,7 +12,7 @@ nuttx/
(1) Memory Managment (mm/)
(3) Signals (sched/, arch/)
(2) pthreads (sched/)
- (8) Kernel Build
+ (11) Kernel Build
(4) C++ Support
(6) Binary loaders (binfmt/)
(16) Network (net/, drivers/net)
@@ -354,33 +354,65 @@ o pthreads (sched/)
o Kernel Build
^^^^^^^^^^^^
- Title: KERNEL BUILD MODE ISSUES - GRAPHICS/NSH PARTITIONING.
- Description: In the kernel build mode (where NuttX is built as a monlithic
+ Title: GRAPHICS PARTITIONING.
+ Description: In the kernel build mode (where NuttX is built as a monolithic
kernel and user code must trap into the protected kernel via
syscalls), the single user mode cannot be supported. In this
built configuration, only the multiple user mode can be supported
- with the NX server residing inside of the kernel space. In
- this case, most of the user end functions in graphics/nxmu
- must be moved to libc/nx and those functions must be built into
- libuser.a to be linked with the user-space code.
- A similar issue exists in NSH that uses some internal OS
- interfaces that would not be available in a kernel build
- (such as foreach_task, foreach_mountpoint, etc.).
- Status: Open
- Priority: Low -- the kernel build configuration is not fully fielded
+ with the NX server residing inside of the kernel space.
+ Status: Closed. This is not a bug, this is just the things are.
+ Priority: N/A.
+
+ Title: NSH PARTITIONING.
+ Description: There are issues with several NSH commands in the NuttX kernel
+ build mode (where NuttX is built as a monolithic kernel and
+ user code must trap into the protected kernel via syscalls).
+ The current NSH implementation has several commands that call
+ directly into kernel internel functions for whicht there is
+ no syscall available. The commands cause link failures in
+ the kernel build mode and must currently be disabled.
+ Here are known problems that must be fixed:
+
+ COMMAND KERNEL INTERFACE(s)
+ -------- ----------------------------------------------
+ loset losetup(), loteardown()
+ mkfatfs mkfatfs
+ mkrd ramdisk_register()
+ dd bchlib_setup(), bchlib_read(), bchlib_write(),
+ bchlib_teardown()
+ ps sched_foreach()
+ ifup netdev_foreach()
+ ifdown netdev_foreach()
+ ifconfig netdev_foreach(), uip_stat()
+ ping uip_ping()
+
+ Status: Open
+ Priority: Medium/High -- the kernel build configuration is not fully fielded
yet.
- Title: NSH ps AND mount COMMANDS DISABLED
- Description: NSH's ps and mount command (with not arguments) cannot currently
- be supported in the kernel build. That is because these commands
- depend on kernel internal, non-standard interfaces that are not
- accessible in user-space. These are both critical NSH commands
- and need to be supported.
+ Title: NSH free COMMAND LIMITATION
+ Description: The NSH 'free' command only shows memory usage in the user
+ heap only, not usage in the kernel heap. I am thinking that
+ kernel heap memory usage should be available in /proc/memory.
+ Status: Open
+ Priority: Medium/High
- In addition, the NSH 'free' command only shows memory usage in
- the user headp, not useage in the kernel heap.
+ Title: TELNETD PARTITIONING.
+ Description: Telnetd is implemented as a driver that resides in the apps/
+ directory. In the kernel build, mode, the driver logic must
+ be moved into the kernel part of the build (nuttx/, although
+ the application level interfaces must stay in apps/).
Status: Open
- Priority: High. I really like these commands!
+ Priority: Medium
+
+ Title: NxCONSOLE PARTITIONING.
+ Description: NxConsole is implemented (correctly) as a driver that resides
+ in the nuttx/ directory. However, the user interfaces must be
+ moved into a NuttX library or into apps/. Currently
+ applications calls to the NxConsole user interfaces are
+ undefined.
+ Status: Open
+ Priority: Medium
Title: LOAD-ABLE MODULE SUPPORT UNVERIFIED
Description: It has not been verified if NXFLAT and ELF modules work correctly
@@ -393,7 +425,7 @@ o Kernel Build
Description: When a C++ ELF module is loaded, its C++ constructors are called
via sched/task_starthook.c logic. This logic runs in kernel mode.
The is a security hole because the user code runs with kernel-
- priviledges when the constuctor executes.
+ privileges when the constructor executes.
Destructors likely have the opposite problem. The probably try to
execute some kernel logic in user mode? Obviously this needs to
diff --git a/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig b/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig
index 7dcacfc51..3a814537b 100644
--- a/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -40,6 +40,7 @@ CONFIG_RAW_BINARY=y
#
CONFIG_DEBUG=y
CONFIG_ARCH_HAVE_STACKCHECK=y
+CONFIG_ARCH_HAVE_HEAPCHECK=y
# CONFIG_DEBUG_VERBOSE is not set
#
@@ -54,6 +55,7 @@ CONFIG_ARCH_HAVE_STACKCHECK=y
# CONFIG_DEBUG_GRAPHICS is not set
# CONFIG_DEBUG_IRQ is not set
CONFIG_DEBUG_STACK=y
+# CONFIG_DEBUG_HEAP is not set
#
# Driver Debug Options
@@ -67,6 +69,7 @@ CONFIG_DEBUG_STACK=y
# CONFIG_DEBUG_RTC is not set
# CONFIG_DEBUG_AUDIO is not set
CONFIG_DEBUG_SYMBOLS=y
+CONFIG_DEBUG_NOOPT=y
#
# System Type
@@ -87,6 +90,7 @@ CONFIG_ARCH="arm"
#
# ARM Options
#
+# CONFIG_ARCH_CHIP_A1X is not set
# CONFIG_ARCH_CHIP_C5471 is not set
# CONFIG_ARCH_CHIP_CALYPSO is not set
# CONFIG_ARCH_CHIP_DM320 is not set
@@ -206,6 +210,11 @@ CONFIG_ARCH_CHIP_STM32F407VG=y
# CONFIG_ARCH_CHIP_STM32F427V is not set
# CONFIG_ARCH_CHIP_STM32F427Z is not set
# CONFIG_ARCH_CHIP_STM32F427I is not set
+# CONFIG_ARCH_CHIP_STM32F429V is not set
+# CONFIG_ARCH_CHIP_STM32F429Z is not set
+# CONFIG_ARCH_CHIP_STM32F429I is not set
+# CONFIG_ARCH_CHIP_STM32F429B is not set
+# CONFIG_ARCH_CHIP_STM32F429N is not set
# CONFIG_STM32_STM32L15XX is not set
# CONFIG_STM32_ENERGYLITE is not set
# CONFIG_STM32_STM32F10XX is not set
@@ -223,6 +232,8 @@ CONFIG_STM32_STM32F40XX=y
#
# STM32 Peripheral Support
#
+# CONFIG_STM32_HAVE_USBDEV is not set
+CONFIG_STM32_HAVE_OTGFS=y
# CONFIG_STM32_ADC1 is not set
CONFIG_STM32_ADC2=y
# CONFIG_STM32_ADC3 is not set
@@ -322,10 +333,11 @@ CONFIG_STM32_SPI_DMA=y
# CONFIG_ARCH_NOINTC is not set
# CONFIG_ARCH_VECNOTIRQ is not set
CONFIG_ARCH_DMA=y
-CONFIG_ARCH_IRQPRIO=y
+CONFIG_ARCH_HAVE_IRQPRIO=y
# CONFIG_CUSTOM_STACK is not set
# CONFIG_ADDRENV is not set
CONFIG_ARCH_HAVE_VFORK=y
+CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_STACKDUMP=y
# CONFIG_ENDIAN_BIG is not set
# CONFIG_ARCH_HAVE_RAMFUNCS is not set
@@ -337,8 +349,14 @@ CONFIG_ARCH_HAVE_RAMVECTORS=y
#
CONFIG_BOARD_LOOPSPERMSEC=16717
# CONFIG_ARCH_CALIBRATION is not set
+
+#
+# Interrupt options
+#
CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
CONFIG_ARCH_INTERRUPTSTACK=0
+CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y
+# CONFIG_ARCH_HIPRI_INTERRUPT is not set
#
# Boot options
@@ -386,6 +404,7 @@ CONFIG_MIKROE_FLASH_PART_LIST="8,248,768"
#
# CONFIG_BOARD_INITIALIZE is not set
CONFIG_MSEC_PER_TICK=10
+# CONFIG_SYSTEM_TIME64 is not set
CONFIG_RR_INTERVAL=200
# CONFIG_SCHED_INSTRUMENTATION is not set
CONFIG_TASK_NAME_SIZE=10
@@ -457,14 +476,16 @@ CONFIG_DEV_RANDOM=y
CONFIG_LOOP=y
CONFIG_RAMDISK=y
# CONFIG_CAN is not set
+# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
# CONFIG_PWM is not set
-# CONFIG_I2C is not set
CONFIG_ARCH_HAVE_I2CRESET=y
+# CONFIG_I2C is not set
CONFIG_SPI=y
# CONFIG_SPI_OWNBUS is not set
CONFIG_SPI_EXCHANGE=y
# CONFIG_SPI_CMDDATA is not set
# CONFIG_SPI_BITBANG is not set
+# CONFIG_I2S is not set
CONFIG_RTC=y
CONFIG_RTC_DATETIME=y
CONFIG_RTC_ALARM=y
@@ -473,6 +494,8 @@ CONFIG_RTC_ALARM=y
CONFIG_AUDIO_DEVICES=y
CONFIG_VS1053=y
CONFIG_VS1053_DEVICE_COUNT=1
+CONFIG_VS1053_WORKER_STACKSIZE=768
+# CONFIG_VIDEO_DEVICES is not set
# CONFIG_BCH is not set
CONFIG_INPUT=y
# CONFIG_INPUT_TSC2007 is not set
@@ -499,6 +522,7 @@ CONFIG_LCD_MIO283QT2=y
# CONFIG_LCD_ST7567 is not set
# CONFIG_LCD_UG2864AMBAG01 is not set
# CONFIG_LCD_SSD1289 is not set
+# CONFIG_LCD_SHARP_MEMLCD is not set
CONFIG_LCD_LANDSCAPE=y
# CONFIG_LCD_PORTRAIT is not set
# CONFIG_LCD_RPORTRAIT is not set
@@ -526,11 +550,14 @@ CONFIG_MTD=y
CONFIG_MTD_PARTITION=y
CONFIG_MTD_BYTE_WRITE=y
CONFIG_MTD_CONFIG=y
+# CONFIG_MTD_CONFIG_RAM_CONSOLIDATE is not set
CONFIG_MTD_CONFIG_ERASEDVALUE=0xFF
#
# MTD Device Drivers
#
+# CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_MTD_NAND is not set
CONFIG_RAMMTD=y
CONFIG_RAMMTD_BLOCKSIZE=512
CONFIG_RAMMTD_ERASESIZE=4096
@@ -548,12 +575,14 @@ CONFIG_MTD_SMART=y
CONFIG_MTD_SMART_SECTOR_SIZE=512
# CONFIG_MTD_RAMTRON is not set
# CONFIG_MTD_SST25 is not set
+# CONFIG_MTD_SST25XX is not set
# CONFIG_MTD_SST39FV is not set
# CONFIG_MTD_W25 is not set
# CONFIG_PIPES is not set
# CONFIG_PM is not set
# CONFIG_POWER is not set
# CONFIG_SENSORS is not set
+# CONFIG_SERCOMM_CONSOLE is not set
CONFIG_SERIAL=y
# CONFIG_DEV_LOWCONSOLE is not set
CONFIG_SERIAL_REMOVABLE=y
@@ -650,6 +679,8 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
# File system configuration
#
# CONFIG_DISABLE_MOUNTPOINT is not set
+CONFIG_FS_READABLE=y
+CONFIG_FS_WRITABLE=y
# CONFIG_FS_RAMMAP is not set
CONFIG_FS_FAT=y
# CONFIG_FAT_LCNAMES is not set
@@ -663,6 +694,7 @@ CONFIG_SMARTFS_ERASEDSTATE=0xff
CONFIG_SMARTFS_MAXNAMLEN=16
# CONFIG_SMARTFS_MULTI_ROOT_DIRS is not set
CONFIG_FS_BINFS=y
+# CONFIG_FS_PROCFS is not set
#
# System Logging
@@ -756,6 +788,7 @@ CONFIG_NX_MULTIUSER=y
CONFIG_NX_BLOCKING=y
CONFIG_NX_MXSERVERMSGS=32
CONFIG_NX_MXCLIENTMSGS=16
+# CONFIG_NX_NXSTART is not set
#
# Memory Management
@@ -876,6 +909,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
#
# CONFIG_EXAMPLES_BUTTONS is not set
# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
# CONFIG_EXAMPLES_CXXTEST is not set
# CONFIG_EXAMPLES_DHCPD is not set
# CONFIG_EXAMPLES_ELF is not set
@@ -1079,14 +1113,14 @@ CONFIG_NXWIDGETS=y
# NX Server/Device Configuration
#
CONFIG_NXWIDGETS_FLICKERFREE=y
+# CONFIG_NXWIDGETS_EXTERNINIT is not set
CONFIG_NXWIDGETS_DEVNO=0
-CONFIG_NXWIDGETS_VPLANE=0
+CONFIG_NXWIDGET_SERVERINIT=y
CONFIG_NXWIDGETS_SERVERPRIO=110
CONFIG_NXWIDGETS_SERVERSTACK=2048
CONFIG_NXWIDGETS_CLIENTPRIO=100
CONFIG_NXWIDGETS_LISTENERPRIO=100
CONFIG_NXWIDGETS_LISTENERSTACK=2048
-# CONFIG_NXWIDGETS_EXTERNINIT is not set
# CONFIG_NXWIDGET_EVENTWAIT is not set
#
@@ -1179,10 +1213,7 @@ CONFIG_NXWM_STARTWINDOW_MXMSGS=32
CONFIG_NXWM_STARTWINDOW_MXMPRIO=42
CONFIG_NXWM_STARTWINDOW_PRIO=100
CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048
-
-#
-# NxConsole Window Configuration
-#
+CONFIG_NXWM_NXCONSOLE=y
CONFIG_NXWM_NXCONSOLE_PRIO=100
CONFIG_NXWM_NXCONSOLE_STACKSIZE=2048
# CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set
@@ -1283,6 +1314,7 @@ CONFIG_SYSTEM_FLASH_ERASEALL=y
# NxPlayer media player library / command Line
#
CONFIG_SYSTEM_NXPLAYER=y
+CONFIG_NXPLAYER_PLAYTHREAD_STACKSIZE=1500
CONFIG_NXPLAYER_COMMAND_LINE=y
CONFIG_NXPLAYER_INCLUDE_HELP=y
CONFIG_NXPLAYER_INCLUDE_DEVICE_SEARCH=y
diff --git a/nuttx/configs/sam3u-ek/nxwm/defconfig b/nuttx/configs/sam3u-ek/nxwm/defconfig
index a82ea5311..bb914266e 100644
--- a/nuttx/configs/sam3u-ek/nxwm/defconfig
+++ b/nuttx/configs/sam3u-ek/nxwm/defconfig
@@ -927,6 +927,7 @@ CONFIG_NXWM_STARTWINDOW_STACKSIZE=1596
#
# NxConsole Window Configuration
#
+CONFIG_NXWM_NXCONSOLE=y
CONFIG_NXWM_NXCONSOLE_PRIO=100
CONFIG_NXWM_NXCONSOLE_STACKSIZE=1596
# CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set
diff --git a/nuttx/configs/sama5d3x-ek/nxwm/defconfig b/nuttx/configs/sama5d3x-ek/nxwm/defconfig
index d76f8abea..78a270aa3 100644
--- a/nuttx/configs/sama5d3x-ek/nxwm/defconfig
+++ b/nuttx/configs/sama5d3x-ek/nxwm/defconfig
@@ -963,6 +963,7 @@ CONFIG_NXWM_STARTWINDOW_STACKSIZE=1596
#
# NxConsole Window Configuration
#
+CONFIG_NXWM_NXCONSOLE=y
CONFIG_NXWM_NXCONSOLE_PRIO=100
CONFIG_NXWM_NXCONSOLE_STACKSIZE=1596
# CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set
diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig
index 1568c8282..c2418ab04 100644
--- a/nuttx/configs/shenzhou/nxwm/defconfig
+++ b/nuttx/configs/shenzhou/nxwm/defconfig
@@ -1142,6 +1142,7 @@ CONFIG_NXWM_STARTWINDOW_STACKSIZE=1596
#
# NxConsole Window Configuration
#
+CONFIG_NXWM_NXCONSOLE=y
CONFIG_NXWM_NXCONSOLE_PRIO=100
CONFIG_NXWM_NXCONSOLE_STACKSIZE=1596
# CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set
diff --git a/nuttx/configs/sim/nxwm/defconfig b/nuttx/configs/sim/nxwm/defconfig
index 5dfedf1c7..f5ead1cb2 100644
--- a/nuttx/configs/sim/nxwm/defconfig
+++ b/nuttx/configs/sim/nxwm/defconfig
@@ -738,6 +738,7 @@ CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048
#
# NxConsole Window Configuration
#
+CONFIG_NXWM_NXCONSOLE=y
CONFIG_NXWM_NXCONSOLE_PRIO=100
CONFIG_NXWM_NXCONSOLE_STACKSIZE=8192
# CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set
diff --git a/nuttx/configs/stm3220g-eval/nxwm/defconfig b/nuttx/configs/stm3220g-eval/nxwm/defconfig
index 3711e4b34..e0d36df7c 100644
--- a/nuttx/configs/stm3220g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3220g-eval/nxwm/defconfig
@@ -1165,6 +1165,7 @@ CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048
#
# NxConsole Window Configuration
#
+CONFIG_NXWM_NXCONSOLE=y
CONFIG_NXWM_NXCONSOLE_PRIO=100
CONFIG_NXWM_NXCONSOLE_STACKSIZE=2048
# CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt
index 4051cf7a1..a933884cc 100644
--- a/nuttx/configs/stm3240g-eval/README.txt
+++ b/nuttx/configs/stm3240g-eval/README.txt
@@ -991,7 +991,22 @@ Where <subdir> is one of the following:
This is easily changed by modifying the configuration.
- 3. At the end of the build, there will be several files in the top-level
+ 3. In addition to the the kernel mode build, this NxWM configuration
+ differences from the nxwm configuration in that:
+
+ a. Networking is disabled. There are issues with some of the network-
+ related NSH commands and with Telnet in the kernel build (see the
+ top-level TODO file). Without these NSH commands, there is no use
+ for networking in this configuration.
+
+ b. The NxConsole windows are disabled. There are also issues with the
+ NxConsole build now (see the top-level TODO file).
+
+ c. The initialization sequence is quite different: NX and the
+ touchscreen are initialized in kernel mode by logic in this src/
+ directory before the NxWM application is started.
+
+ 4. At the end of the build, there will be several files in the top-level
NuttX build directory:
PASS1:
@@ -1004,7 +1019,7 @@ Where <subdir> is one of the following:
nuttx.hex - The pass2 Intel HEX file (selected in defconfig)
System.map - Symbols in the kernel-space ELF file
- 4. Combining .hex files. If you plan to use the STM32 ST-Link Utility to
+ 5. Combining .hex files. If you plan to use the STM32 ST-Link Utility to
load the .hex files into FLASH, then you need to combine the two hex
files into a single .hex file. Here is how you can do that.
diff --git a/nuttx/configs/stm3240g-eval/knxwm/defconfig b/nuttx/configs/stm3240g-eval/knxwm/defconfig
index 59788142e..ed7996713 100644
--- a/nuttx/configs/stm3240g-eval/knxwm/defconfig
+++ b/nuttx/configs/stm3240g-eval/knxwm/defconfig
@@ -121,7 +121,6 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
# CONFIG_SERIAL_TERMIOS is not set
-# CONFIG_NET_MULTICAST is not set
#
# STM32 Configuration Options
@@ -235,7 +234,7 @@ CONFIG_STM32_HAVE_OTGFS=y
# CONFIG_STM32_DAC1 is not set
# CONFIG_STM32_DAC2 is not set
# CONFIG_STM32_DCMI is not set
-CONFIG_STM32_ETHMAC=y
+# CONFIG_STM32_ETHMAC is not set
CONFIG_STM32_FSMC=y
# CONFIG_STM32_HASH is not set
CONFIG_STM32_I2C1=y
@@ -306,24 +305,6 @@ CONFIG_STM32_I2CTIMEOTICKS=500
# CONFIG_STM32_I2C_DUTY16_9 is not set
#
-# Ethernet MAC configuration
-#
-CONFIG_STM32_PHYADDR=1
-# CONFIG_STM32_PHYINIT is not set
-CONFIG_STM32_MII=y
-CONFIG_STM32_MII_MCO1=y
-# CONFIG_STM32_MII_MCO2 is not set
-# CONFIG_STM32_MII_EXTCLK is not set
-CONFIG_STM32_AUTONEG=y
-CONFIG_STM32_PHYSR=16
-# CONFIG_STM32_PHYSR_ALTCONFIG is not set
-CONFIG_STM32_PHYSR_SPEED=0x0002
-CONFIG_STM32_PHYSR_100MBPS=0x0000
-CONFIG_STM32_PHYSR_MODE=0x0004
-CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004
-# CONFIG_STM32_ETH_PTP is not set
-
-#
# USB Host Configuration
#
@@ -549,33 +530,6 @@ CONFIG_LCD_LANDSCAPE=y
# CONFIG_LCD_LCD1602 is not set
# CONFIG_MMCSD is not set
# CONFIG_MTD is not set
-CONFIG_NETDEVICES=y
-
-#
-# General Ethernet MAC Driver Options
-#
-# CONFIG_NETDEV_MULTINIC is not set
-
-#
-# External Ethernet MAC Device Support
-#
-# CONFIG_NET_DM90x0 is not set
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCX24J600 is not set
-# CONFIG_NET_E1000 is not set
-# CONFIG_NET_SLIP is not set
-# CONFIG_NET_VNET is not set
-
-#
-# External Ethernet PHY Device Support
-#
-CONFIG_ETH0_PHY_NONE=y
-# CONFIG_ETH0_PHY_KS8721 is not set
-# CONFIG_ETH0_PHY_KSZ8051 is not set
-# CONFIG_ETH0_PHY_KSZ90x1 is not set
-# CONFIG_ETH0_PHY_DP83848C is not set
-# CONFIG_ETH0_PHY_LAN8720 is not set
-# CONFIG_ETH0_PHY_DM9161 is not set
# CONFIG_PIPES is not set
# CONFIG_PM is not set
# CONFIG_POWER is not set
@@ -624,49 +578,9 @@ CONFIG_USART3_2STOP=0
#
# Networking Support
#
-CONFIG_ARCH_HAVE_NET=y
-CONFIG_ARCH_HAVE_PHY=y
-CONFIG_NET=y
-# CONFIG_NET_NOINTS is not set
-CONFIG_NET_MULTIBUFFER=y
-# CONFIG_NET_PROMISCUOUS is not set
-# CONFIG_NET_IPv6 is not set
-CONFIG_NSOCKET_DESCRIPTORS=10
-CONFIG_NET_NACTIVESOCKETS=16
-CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFSIZE=562
-# CONFIG_NET_TCPURGDATA is not set
-
-#
-# TCP/IP Networking
-#
-CONFIG_NET_TCP=y
-CONFIG_NET_TCP_CONNS=40
-CONFIG_NET_MAX_LISTENPORTS=40
-CONFIG_NET_TCP_READAHEAD_BUFSIZE=562
-CONFIG_NET_NTCP_READAHEAD_BUFFERS=16
-CONFIG_NET_TCP_RECVDELAY=0
-CONFIG_NET_TCPBACKLOG=y
-# CONFIG_NET_TCP_SPLIT is not set
-# CONFIG_NET_SENDFILE is not set
-
-#
-# UDP Networking
-#
-CONFIG_NET_UDP=y
-CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NET_UDP_CONNS=8
-# CONFIG_NET_BROADCAST is not set
-# CONFIG_NET_RXAVAIL is not set
-CONFIG_NET_ICMP=y
-CONFIG_NET_ICMP_PING=y
-# CONFIG_NET_PINGADDRCONF is not set
-# CONFIG_NET_IGMP is not set
-CONFIG_NET_STATISTICS=y
-CONFIG_NET_RECEIVE_WINDOW=562
-CONFIG_NET_ARPTAB_SIZE=16
-# CONFIG_NET_ARP_IPIN is not set
-# CONFIG_NET_ROUTE is not set
+# CONFIG_ARCH_HAVE_NET is not set
+# CONFIG_ARCH_HAVE_PHY is not set
+# CONFIG_NET is not set
#
# File Systems
@@ -685,7 +599,6 @@ CONFIG_FAT_LFN=y
CONFIG_FAT_MAXFNAME=32
# CONFIG_FS_FATTIME is not set
# CONFIG_FAT_DMAMEMORY is not set
-# CONFIG_NFS is not set
# CONFIG_FS_NXFFS is not set
# CONFIG_FS_ROMFS is not set
# CONFIG_FS_SMARTFS is not set
@@ -755,24 +668,7 @@ CONFIG_NXFONT_SANS22X29B=y
# CONFIG_NXFONT_SERIF22X28B is not set
# CONFIG_NXFONT_SERIF27X38B is not set
# CONFIG_NXFONT_SERIF38X49B is not set
-CONFIG_NXCONSOLE=y
-
-#
-# NxConsole Output Text/Graphics Options
-#
-CONFIG_NXCONSOLE_BPP=16
-CONFIG_NXCONSOLE_CURSORCHAR=137
-CONFIG_NXCONSOLE_MXCHARS=325
-CONFIG_NXCONSOLE_CACHESIZE=32
-CONFIG_NXCONSOLE_LINESEPARATION=0
-# CONFIG_NXCONSOLE_NOWRAP is not set
-
-#
-# NxConsole Input options
-#
-CONFIG_NXCONSOLE_NXKBDIN=y
-CONFIG_NXCONSOLE_KBDBUFSIZE=16
-CONFIG_NXCONSOLE_NPOLLWAITERS=4
+# CONFIG_NXCONSOLE is not set
#
# NX Multi-user only options
@@ -898,7 +794,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
# CONFIG_EXAMPLES_MM is not set
# CONFIG_EXAMPLES_MODBUS is not set
# CONFIG_EXAMPLES_MOUNT is not set
-# CONFIG_EXAMPLES_NETTEST is not set
# CONFIG_EXAMPLES_NRF24L01TERM is not set
# CONFIG_EXAMPLES_NSH is not set
# CONFIG_EXAMPLES_NULL is not set
@@ -928,12 +823,10 @@ CONFIG_HAVE_CXXINITIALIZE=y
# CONFIG_EXAMPLES_TIFF is not set
# CONFIG_EXAMPLES_TOUCHSCREEN is not set
# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_DISCOVER is not set
# CONFIG_EXAMPLES_UIP is not set
# CONFIG_EXAMPLES_USBSERIAL is not set
# CONFIG_EXAMPLES_USBTERM is not set
# CONFIG_EXAMPLES_WATCHDOG is not set
-# CONFIG_EXAMPLES_WGET is not set
#
# Graphics Support
@@ -969,9 +862,6 @@ CONFIG_NETUTILS_TFTPC=y
CONFIG_NETUTILS_UIPLIB=y
CONFIG_NETUTILS_WEBCLIENT=y
CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
-# CONFIG_NETUTILS_WEBSERVER is not set
-# CONFIG_NETUTILS_DISCOVER is not set
-# CONFIG_NETUTILS_XMLRPC is not set
#
# FreeModBus
@@ -1048,19 +938,6 @@ CONFIG_NSH_CONSOLE=y
#
# CONFIG_NSH_CONDEV is not set
# CONFIG_NSH_ARCHINIT is not set
-CONFIG_NSH_TELNET=y
-CONFIG_NSH_TELNETD_PORT=23
-CONFIG_NSH_TELNETD_DAEMONPRIO=100
-CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048
-CONFIG_NSH_TELNETD_CLIENTPRIO=100
-CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048
-CONFIG_NSH_IOBUFFER_SIZE=512
-# CONFIG_NSH_TELNET_LOGIN is not set
-CONFIG_NSH_IPADDR=0x0a000002
-CONFIG_NSH_DRIPADDR=0x0a000001
-CONFIG_NSH_NETMASK=0xffffff00
-CONFIG_NSH_NOMAC=y
-CONFIG_NSH_MAX_ROUNDTRIP=20
#
# NxWidgets/NxWM
@@ -1173,15 +1050,7 @@ CONFIG_NXWM_STARTWINDOW_MXMSGS=32
CONFIG_NXWM_STARTWINDOW_MXMPRIO=42
CONFIG_NXWM_STARTWINDOW_PRIO=100
CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048
-
-#
-# NxConsole Window Configuration
-#
-CONFIG_NXWM_NXCONSOLE_PRIO=100
-CONFIG_NXWM_NXCONSOLE_STACKSIZE=2048
-# CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set
-# CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID is not set
-# CONFIG_NXWM_CUSTOM_NXCONSOLE_ICON is not set
+# CONFIG_NXWM_NXCONSOLE is not set
#
# NxWM Touchscreen Configuration
diff --git a/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig
index 033eed142..eb174bae8 100644
--- a/nuttx/configs/stm3240g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxwm/defconfig
@@ -1160,6 +1160,7 @@ CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048
#
# NxConsole Window Configuration
#
+CONFIG_NXWM_NXCONSOLE=y
CONFIG_NXWM_NXCONSOLE_PRIO=100
CONFIG_NXWM_NXCONSOLE_STACKSIZE=2048
# CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set