diff --git a/arch/z80/src/ez80/ez80_serial.c b/arch/z80/src/ez80/ez80_serial.c index e5fefbd87af678f53b65108accba0a8e54009a39..e6eaabd0cecb2621277921a4e16ee0dfede1c0aa 100644 --- a/arch/z80/src/ez80/ez80_serial.c +++ b/arch/z80/src/ez80/ez80_serial.c @@ -678,7 +678,7 @@ void up_serialinit(void) /* Make sure that all UART interrupts are disabled */ ez80_disableuartint(TTYS0_DEV.priv); -#ifdef TTYS1DEV +#ifdef TTYS1_DEV ez80_disableuartint(TTYS1_DEV.priv); #endif @@ -729,7 +729,7 @@ void up_serialinit(void) (void)uart_register("/dev/console", &CONSOLE_DEV); #endif (void)uart_register("/dev/ttyS0", &TTYS0_DEV); -#ifdef TTYS1DEV +#ifdef TTYS1_DEV (void)uart_register("/dev/ttyS1", &TTYS1_DEV); #endif } diff --git a/configs/stm3210e-eval/nsh2/appconfig b/configs/stm3210e-eval/nsh2/appconfig index 62724fb96176cac8f32ed15c4aef6666caa72e55..d3fe4cc28dca8d21282d51fc8f192b32cb54532c 100644 --- a/configs/stm3210e-eval/nsh2/appconfig +++ b/configs/stm3210e-eval/nsh2/appconfig @@ -41,8 +41,9 @@ CONFIGURED_APPS += examples/nsh CONFIGURED_APPS += nshlib -# The NX example configured as an NX built-in command +# The NX and NXHELLO examples configured as an NX built-in commands CONFIGURED_APPS += examples/nx +CONFIGURED_APPS += examples/nxhello diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig index 7b95b1a8e0720f7bc1867b9254ad2a3122d98906..988d659e4b7ecd6916573761e3c7466c30c819d0 100644 --- a/configs/stm3210e-eval/nsh2/defconfig +++ b/configs/stm3210e-eval/nsh2/defconfig @@ -1008,6 +1008,35 @@ CONFIG_EXAMPLES_NX_SERVERPRIO=120 CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4 CONFIG_EXAMPLES_NX_EXTERNINIT=n +# +# Settings for examples/nx +# +# CONFIG_EXAMPLES_NXHELLO_BUILTIN -- Build the NXHELLO example as a "built-in" +# that can be executed from the NSH command line +# CONFIG_EXAMPLES_NXHELLO_VPLANE -- The plane to select from the frame- +# buffer driver for use in the test. Default: 0 +# CONFIG_EXAMPLES_NXHELLO_DEVNO - The LCD device to select from the LCD +# driver for use in the test: Default: 0 +# CONFIG_EXAMPLES_NXHELLO_BGCOLOR -- The color of the background. Default +# depends on CONFIG_EXAMPLES_NXHELLO_BPP. +# CONFIG_EXAMPLES_NXHELLO_FONTCOLOR -- The color of the fonts used in the +# background window. Default depends on CONFIG_EXAMPLES_NXHELLO_BPP. +# CONFIG_EXAMPLES_NXHELLO_BPP -- Pixels per pixel to use. Valid options +# include 2, 4, 8, 16, 24, and 32. Default is 32. +# CONFIG_EXAMPLES_NXHELLO_EXTERNINIT - The driver for the graphics device on +# this platform requires some unusual initialization. This is the +# for, for example, SPI LCD/OLED devices. If this configuration is +# selected, then the platform code must provide an LCD initialization +# function. +# +CONFIG_EXAMPLES_NXHELLO_BUILTIN=y +CONFIG_EXAMPLES_NXHELLO_VPLANE=0 +CONFIG_EXAMPLES_NXHELLO_DEVNO=0 +CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011 +CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xffdf +CONFIG_EXAMPLES_NXHELLO_BPP=16 +CONFIG_EXAMPLES_NXHELLO_EXTERNINIT=n + # # Stack and heap information #