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 ef67a866f340413a4c3d570c2dff308f94ea953c Author: wangyongrong <[email protected]> AuthorDate: Mon Jul 1 16:34:05 2024 +0800 openamp: replace VIRTIO_DRIVER/DEVICE_ONLY to VIRTIO_DRIVER/DEVICE_SUPPORT New OpenAMP change the VIRTIO_DRIVER/DEVICE_ONLY to the VIRTIO_DRIVER_DEVCE_SUPPORT, so upgrade the NuttX OpenAMP config too Signed-off-by: wangyongrong <[email protected]> --- openamp/Kconfig | 12 ++++++------ openamp/open-amp.cmake | 12 ++++++++---- openamp/open-amp.defs | 12 ++++++++---- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/openamp/Kconfig b/openamp/Kconfig index d9b0d072c6..d15399e936 100644 --- a/openamp/Kconfig +++ b/openamp/Kconfig @@ -22,12 +22,12 @@ config OPENAMP_DEBUG bool "Enable OpenAMP Debug" default n -config OPENAMP_VIRTIO_DEVICE_ONLY - bool "Enable VIRTIO_DEVICE_ONLY" - default n +config OPENAMP_VIRTIO_DEVICE_SUPPORT + bool "Enable VIRTIO_DEVICE_SUPPORT" + default y -config OPENAMP_VIRTIO_DRIVER_ONLY - bool "Enable VIRTIO_DRIVER_ONLY" - default n +config OPENAMP_VIRTIO_DRIVER_SUPPORT + bool "Enable VIRTIO_DRIVER_SUPPORT" + default y endif # OPENAMP diff --git a/openamp/open-amp.cmake b/openamp/open-amp.cmake index 0470f55853..bf2cbe456d 100644 --- a/openamp/open-amp.cmake +++ b/openamp/open-amp.cmake @@ -87,12 +87,16 @@ endif() add_compile_definitions(elf_load=remoteproc_elf_load) -if(CONFIG_OPENAMP_VIRTIO_DEVICE_ONLY) - add_compile_definitions(VIRTIO_DEVICE_ONLY) +if(CONFIG_OPENAMP_VIRTIO_DEVICE_SUPPORT) + add_compile_definitions(VIRTIO_DEVICE_SUPPORT=1) +else() + add_compile_definitions(VIRTIO_DEVICE_SUPPORT=0) endif() -if(CONFIG_OPENAMP_VIRTIO_DRIVER_ONLY) - add_compile_definitions(VIRTIO_DRIVER_ONLY) +if(CONFIG_OPENAMP_VIRTIO_DRIVER_SUPPORT) + add_compile_definitions(VIRTIO_DRIVER_SUPPORT=1) +else() + add_compile_definitions(VIRTIO_DRIVER_SUPPORT=0) endif() set(WITH_LIBMETAL_FIND OFF) diff --git a/openamp/open-amp.defs b/openamp/open-amp.defs index 55370805c2..8ca50ff58c 100644 --- a/openamp/open-amp.defs +++ b/openamp/open-amp.defs @@ -32,12 +32,16 @@ endif CFLAGS += -Delf_load=remoteproc_elf_load -ifeq ($(CONFIG_OPENAMP_VIRTIO_DEVICE_ONLY),y) - CFLAGS += -DVIRTIO_DEVICE_ONLY +ifeq ($(CONFIG_OPENAMP_VIRTIO_DEVICE_SUPPORT),y) + CFLAGS += -DVIRTIO_DEVICE_SUPPORT=1 +else + CFLAGS += -DVIRTIO_DEVICE_SUPPORT=0 endif -ifeq ($(CONFIG_OPENAMP_VIRTIO_DRIVER_ONLY),y) - CFLAGS += -DVIRTIO_DRIVER_ONLY +ifeq ($(CONFIG_OPENAMP_VIRTIO_DRIVER_SUPPORT),y) + CFLAGS += -DVIRTIO_DRIVER_SUPPORT=1 +else + CFLAGS += -DVIRTIO_DRIVER_SUPPORT=0 endif CSRCS += open-amp/lib/remoteproc/elf_loader.c
