From 19e1717a895d718ae3720cd88db4cf1ac1fe52ed Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 4 Apr 2019 18:50:28 -0600 Subject: [PATCH] Refresh a configuration. Remove CONFIG_NXWM_UNITTEST=y, not longer in Kconfigs. --- configs/lpcxpresso-lpc54628/nxwm/defconfig | 1 - configs/mikroe-stm32f4/fulldemo/defconfig | 1 - configs/sam3u-ek/nxwm/defconfig | 1 - configs/sam4e-ek/nxwm/defconfig | 1 - configs/sama5d3x-ek/nxwm/defconfig | 1 - configs/sama5d4-ek/nxwm/defconfig | 75 +++++++++++----------- configs/samv71-xult/nxwm/defconfig | 1 - configs/samv71-xult/vnxwm/defconfig | 1 - configs/shenzhou/nxwm/defconfig | 1 - configs/sim/nxwm/defconfig | 1 - configs/stm3220g-eval/nxwm/defconfig | 1 - configs/stm3240g-eval/knxwm/defconfig | 1 - configs/stm3240g-eval/nxwm/defconfig | 1 - configs/stm32f429i-disco/nxwm/defconfig | 1 - 14 files changed, 36 insertions(+), 52 deletions(-) diff --git a/configs/lpcxpresso-lpc54628/nxwm/defconfig b/configs/lpcxpresso-lpc54628/nxwm/defconfig index 7f20badb58..338544a7f0 100644 --- a/configs/lpcxpresso-lpc54628/nxwm/defconfig +++ b/configs/lpcxpresso-lpc54628/nxwm/defconfig @@ -85,7 +85,6 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5 CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_TASKBAR_LEFT=y CONFIG_NXWM_TASKBAR_VSPACING=4 -CONFIG_NXWM_UNITTEST=y CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig index c986ea20b0..08bf778e61 100644 --- a/configs/mikroe-stm32f4/fulldemo/defconfig +++ b/configs/mikroe-stm32f4/fulldemo/defconfig @@ -105,7 +105,6 @@ CONFIG_NXWM_MEDIAPLAYER=y CONFIG_NXWM_TASKBAR_LEFT=y CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA=y CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=100 -CONFIG_NXWM_UNITTEST=y CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig index 287434e025..7000558221 100644 --- a/configs/sam3u-ek/nxwm/defconfig +++ b/configs/sam3u-ek/nxwm/defconfig @@ -73,7 +73,6 @@ CONFIG_NXWM_TASKBAR_LEFT=y CONFIG_NXWM_TASKBAR_VSPACING=4 CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=100 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1596 -CONFIG_NXWM_UNITTEST=y CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_WRITEONLY=y diff --git a/configs/sam4e-ek/nxwm/defconfig b/configs/sam4e-ek/nxwm/defconfig index 76bb27a56a..05020514e2 100644 --- a/configs/sam4e-ek/nxwm/defconfig +++ b/configs/sam4e-ek/nxwm/defconfig @@ -101,7 +101,6 @@ CONFIG_NXWM_TASKBAR_VSPACING=4 CONFIG_NXWM_TOOLBAR_CUSTOM_FONTID=y CONFIG_NXWM_TOOLBAR_FONTID=5 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1596 -CONFIG_NXWM_UNITTEST=y CONFIG_NX_BGCOLOR=0x95fa CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig index 951a48dc75..cab645464e 100644 --- a/configs/sama5d3x-ek/nxwm/defconfig +++ b/configs/sama5d3x-ek/nxwm/defconfig @@ -82,7 +82,6 @@ CONFIG_NXWM_TASKBAR_VSPACING=8 CONFIG_NXWM_TOOLBAR_CUSTOM_FONTID=y CONFIG_NXWM_TOOLBAR_FONTID=6 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1596 -CONFIG_NXWM_UNITTEST=y CONFIG_NX_BGCOLOR=0x95fa CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig index 0cc1647681..574ee42dc8 100644 --- a/configs/sama5d4-ek/nxwm/defconfig +++ b/configs/sama5d4-ek/nxwm/defconfig @@ -8,15 +8,16 @@ # CONFIG_AUDIO_FORMAT_MP3 is not set # CONFIG_MMCSD_MMCSUPPORT is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set -# CONFIG_NX_DISABLE_16BPP is not set # CONFIG_NXFONTS_DISABLE_16BPP is not set # CONFIG_NXPLAYER_COMMAND_LINE is not set # CONFIG_NXPLAYER_INCLUDE_DEVICE_SEARCH is not set # CONFIG_NXWM_MEDIAPLAYER_NOFILTER is not set +# CONFIG_NX_DISABLE_16BPP is not set # CONFIG_SAMA5_UART0 is not set # CONFIG_SAMA5_UHPHS_RHPORT1 is not set -CONFIG_ARCH_BOARD_SAMA5D4_EK=y +CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d4-ek" +CONFIG_ARCH_BOARD_SAMA5D4_EK=y CONFIG_ARCH_BUTTONS=y CONFIG_ARCH_CHIP_ATSAMA5D44=y CONFIG_ARCH_CHIP_SAMA5=y @@ -25,11 +26,10 @@ CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_IRQBUTTONS=y CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="arm" CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y +CONFIG_AUDIO=y CONFIG_AUDIO_NULL=y CONFIG_AUDIO_NUM_BUFFERS=4 -CONFIG_AUDIO=y CONFIG_BOARD_LOOPSPERMSEC=65775 CONFIG_BOOT_RUNFROMSDRAM=y CONFIG_BUILTIN=y @@ -46,38 +46,36 @@ CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y CONFIG_HIDKBD_POLLUSEC=80000 CONFIG_HOST_WINDOWS=y -CONFIG_I2C_RESET=y CONFIG_I2C=y CONFIG_I2CTOOL_DEFFREQ=100000 CONFIG_I2CTOOL_MAXBUS=0 -CONFIG_INPUT_MXT=y +CONFIG_I2C_RESET=y CONFIG_INPUT=y +CONFIG_INPUT_MXT=y CONFIG_INTELHEX_BINARY=y -CONFIG_LIB_BOARDCTL=y CONFIG_LIBC_FLOATINGPOINT=y CONFIG_LIBM=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 +CONFIG_MMCSD=y CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_MMCSD_SDIO=y -CONFIG_MMCSD=y CONFIG_MQ_MAXMSGSIZE=64 -CONFIG_NET_ARP_IPIN=y -CONFIG_NET_BROADCAST=y -CONFIG_NET_ICMP_SOCKET=y -CONFIG_NET_ICMP=y -CONFIG_NET_SOCKOPTS=y -CONFIG_NET_STATISTICS=y -CONFIG_NET_TCP_WRITE_BUFFERS=y -CONFIG_NET_TCP=y -CONFIG_NET_TCPBACKLOG=y -CONFIG_NET_UDP=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSSERVER_NOADDR=y CONFIG_NETUTILS_TELNETD=y CONFIG_NETUTILS_TFTPC=y CONFIG_NETUTILS_WEBCLIENT=y +CONFIG_NET_ARP_IPIN=y +CONFIG_NET_BROADCAST=y +CONFIG_NET_ICMP=y +CONFIG_NET_ICMP_SOCKET=y +CONFIG_NET_STATISTICS=y +CONFIG_NET_TCP=y +CONFIG_NET_TCPBACKLOG=y +CONFIG_NET_TCP_WRITE_BUFFERS=y +CONFIG_NET_UDP=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y @@ -89,24 +87,21 @@ CONFIG_NSH_NETINIT_THREAD=y CONFIG_NSH_NOMAC=y CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSETC=y -CONFIG_NX_BGCOLOR=0x95fa -CONFIG_NX_BLOCKING=y -CONFIG_NX_KBD=y -CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_NX=y CONFIG_NXFONT_SANS28X37=y CONFIG_NXFONT_SANS28X37B=y CONFIG_NXPLAYER_DEFAULT_MEDIADIR="/mnt/sdcard" CONFIG_NXPLAYER_RECURSIVE_MEDIA_SEARCH=y +CONFIG_NXTERM=y CONFIG_NXTERM_CACHESIZE=32 CONFIG_NXTERM_CURSORCHAR=95 CONFIG_NXTERM_MXCHARS=640 CONFIG_NXTERM_NXKBDIN=y -CONFIG_NXTERM=y +CONFIG_NXWIDGETS=y CONFIG_NXWIDGETS_BPP=16 CONFIG_NXWIDGETS_LISTENERSTACK=1596 CONFIG_NXWIDGETS_SIZEOFCHAR=1 -CONFIG_NXWIDGETS=y +CONFIG_NXWM=y CONFIG_NXWM_BACKGROUND_IMAGE="NXWidgets::g_nuttxBitmap320x320" CONFIG_NXWM_CALIBRATION_AVERAGE=y CONFIG_NXWM_CALIBRATION_CUSTOM_FONTID=y @@ -117,13 +112,13 @@ CONFIG_NXWM_CALIBRATION_MESSAGES=y CONFIG_NXWM_CALIBRATION_NSAMPLES=2 CONFIG_NXWM_HEXCALCULATOR_CUSTOM_FONTID=y CONFIG_NXWM_HEXCALCULATOR_FONTID=6 +CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_KEYBOARD_DEVPATH="/dev/kbda" CONFIG_NXWM_KEYBOARD_LISTENERSTACK=1024 CONFIG_NXWM_KEYBOARD_USBHOST=y -CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_LARGE_ICONS=y -CONFIG_NXWM_MEDIAPLAYER_YSPACING=16 CONFIG_NXWM_MEDIAPLAYER=y +CONFIG_NXWM_MEDIAPLAYER_YSPACING=16 CONFIG_NXWM_NXTERM_CUSTOM_FONTID=y CONFIG_NXWM_NXTERM_FONTID=3 CONFIG_NXWM_NXTERM_STACKSIZE=1596 @@ -135,42 +130,47 @@ CONFIG_NXWM_TASKBAR_VSPACING=8 CONFIG_NXWM_TOOLBAR_CUSTOM_FONTID=y CONFIG_NXWM_TOOLBAR_FONTID=6 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1596 -CONFIG_NXWM_UNITTEST=y -CONFIG_NXWM=y +CONFIG_NX_BGCOLOR=0x95fa +CONFIG_NX_BLOCKING=y +CONFIG_NX_KBD=y +CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PREALLOC_TIMERS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 +CONFIG_RAMLOG=y +CONFIG_RAMLOG_BUFSIZE=16384 +CONFIG_RAMLOG_SYSLOG=y CONFIG_RAM_SIZE=268435456 CONFIG_RAM_START=0x20000000 CONFIG_RAM_VSTART=0x20000000 -CONFIG_RAMLOG_BUFSIZE=16384 -CONFIG_RAMLOG_SYSLOG=y -CONFIG_RAMLOG=y CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 +CONFIG_SAMA5D4EK_528MHZ=y +CONFIG_SAMA5D4EK_HSMCI0_AUTOMOUNT=y +CONFIG_SAMA5D4EK_HSMCI0_AUTOMOUNT_MOUNTPOINT="/mnt/sdcard" CONFIG_SAMA5_BOOT_SDRAM=y CONFIG_SAMA5_DDRCS_HEAP_END=0x2fa00000 CONFIG_SAMA5_DDRCS_RESERVE=y CONFIG_SAMA5_EHCI=y +CONFIG_SAMA5_EMAC0=y +CONFIG_SAMA5_EMAC0_PHYSR=30 CONFIG_SAMA5_EMAC0_PHYSR_100FD=0x6 CONFIG_SAMA5_EMAC0_PHYSR_100HD=0x2 CONFIG_SAMA5_EMAC0_PHYSR_10FD=0x5 CONFIG_SAMA5_EMAC0_PHYSR_10HD=0x1 CONFIG_SAMA5_EMAC0_PHYSR_ALTCONFIG=y CONFIG_SAMA5_EMAC0_PHYSR_ALTMODE=0x7 -CONFIG_SAMA5_EMAC0_PHYSR=30 CONFIG_SAMA5_EMAC0_RMII=y -CONFIG_SAMA5_EMAC0=y CONFIG_SAMA5_HSMC=y CONFIG_SAMA5_HSMCI0=y +CONFIG_SAMA5_LCDC=y CONFIG_SAMA5_LCDC_BACKCOLOR=0x95fa CONFIG_SAMA5_LCDC_DEFBACKLIGHT=0xc8 CONFIG_SAMA5_LCDC_FB_PBASE=0x2fa00000 CONFIG_SAMA5_LCDC_FB_SIZE=6291456 CONFIG_SAMA5_LCDC_FB_VBASE=0x2fa00000 -CONFIG_SAMA5_LCDC=y CONFIG_SAMA5_OHCI=y -CONFIG_SAMA5_PIO_IRQ=y CONFIG_SAMA5_PIOE_IRQ=y +CONFIG_SAMA5_PIO_IRQ=y CONFIG_SAMA5_RTC=y CONFIG_SAMA5_TRNG=y CONFIG_SAMA5_TWI0=y @@ -178,9 +178,6 @@ CONFIG_SAMA5_UHPHS=y CONFIG_SAMA5_USART3=y CONFIG_SAMA5_USART4=y CONFIG_SAMA5_XDMAC0=y -CONFIG_SAMA5D4EK_528MHZ=y -CONFIG_SAMA5D4EK_HSMCI0_AUTOMOUNT_MOUNTPOINT="/mnt/sdcard" -CONFIG_SAMA5D4EK_HSMCI0_AUTOMOUNT=y CONFIG_SCHED_HAVE_PARENT=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=192 @@ -195,5 +192,5 @@ CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USBHOST_HIDKBD=y CONFIG_USBHOST_ISOC_DISABLE=y CONFIG_USBHOST_MSC=y -CONFIG_USER_ENTRYPOINT="nxwm_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="nxwm_main" diff --git a/configs/samv71-xult/nxwm/defconfig b/configs/samv71-xult/nxwm/defconfig index b1022cfe52..7cf3be2183 100644 --- a/configs/samv71-xult/nxwm/defconfig +++ b/configs/samv71-xult/nxwm/defconfig @@ -94,7 +94,6 @@ CONFIG_NXWM_TASKBAR_VSPACING=4 CONFIG_NXWM_TOOLBAR_CUSTOM_FONTID=y CONFIG_NXWM_TOOLBAR_FONTID=5 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1536 -CONFIG_NXWM_UNITTEST=y CONFIG_NX_BGCOLOR=0x95fa CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y diff --git a/configs/samv71-xult/vnxwm/defconfig b/configs/samv71-xult/vnxwm/defconfig index c945bd6d1e..4e58c907b1 100644 --- a/configs/samv71-xult/vnxwm/defconfig +++ b/configs/samv71-xult/vnxwm/defconfig @@ -107,7 +107,6 @@ CONFIG_NXWM_TASKBAR_LEFT=y CONFIG_NXWM_TASKBAR_VSPACING=4 CONFIG_NXWM_TOOLBAR_CUSTOM_FONTID=y CONFIG_NXWM_TOOLBAR_FONTID=5 -CONFIG_NXWM_UNITTEST=y CONFIG_NX_BGCOLOR=0xbb CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig index 981a17c270..50d2bd47f5 100644 --- a/configs/shenzhou/nxwm/defconfig +++ b/configs/shenzhou/nxwm/defconfig @@ -94,7 +94,6 @@ CONFIG_NXWM_TASKBAR_LEFT=y CONFIG_NXWM_TASKBAR_VSPACING=4 CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=101 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1596 -CONFIG_NXWM_UNITTEST=y CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig index deaa16ee02..aa50fe3bb7 100644 --- a/configs/sim/nxwm/defconfig +++ b/configs/sim/nxwm/defconfig @@ -44,7 +44,6 @@ CONFIG_NXWM=y CONFIG_NXWM_BACKGROUND_IMAGE="" CONFIG_NXWM_NXTERM_STACKSIZE=8192 CONFIG_NXWM_TASKBAR_LEFT=y -CONFIG_NXWM_UNITTEST=y CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_PTHREAD_STACK_DEFAULT=8192 diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig index 126b44ab6f..a9d0a47fd8 100644 --- a/configs/stm3220g-eval/nxwm/defconfig +++ b/configs/stm3220g-eval/nxwm/defconfig @@ -94,7 +94,6 @@ CONFIG_NXWM_KEYBOARD_LISTENERPRIO=100 CONFIG_NXWM_TASKBAR_LEFT=y CONFIG_NXWM_TASKBAR_VSPACING=4 CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=100 -CONFIG_NXWM_UNITTEST=y CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig index 8bbc8f54fb..b8114e2102 100644 --- a/configs/stm3240g-eval/knxwm/defconfig +++ b/configs/stm3240g-eval/knxwm/defconfig @@ -69,7 +69,6 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5 CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_TASKBAR_LEFT=y CONFIG_NXWM_TASKBAR_VSPACING=4 -CONFIG_NXWM_UNITTEST=y CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig index cc549ee9e7..5eb1272204 100644 --- a/configs/stm3240g-eval/nxwm/defconfig +++ b/configs/stm3240g-eval/nxwm/defconfig @@ -91,7 +91,6 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5 CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_TASKBAR_LEFT=y CONFIG_NXWM_TASKBAR_VSPACING=4 -CONFIG_NXWM_UNITTEST=y CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y diff --git a/configs/stm32f429i-disco/nxwm/defconfig b/configs/stm32f429i-disco/nxwm/defconfig index 3b769e8832..542aa6a3ef 100644 --- a/configs/stm32f429i-disco/nxwm/defconfig +++ b/configs/stm32f429i-disco/nxwm/defconfig @@ -80,7 +80,6 @@ CONFIG_NXWM_KEYBOARD=y CONFIG_NXWM_TASKBAR_LEFT=y CONFIG_NXWM_TASKBAR_VSPACING=4 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1596 -CONFIG_NXWM_UNITTEST=y CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y