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 2023/06/02 08:28:42 UTC

[nuttx] 02/02: boards: Enable NFS to test virtio-mmio-net

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

commit 766e0a3b0595663a5bacdc55edb889fd73ccc213
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Fri Jun 2 00:33:00 2023 +0900

    boards: Enable NFS to test virtio-mmio-net
    
    Summary:
    - This commit enables NFS to test virtio-mmio-net
    
    Impact:
    - None
    
    Testing:
    - Tested with qemu-7.1
    
    Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
 boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig        | 3 ++-
 boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig    | 2 ++
 boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig     | 2 ++
 boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig | 2 ++
 boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig        | 3 ++-
 boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig      | 3 ++-
 boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig    | 2 ++
 7 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig
index 8f9e8cb09d..934146537a 100644
--- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig
+++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig
@@ -5,6 +5,7 @@
 # You can then do "make savedefconfig" to generate a new defconfig file that includes your
 # modifications.
 #
+CONFIG_ALLOW_BSD_COMPONENTS=y
 CONFIG_ARCH="arm64"
 CONFIG_ARCH_ARM64=y
 CONFIG_ARCH_BOARD="qemu-armv8a"
@@ -30,7 +31,6 @@ CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FATTIME=y
-CONFIG_FS_LARGEFILE=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
@@ -59,6 +59,7 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_UDP=y
+CONFIG_NFS=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig
index cba974ea4b..125aa32b8c 100644
--- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig
+++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig
@@ -6,6 +6,7 @@
 # modifications.
 #
 # CONFIG_ARCH_FPU is not set
+CONFIG_ALLOW_BSD_COMPONENTS=y
 CONFIG_ARCH="arm64"
 CONFIG_ARCH_ARM64=y
 CONFIG_ARCH_BOARD="qemu-armv8a"
@@ -55,6 +56,7 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_UDP=y
+CONFIG_NFS=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig
index 6735f212dd..a88381966a 100644
--- a/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig
@@ -14,6 +14,7 @@ CONFIG_16550_UART0_CLOCK=3686400
 CONFIG_16550_UART0_IRQ=35
 CONFIG_16550_UART0_SERIAL_CONSOLE=y
 CONFIG_16550_UART=y
+CONFIG_ALLOW_BSD_COMPONENTS=y
 CONFIG_ARCH="risc-v"
 CONFIG_ARCH_ADDRENV=y
 CONFIG_ARCH_BOARD="rv-virt"
@@ -96,6 +97,7 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_UDP=y
 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
+CONFIG_NFS=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_FILE_APPS=y
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig
index 896d2fe2ad..dcf06fd6e8 100644
--- a/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig
@@ -14,6 +14,7 @@ CONFIG_16550_UART0_CLOCK=3686400
 CONFIG_16550_UART0_IRQ=35
 CONFIG_16550_UART0_SERIAL_CONSOLE=y
 CONFIG_16550_UART=y
+CONFIG_ALLOW_BSD_COMPONENTS=y
 CONFIG_ARCH="risc-v"
 CONFIG_ARCH_ADDRENV=y
 CONFIG_ARCH_BOARD="rv-virt"
@@ -97,6 +98,7 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_UDP=y
 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
+CONFIG_NFS=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_FILE_APPS=y
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig
index 3fc94a2eaf..23255d32c9 100644
--- a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig
@@ -14,6 +14,7 @@ CONFIG_16550_UART0_CLOCK=3686400
 CONFIG_16550_UART0_IRQ=37
 CONFIG_16550_UART0_SERIAL_CONSOLE=y
 CONFIG_16550_UART=y
+CONFIG_ALLOW_BSD_COMPONENTS=y
 CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="rv-virt"
 CONFIG_ARCH_BOARD_QEMU_RV_VIRT=y
@@ -45,7 +46,6 @@ CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FATTIME=y
 CONFIG_FS_HOSTFS=y
-CONFIG_FS_LARGEFILE=y
 CONFIG_FS_PROCFS=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INIT_ENTRYPOINT="nsh_main"
@@ -77,6 +77,7 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_UDP=y
+CONFIG_NFS=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig
index d712f7cde6..b6dcc4b428 100644
--- a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig
@@ -14,6 +14,7 @@ CONFIG_16550_UART0_CLOCK=3686400
 CONFIG_16550_UART0_IRQ=37
 CONFIG_16550_UART0_SERIAL_CONSOLE=y
 CONFIG_16550_UART=y
+CONFIG_ALLOW_BSD_COMPONENTS=y
 CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="rv-virt"
 CONFIG_ARCH_BOARD_QEMU_RV_VIRT=y
@@ -45,7 +46,6 @@ CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FATTIME=y
 CONFIG_FS_HOSTFS=y
-CONFIG_FS_LARGEFILE=y
 CONFIG_FS_PROCFS=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INIT_ENTRYPOINT="nsh_main"
@@ -77,6 +77,7 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_UDP=y
+CONFIG_NFS=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig
index 5d43e69a65..5f1f38ae33 100644
--- a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig
@@ -14,6 +14,7 @@ CONFIG_16550_UART0_CLOCK=3686400
 CONFIG_16550_UART0_IRQ=37
 CONFIG_16550_UART0_SERIAL_CONSOLE=y
 CONFIG_16550_UART=y
+CONFIG_ALLOW_BSD_COMPONENTS=y
 CONFIG_ARCH="risc-v"
 CONFIG_ARCH_BOARD="rv-virt"
 CONFIG_ARCH_BOARD_QEMU_RV_VIRT=y
@@ -75,6 +76,7 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_UDP=y
+CONFIG_NFS=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512