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/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 9f9076ed61 boards/arty_a7: fix ci compile failure
9f9076ed61 is described below

commit 9f9076ed61b2f8e6d65a65e8af5758e8adb55cdb
Author: yinshengkai <[email protected]>
AuthorDate: Wed Aug 9 17:32:47 2023 +0800

    boards/arty_a7: fix ci compile failure
    
    NETUTILS_IPERF and CONFIG_DEFAULT_SMALL conflict
    
    Loaded configuration '.config'
    Configuration saved to '.config'
    warning: LIBC_FLOATINGPOINT (defined at libs/libc/stdio/Kconfig:55) has 
direct dependencies !LIBM_NONE with value n, but is currently being y-selected 
by the following symbols:
     - NETUTILS_IPERF (defined at 
/home/baerg/code/NXOS/apps/netutils/iperf/Kconfig:6), with value y, direct 
dependencies NET (value: y), and select condition NET (value: y)
    make: *** [tools/Unix.mk:680: olddefconfig] Error 1
    ERROR: failed to refresh
    
    Signed-off-by: yinshengkai <[email protected]>
---
 .../risc-v/litex/arty_a7/configs/netnsh/defconfig  | 28 ----------------------
 1 file changed, 28 deletions(-)

diff --git a/boards/risc-v/litex/arty_a7/configs/netnsh/defconfig 
b/boards/risc-v/litex/arty_a7/configs/netnsh/defconfig
index c5320437f4..0bc85bdc0d 100644
--- a/boards/risc-v/litex/arty_a7/configs/netnsh/defconfig
+++ b/boards/risc-v/litex/arty_a7/configs/netnsh/defconfig
@@ -5,31 +5,7 @@
 # You can then do "make savedefconfig" to generate a new defconfig file that 
includes your
 # modifications.
 #
-# CONFIG_DISABLE_ENVIRON is not set
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_FS_PROCFS_EXCLUDE_BLOCKS is not set
-# CONFIG_FS_PROCFS_EXCLUDE_ENVIRON is not set
-# CONFIG_FS_PROCFS_EXCLUDE_IOBINFO is not set
-# CONFIG_FS_PROCFS_EXCLUDE_MEMDUMP is not set
-# CONFIG_FS_PROCFS_EXCLUDE_MEMINFO is not set
-# CONFIG_FS_PROCFS_EXCLUDE_MOUNT is not set
-# CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
-# CONFIG_FS_PROCFS_EXCLUDE_NET is not set
-# CONFIG_FS_PROCFS_EXCLUDE_PROCESS is not set
-# CONFIG_FS_PROCFS_EXCLUDE_ROUTE is not set
-# CONFIG_FS_PROCFS_EXCLUDE_UPTIME is not set
-# CONFIG_FS_PROCFS_EXCLUDE_USAGE is not set
-# CONFIG_FS_PROCFS_EXCLUDE_VERSION is not set
-# CONFIG_NSH_DISABLEBG is not set
-# CONFIG_NSH_DISABLE_ADDROUTE is not set
-# CONFIG_NSH_DISABLE_FREE is not set
-# CONFIG_NSH_DISABLE_HELP is not set
-# CONFIG_NSH_DISABLE_IFCONFIG is not set
-# CONFIG_NSH_DISABLE_IFUPDOWN is not set
 # CONFIG_NSH_DISABLE_LOSMART is not set
-# CONFIG_NSH_DISABLE_LS is not set
-# CONFIG_NSH_DISABLE_PS is not set
-# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_STANDARD_SERIAL is not set
 CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="arty_a7"
@@ -44,12 +20,10 @@ CONFIG_BOARD_LOOPSPERMSEC=10000
 CONFIG_BUILTIN=y
 CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_SYMBOLS=y
-CONFIG_DEFAULT_SMALL=y
 CONFIG_DEV_ZERO=y
 CONFIG_ETH0_PHY_DP83848C=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_HELLO_STACKSIZE=8192
-CONFIG_FILE_STREAM=y
 CONFIG_FS_PROCFS=y
 CONFIG_IDLETHREAD_STACKSIZE=8192
 CONFIG_INIT_ENTRYPOINT="nsh_main"
@@ -93,7 +67,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
 CONFIG_NSH_STRERROR=y
-CONFIG_NSH_TELNET=y
 CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=8192
 CONFIG_PTHREAD_STACK_DEFAULT=8192
 CONFIG_RAM_SIZE=268435456
@@ -111,7 +84,6 @@ CONFIG_START_YEAR=2022
 CONFIG_SYSTEM_MDIO=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_PING=y
-CONFIG_SYSTEM_TELNETD=y
 CONFIG_TASK_NAME_SIZE=12
 CONFIG_UART0_RXBUFSIZE=128
 CONFIG_UART0_SERIAL_CONSOLE=y

Reply via email to