You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/05/17 03:31:11 UTC

[incubator-nuttx] 03/03: boards: sabre-6quad: Add ELF support to netnsh and netnsh_smp

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit d8ca691e2a18a82054642b52f66beb7a8b8f58bc
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Mon May 17 09:57:57 2021 +0900

    boards: sabre-6quad: Add ELF support to netnsh and netnsh_smp
    
    Summary:
    - This commit adds ELF support to netnsh and netnsh_smp
    
    Impact:
    - None
    
    Testing:
    - Tested with QEMU
    
    Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
 boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig     | 10 +++++++++-
 boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
index 8f5a3d4..b4b72fb 100644
--- a/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
@@ -25,8 +25,9 @@ CONFIG_CODECS_HASH_MD5=y
 CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_ZERO=y
+CONFIG_ELF=y
 CONFIG_ETH0_PHY_KSZ8081=y
-CONFIG_EXAMPLES_HELLO=y
+CONFIG_EXAMPLES_HELLO=m
 CONFIG_EXAMPLES_TCPBLASTER=y
 CONFIG_EXAMPLES_TCPBLASTER_GROUPSIZE=500
 CONFIG_EXAMPLES_TCPBLASTER_SERVER=y
@@ -41,6 +42,8 @@ CONFIG_IMX6_UART1=y
 CONFIG_IMX_DDR_SIZE=1073741824
 CONFIG_IMX_ENET_NTXBUFFERS=1
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=16
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
@@ -69,6 +72,7 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
+CONFIG_PATH_INITIAL="/mnt/nfs/bin"
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=1073741824
 CONFIG_RAM_START=0x10000000
@@ -87,8 +91,12 @@ 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_TESTING_GETPRIME=y
 CONFIG_TESTING_OSTEST=y
 CONFIG_UART1_SERIAL_CONSOLE=y
+CONFIG_USERMAIN_STACKSIZE=3072
 CONFIG_USER_ENTRYPOINT="nsh_main"
diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig
index 11f4484..0d33db9 100644
--- a/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig
@@ -25,8 +25,9 @@ CONFIG_CODECS_HASH_MD5=y
 CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_ZERO=y
+CONFIG_ELF=y
 CONFIG_ETH0_PHY_KSZ8081=y
-CONFIG_EXAMPLES_HELLO=y
+CONFIG_EXAMPLES_HELLO=m
 CONFIG_EXAMPLES_TCPBLASTER=y
 CONFIG_EXAMPLES_TCPBLASTER_GROUPSIZE=500
 CONFIG_EXAMPLES_TCPBLASTER_SERVER=y
@@ -41,6 +42,8 @@ CONFIG_IMX6_UART1=y
 CONFIG_IMX_DDR_SIZE=1073741824
 CONFIG_IMX_ENET_NTXBUFFERS=1
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIB_ENVPATH=y
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDB_DNSCLIENT_ENTRIES=4
@@ -68,6 +71,7 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
+CONFIG_PATH_INITIAL="/mnt/nfs/bin"
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=1073741824
 CONFIG_RAM_START=0x10000000
@@ -86,6 +90,9 @@ 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
@@ -93,4 +100,5 @@ CONFIG_TESTING_GETPRIME=y
 CONFIG_TESTING_OSTEST=y
 CONFIG_TESTING_SMP=y
 CONFIG_UART1_SERIAL_CONSOLE=y
+CONFIG_USERMAIN_STACKSIZE=3072
 CONFIG_USER_ENTRYPOINT="nsh_main"