From edd68d8ae91e934d6b8fffdab16efcf423867eb5 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sat, 15 Oct 2022 18:22:59 +0800 Subject: [PATCH] board: Change CONFIG_SYSTEM_NSH_SYMTAB to CONFIG_NSH_SYMTAB follow the apps side change Signed-off-by: Xiang Xiao --- boards/arm/cxd56xx/spresense/configs/rndis/defconfig | 6 +++--- boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig | 6 +++--- boards/arm/cxd56xx/spresense/configs/wifi/defconfig | 6 +++--- boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig | 6 +++--- boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig | 6 +++--- boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig | 6 +++--- boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig | 6 +++--- boards/arm/stm32/stm32f4discovery/README.txt | 6 +++--- boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig | 6 +++--- boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig | 6 +++--- .../arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig | 6 +++--- boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig | 4 ++-- boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig | 6 +++--- tools/cfgdefine.c | 4 ++-- 14 files changed, 40 insertions(+), 40 deletions(-) diff --git a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig index a250c9a44a..23fa269d76 100644 --- a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig @@ -111,6 +111,9 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_TELNETD=y CONFIG_NSH_FILE_APPS=y CONFIG_NSH_READLINE=y +CONFIG_NSH_SYMTAB=y +CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" +CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=3072 CONFIG_NXPLAYER_HTTP_STREAMING_SUPPORT=y CONFIG_NXPLAYER_MAINTHREAD_STACKSIZE=3072 @@ -144,9 +147,6 @@ CONFIG_START_YEAR=2019 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_SYMTAB=y -CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" -CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_NXRECORDER=y CONFIG_SYSTEM_PING=y diff --git a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig index 1d1762f2fd..ee6e95872a 100644 --- a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig @@ -112,6 +112,9 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_TELNETD=y CONFIG_NSH_FILE_APPS=y CONFIG_NSH_READLINE=y +CONFIG_NSH_SYMTAB=y +CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" +CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=3072 CONFIG_NXPLAYER_HTTP_STREAMING_SUPPORT=y CONFIG_NXPLAYER_MAINTHREAD_STACKSIZE=3072 @@ -146,9 +149,6 @@ CONFIG_START_YEAR=2019 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_SYMTAB=y -CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" -CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_NXRECORDER=y CONFIG_SYSTEM_PING=y diff --git a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig index f1e870d52b..8817802539 100644 --- a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig @@ -116,6 +116,9 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_DISABLE_NSLOOKUP=y CONFIG_NSH_FILE_APPS=y CONFIG_NSH_READLINE=y +CONFIG_NSH_SYMTAB=y +CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" +CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_NX=y CONFIG_NXFONT_SERIF22X29=y CONFIG_NXPLAYER_HTTP_STREAMING_SUPPORT=y @@ -149,9 +152,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_SYMTAB=y -CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" -CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_SYSTEM_NTPC=y CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_NXRECORDER=y diff --git a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig index fba3f7a68c..7ac04cb6a5 100644 --- a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig @@ -119,6 +119,9 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_DISABLE_NSLOOKUP=y CONFIG_NSH_FILE_APPS=y CONFIG_NSH_READLINE=y +CONFIG_NSH_SYMTAB=y +CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" +CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_NSH_WGET_USERAGENT="NuttX/7.2x.x (; http://www.nuttx.org/)" CONFIG_NX=y CONFIG_NXFONT_SERIF22X29=y @@ -155,9 +158,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_SYMTAB=y -CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" -CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_SYSTEM_NTPC=y CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_NXRECORDER=y diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig index 18b2b18d0a..fe40748c7e 100644 --- a/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig @@ -74,6 +74,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y +CONFIG_NSH_SYMTAB=y +CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" +CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_PATH_INITIAL="/mnt/nfs/bin" CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=1073741824 @@ -93,9 +96,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_SYMTAB=y -CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" -CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig index 620ba19574..402d5681ec 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig @@ -123,6 +123,9 @@ CONFIG_NSH_FILE_APPS=y CONFIG_NSH_LINELEN=128 CONFIG_NSH_MAXARGUMENTS=10 CONFIG_NSH_READLINE=y +CONFIG_NSH_SYMTAB=y +CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" +CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_NUTTX_USERSPACE=0x05020000 CONFIG_NX=y CONFIG_NXFONT_MONO5X8=y @@ -163,9 +166,6 @@ CONFIG_START_YEAR=2013 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_SYMTAB=y -CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" -CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_TIME64=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig index b6f94d4e84..089ab06a3d 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig @@ -125,6 +125,9 @@ CONFIG_NSH_FILE_APPS=y CONFIG_NSH_LINELEN=128 CONFIG_NSH_MAXARGUMENTS=10 CONFIG_NSH_READLINE=y +CONFIG_NSH_SYMTAB=y +CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" +CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=3072 CONFIG_NX=y CONFIG_NXFONT_MONO5X8=y @@ -164,9 +167,6 @@ CONFIG_START_YEAR=2013 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_SYMTAB=y -CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" -CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y diff --git a/boards/arm/stm32/stm32f4discovery/README.txt b/boards/arm/stm32/stm32f4discovery/README.txt index 25bea41b40..45abd6aaef 100644 --- a/boards/arm/stm32/stm32f4discovery/README.txt +++ b/boards/arm/stm32/stm32f4discovery/README.txt @@ -2305,9 +2305,9 @@ Configuration Sub-directories CONFIG_EXAMPLES_HELLO=m CONFIG_LIBC_EXECFUNCS=y CONFIG_NSH_FILE_APPS=y - CONFIG_SYSTEM_NSH_SYMTAB=y - CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" - CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" + CONFIG_NSH_SYMTAB=y + CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" + CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols" Further, the configuration assumes that executable files reside on the remotely mounted file system: diff --git a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig index 139a96d687..eb1dd7a26b 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig @@ -68,6 +68,9 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_FILE_APPS=y CONFIG_NSH_LINELEN=128 CONFIG_NSH_READLINE=y +CONFIG_NSH_SYMTAB=y +CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" +CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=3072 CONFIG_PATH_INITIAL="/mnt/nfs/bin" CONFIG_PREALLOC_TIMERS=4 @@ -90,9 +93,6 @@ CONFIG_STM32_SPI1=y CONFIG_STM32_USART2=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_SYMTAB=y -CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" -CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_SYSTEM_PING=y CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USBDEV=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig b/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig index f30b185cd6..5fb3a14bde 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig @@ -66,6 +66,9 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y +CONFIG_NSH_SYMTAB=y +CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" +CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_PATH_INITIAL="/mnt/sd0/bin" CONFIG_PREALLOC_TIMERS=4 CONFIG_RAM_SIZE=114688 @@ -92,9 +95,6 @@ CONFIG_STM32_USART2=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_SYMTAB=y -CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" -CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_SYSTEM_NTPC=y CONFIG_TESTING_OSTEST=y CONFIG_USART2_RXBUFSIZE=128 diff --git a/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig index bda5a13e56..c9efbd27f8 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig @@ -73,6 +73,9 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_FILE_APPS=y CONFIG_NSH_LINELEN=1000 CONFIG_NSH_READLINE=y +CONFIG_NSH_SYMTAB=y +CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" +CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_NUTTX_USERSPACE=0x00020000 CONFIG_PASS1_BUILDIR="boards/arm/tiva/lm3s6965-ek/kernel" CONFIG_PATH_INITIAL="/bin" @@ -94,9 +97,6 @@ CONFIG_SYSLOG_CONSOLE=y CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NETDB=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_SYMTAB=y -CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" -CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_SYSTEM_NTPC=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=24 diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig index b43c4f20ad..4aa6358ebd 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/nsh/defconfig @@ -47,6 +47,8 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y +CONFIG_NSH_SYMTAB=y +CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" CONFIG_PATH_INITIAL="/system/bin" CONFIG_RAM_SIZE=33554432 CONFIG_RAM_START=0x80000000 @@ -60,7 +62,5 @@ CONFIG_START_MONTH=12 CONFIG_START_YEAR=2021 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_NSH_SYMTAB=y -CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" CONFIG_TESTING_OSTEST=y CONFIG_USEC_PER_TICK=1000 diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig index 7aa88b32ef..ef2206e970 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/nsh64/defconfig @@ -48,6 +48,9 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y +CONFIG_NSH_SYMTAB=y +CONFIG_NSH_SYMTAB_ARRAYNAME="g_symtab" +CONFIG_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_PATH_INITIAL="/system/bin" CONFIG_RAM_SIZE=33554432 CONFIG_RAM_START=0x80000000 @@ -62,8 +65,5 @@ CONFIG_START_YEAR=2021 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_STACKSIZE=3072 -CONFIG_SYSTEM_NSH_SYMTAB=y -CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME="g_symtab" -CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME="g_nsymbols" CONFIG_TESTING_OSTEST=y CONFIG_USEC_PER_TICK=1000 diff --git a/tools/cfgdefine.c b/tools/cfgdefine.c index 0405584dfb..b872b849e6 100644 --- a/tools/cfgdefine.c +++ b/tools/cfgdefine.c @@ -75,8 +75,8 @@ static const char *dequote_list[] = /* apps/ definitions */ - "CONFIG_SYSTEM_NSH_SYMTAB_ARRAYNAME", /* Symbol table array name */ - "CONFIG_SYSTEM_NSH_SYMTAB_COUNTNAME", /* Name of the variable holding the number of symbols */ + "CONFIG_NSH_SYMTAB_ARRAYNAME", /* Symbol table array name */ + "CONFIG_NSH_SYMTAB_COUNTNAME", /* Name of the variable holding the number of symbols */ NULL /* Marks the end of the list */ };