diff --git a/configs/compal_e99/nsh_highram/defconfig b/configs/compal_e99/nsh_highram/defconfig index c2b4143cd38..31d081cc06e 100644 --- a/configs/compal_e99/nsh_highram/defconfig +++ b/configs/compal_e99/nsh_highram/defconfig @@ -442,7 +442,7 @@ CONFIG_NXFONT_SANS17X22=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig index f138c43c2a1..c21b8d070ba 100644 --- a/configs/hymini-stm32v/nsh2/defconfig +++ b/configs/hymini-stm32v/nsh2/defconfig @@ -574,7 +574,7 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig index ecf685b1a2d..3a8937b564d 100644 --- a/configs/lm3s6965-ek/nx/defconfig +++ b/configs/lm3s6965-ek/nx/defconfig @@ -501,7 +501,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig index 48eddce40ac..9a5fb168ae5 100644 --- a/configs/lm3s8962-ek/nx/defconfig +++ b/configs/lm3s8962-ek/nx/defconfig @@ -509,7 +509,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig index 3493ab8a1d3..0b91b49c631 100644 --- a/configs/lpcxpresso-lpc1768/nx/defconfig +++ b/configs/lpcxpresso-lpc1768/nx/defconfig @@ -562,7 +562,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig index bf092dc6e16..1e957f7bf0b 100644 --- a/configs/maple/nx/defconfig +++ b/configs/maple/nx/defconfig @@ -656,7 +656,7 @@ CONFIG_NXFONT_MONO5X8=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig index cafb64c8961..40a9c8ffa48 100644 --- a/configs/mikroe-stm32f4/fulldemo/defconfig +++ b/configs/mikroe-stm32f4/fulldemo/defconfig @@ -795,24 +795,24 @@ CONFIG_NXFONT_SANS28X37B=y CONFIG_NXFONT_SERIF22X28B=y # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=128 -CONFIG_NXCONSOLE_CACHESIZE=16 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=128 +CONFIG_NXTERM_CACHESIZE=16 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -# CONFIG_NXCONSOLE_NXKBDIN is not set -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +# CONFIG_NXTERM_NXKBDIN is not set +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig index 24cb3e12e4d..7b70b70c6a4 100644 --- a/configs/mikroe-stm32f4/nx/defconfig +++ b/configs/mikroe-stm32f4/nx/defconfig @@ -579,7 +579,7 @@ CONFIG_NXFONTS_CHARBITS=7 CONFIG_NXFONT_SERIF22X28B=y # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig index 97701635b49..8092b9b74ae 100644 --- a/configs/mikroe-stm32f4/nxlines/defconfig +++ b/configs/mikroe-stm32f4/nxlines/defconfig @@ -579,7 +579,7 @@ CONFIG_NXFONTS_CHARBITS=7 CONFIG_NXFONT_SERIF22X28B=y # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig index bd9ea94bf4c..82fd22bf47f 100644 --- a/configs/mikroe-stm32f4/nxtext/defconfig +++ b/configs/mikroe-stm32f4/nxtext/defconfig @@ -579,7 +579,7 @@ CONFIG_NXFONTS_CHARBITS=7 CONFIG_NXFONT_SERIF22X28B=y # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig index 2269ecf68a8..365f20b0060 100644 --- a/configs/olimex-lpc1766stk/nx/defconfig +++ b/configs/olimex-lpc1766stk/nx/defconfig @@ -573,7 +573,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/open1788/nxlines/defconfig b/configs/open1788/nxlines/defconfig index 1439ad34c48..9012a7ebe85 100644 --- a/configs/open1788/nxlines/defconfig +++ b/configs/open1788/nxlines/defconfig @@ -483,7 +483,7 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig index bdc315fa584..ffe63cf2098 100644 --- a/configs/sam3u-ek/nx/defconfig +++ b/configs/sam3u-ek/nx/defconfig @@ -542,7 +542,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig index 8271d94da34..0fd1c56e7ef 100644 --- a/configs/sam3u-ek/nxwm/defconfig +++ b/configs/sam3u-ek/nxwm/defconfig @@ -571,24 +571,24 @@ 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 +CONFIG_NXTERM=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 +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=325 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -CONFIG_NXCONSOLE_NXKBDIN=y -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +CONFIG_NXTERM_NXKBDIN=y +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/configs/sam4e-ek/nxwm/defconfig b/configs/sam4e-ek/nxwm/defconfig index 4a786be286e..59d1ae2df89 100644 --- a/configs/sam4e-ek/nxwm/defconfig +++ b/configs/sam4e-ek/nxwm/defconfig @@ -832,24 +832,24 @@ 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 +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=396 -CONFIG_NXCONSOLE_CACHESIZE=32 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=396 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -CONFIG_NXCONSOLE_NXKBDIN=y -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +CONFIG_NXTERM_NXKBDIN=y +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig index 9e30c599c90..1100c1173bc 100644 --- a/configs/sama5d3x-ek/nx/defconfig +++ b/configs/sama5d3x-ek/nx/defconfig @@ -641,7 +641,7 @@ CONFIG_NXFONTS_CHARBITS=7 CONFIG_NXFONT_SERIF22X28B=y # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig index 817bea787d1..e76e692a1de 100644 --- a/configs/sama5d3x-ek/nxwm/defconfig +++ b/configs/sama5d3x-ek/nxwm/defconfig @@ -685,24 +685,24 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=640 -CONFIG_NXCONSOLE_CACHESIZE=32 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=640 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -CONFIG_NXCONSOLE_NXKBDIN=y -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +CONFIG_NXTERM_NXKBDIN=y +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig index f9fb269b43d..f24b57be04f 100644 --- a/configs/sama5d4-ek/nsh/defconfig +++ b/configs/sama5d4-ek/nsh/defconfig @@ -955,7 +955,7 @@ CONFIG_NXFONTS_CHARBITS=7 CONFIG_NXFONT_SERIF22X28B=y # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig index 5ba96006496..8b18b926ab0 100644 --- a/configs/sama5d4-ek/nxwm/defconfig +++ b/configs/sama5d4-ek/nxwm/defconfig @@ -919,24 +919,24 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=640 -CONFIG_NXCONSOLE_CACHESIZE=32 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=640 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -CONFIG_NXCONSOLE_NXKBDIN=y -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +CONFIG_NXTERM_NXKBDIN=y +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig index f482646617a..83bc63bc6fc 100644 --- a/configs/shenzhou/nxwm/defconfig +++ b/configs/shenzhou/nxwm/defconfig @@ -734,24 +734,24 @@ 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 +CONFIG_NXTERM=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 +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=325 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -CONFIG_NXCONSOLE_NXKBDIN=y -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +CONFIG_NXTERM_NXKBDIN=y +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/configs/sim/README.txt b/configs/sim/README.txt index 7cedabed7cd..7fe91efd9e3 100644 --- a/configs/sim/README.txt +++ b/configs/sim/README.txt @@ -459,8 +459,8 @@ nx11 First, select Multi-User mode as described above. Then add the following definitions to the defconfig file: - -CONFIG_NXCONSOLE=n - +CONFIG_NXCONSOLE=y + -CONFIG_NXTERM=n + +CONFIG_NXTERM=y -CONFIG_NX_MULTIUSER=n +CONFIG_NX_MULTIUSER=y diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig index c23c92379f4..9c0a53b884e 100644 --- a/configs/sim/nsh2/defconfig +++ b/configs/sim/nsh2/defconfig @@ -351,7 +351,7 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig index 78fe7db94ac..873a96b5cd3 100644 --- a/configs/sim/nx/defconfig +++ b/configs/sim/nx/defconfig @@ -376,7 +376,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig index 3de91c405f9..8a7555f216c 100644 --- a/configs/sim/nx11/defconfig +++ b/configs/sim/nx11/defconfig @@ -377,7 +377,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/sim/nxlines/defconfig b/configs/sim/nxlines/defconfig index fe3082e7c7f..d703bda1278 100644 --- a/configs/sim/nxlines/defconfig +++ b/configs/sim/nxlines/defconfig @@ -376,7 +376,7 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig index 70258c8d7dd..a3e158ae252 100644 --- a/configs/sim/nxwm/defconfig +++ b/configs/sim/nxwm/defconfig @@ -367,24 +367,24 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=32 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=256 -CONFIG_NXCONSOLE_CACHESIZE=16 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=32 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=256 +CONFIG_NXTERM_CACHESIZE=16 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -# CONFIG_NXCONSOLE_NXKBDIN is not set -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +# CONFIG_NXTERM_NXKBDIN is not set +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/configs/sim/touchscreen/defconfig b/configs/sim/touchscreen/defconfig index 69f8da57e50..01279db9eee 100644 --- a/configs/sim/touchscreen/defconfig +++ b/configs/sim/touchscreen/defconfig @@ -385,7 +385,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt index d253c0ff0a9..7b8763f94ed 100644 --- a/configs/stm3210e-eval/README.txt +++ b/configs/stm3210e-eval/README.txt @@ -926,7 +926,7 @@ Where is one of the following: The following definition in the defconfig file to enables the NxConsole driver: - CONFIG_NXCONSOLE=y + CONFIG_NXTERM=y And this selects apps/examples/nxconsole instead of apps/examples/nsh: diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig index 13cff433818..2ff295f9951 100644 --- a/configs/stm3210e-eval/nsh2/defconfig +++ b/configs/stm3210e-eval/nsh2/defconfig @@ -752,7 +752,7 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig index d653e5e69b2..ff91b744d80 100644 --- a/configs/stm3210e-eval/nx/defconfig +++ b/configs/stm3210e-eval/nx/defconfig @@ -678,7 +678,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/stm3210e-eval/nxconsole/defconfig b/configs/stm3210e-eval/nxconsole/defconfig index 92e280bbcbb..cdb898a626b 100644 --- a/configs/stm3210e-eval/nxconsole/defconfig +++ b/configs/stm3210e-eval/nxconsole/defconfig @@ -655,24 +655,24 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=256 -CONFIG_NXCONSOLE_CACHESIZE=32 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=256 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -# CONFIG_NXCONSOLE_NXKBDIN is not set -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +# CONFIG_NXTERM_NXKBDIN is not set +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig index 941002e245f..9c4f8e611f0 100644 --- a/configs/stm3210e-eval/pm/defconfig +++ b/configs/stm3210e-eval/pm/defconfig @@ -676,7 +676,7 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig index c487150892f..7d8f4d7cb9c 100644 --- a/configs/stm3220g-eval/nxwm/defconfig +++ b/configs/stm3220g-eval/nxwm/defconfig @@ -788,24 +788,24 @@ 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 +CONFIG_NXTERM=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 +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=325 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -CONFIG_NXCONSOLE_NXKBDIN=y -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +CONFIG_NXTERM_NXKBDIN=y +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/configs/stm3240g-eval/README.txt b/configs/stm3240g-eval/README.txt index f3be1fa4f59..0d5feef1c9d 100644 --- a/configs/stm3240g-eval/README.txt +++ b/configs/stm3240g-eval/README.txt @@ -1424,7 +1424,7 @@ Where is one of the following: The following definition in the defconfig file to enables the NxConsole driver: - CONFIG_NXCONSOLE=y + CONFIG_NXTERM=y And this selects examples/nxconsole instead of examples/nsh: diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig index 0ac4f2c90b1..f4304e54cd5 100644 --- a/configs/stm3240g-eval/knxwm/defconfig +++ b/configs/stm3240g-eval/knxwm/defconfig @@ -788,7 +788,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 is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/stm3240g-eval/nxconsole/defconfig b/configs/stm3240g-eval/nxconsole/defconfig index ef13a86cf09..60f4643a3dc 100644 --- a/configs/stm3240g-eval/nxconsole/defconfig +++ b/configs/stm3240g-eval/nxconsole/defconfig @@ -761,24 +761,24 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=256 -CONFIG_NXCONSOLE_CACHESIZE=32 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=256 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -# CONFIG_NXCONSOLE_NXKBDIN is not set -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +# CONFIG_NXTERM_NXKBDIN is not set +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig index 7cd0c9a0ca4..b73f68a3130 100644 --- a/configs/stm3240g-eval/nxwm/defconfig +++ b/configs/stm3240g-eval/nxwm/defconfig @@ -783,24 +783,24 @@ 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 +CONFIG_NXTERM=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 +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=325 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -CONFIG_NXCONSOLE_NXKBDIN=y -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +CONFIG_NXTERM_NXKBDIN=y +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig index 29c5dac3afe..4b8e2d22d31 100644 --- a/configs/stm32f4discovery/nxlines/defconfig +++ b/configs/stm32f4discovery/nxlines/defconfig @@ -664,7 +664,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 is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig index eebed8b3e27..1c3a1e4a706 100644 --- a/configs/zkit-arm-1769/nxhello/defconfig +++ b/configs/zkit-arm-1769/nxhello/defconfig @@ -667,7 +667,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/configs/zp214xpa/nxlines/defconfig b/configs/zp214xpa/nxlines/defconfig index 9a9852fcaba..d01456331c8 100644 --- a/configs/zp214xpa/nxlines/defconfig +++ b/configs/zp214xpa/nxlines/defconfig @@ -378,7 +378,7 @@ CONFIG_NXFONT_MONO5X8=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options