From f01f290c3f10abb1a50ec15192119c65d978d594 Mon Sep 17 00:00:00 2001 From: Bowen Wang Date: Thu, 16 Nov 2023 15:38:39 +0800 Subject: [PATCH] qemu/config: enable CONFIG_DEV_SIMPLE_ADDRENV for all qemu configs Enable CONFIG_DEV_SIMPLE_ADDRENV for all the qemu configs that used the virtio driver to fix compile error when use the NuttX implemented metal io read/write operations. Becasue up_addrenv_pa_to_va() and up_addrenv_va_to_pa() are not implemented by default. Signed-off-by: Bowen Wang --- boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig | 1 + boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig | 1 + boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig | 1 + boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig | 1 + boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig | 1 + boards/risc-v/qemu-rv/rv-virt/configs/fb/defconfig | 1 + boards/risc-v/qemu-rv/rv-virt/configs/fb64/defconfig | 1 + boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig | 1 + boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig | 1 + boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig | 1 + boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig | 1 + boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig | 1 + boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig | 1 + 13 files changed, 13 insertions(+) diff --git a/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig index d3445247f4..93272e7273 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig @@ -21,6 +21,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=8192 CONFIG_DEVICE_TREE=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIDEO=y CONFIG_DRIVERS_VIRTIO=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig index 1c9e6086c8..b2bc80f241 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig @@ -21,6 +21,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=8192 CONFIG_DEVICE_TREE=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y CONFIG_DRIVERS_VIRTIO_BLK=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig index 5fc96d3c90..54c1a34f5d 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig @@ -22,6 +22,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=8192 CONFIG_DEVICE_TREE=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y CONFIG_DRIVERS_VIRTIO_BLK=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig index 5a41f6d6af..4cf4d67185 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig @@ -20,6 +20,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=8192 CONFIG_DEVICE_TREE=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y CONFIG_DRIVERS_VIRTIO_BLK=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig index bf1c33f148..3e0813fc99 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig @@ -22,6 +22,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=8192 CONFIG_DEVICE_TREE=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y CONFIG_DRIVERS_VIRTIO_BLK=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/fb/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/fb/defconfig index 396f34fa5b..187efe1915 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/fb/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/fb/defconfig @@ -31,6 +31,7 @@ CONFIG_BOARD_LOOPSPERMSEC=6366 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIDEO=y CONFIG_DRIVERS_VIRTIO=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/fb64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/fb64/defconfig index a16c706902..d3b4ab5148 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/fb64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/fb64/defconfig @@ -31,6 +31,7 @@ CONFIG_BOARD_LOOPSPERMSEC=6366 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIDEO=y CONFIG_DRIVERS_VIRTIO=y 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 70d5a7ac71..f779cbb01d 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig @@ -47,6 +47,7 @@ CONFIG_BUILD_KERNEL=y CONFIG_CODECS_HASH_MD5=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y CONFIG_DRIVERS_VIRTIO_BLK=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 16554fa8e4..dff00bb3a7 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 @@ -47,6 +47,7 @@ CONFIG_BUILD_KERNEL=y CONFIG_CODECS_HASH_MD5=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y CONFIG_DRIVERS_VIRTIO_BLK=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 9190a2c145..4944362927 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig @@ -32,6 +32,7 @@ CONFIG_BUILTIN=y CONFIG_CODECS_HASH_MD5=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y CONFIG_DRIVERS_VIRTIO_BLK=y 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 c5aab61c14..542c3792e0 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig @@ -32,6 +32,7 @@ CONFIG_BUILTIN=y CONFIG_CODECS_HASH_MD5=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y CONFIG_DRIVERS_VIRTIO_BLK=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig index 109ef2b17c..8f7c3432a1 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig @@ -32,6 +32,7 @@ CONFIG_BUILTIN=y CONFIG_CODECS_HASH_MD5=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y CONFIG_DRIVERS_VIRTIO_BLK=y 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 56806fba3f..7888081924 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 @@ -32,6 +32,7 @@ CONFIG_BUILTIN=y CONFIG_CODECS_HASH_MD5=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y +CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y CONFIG_DRIVERS_VIRTIO_BLK=y