openamp: Merge OPENAMP_RPMSG_DEBUG and OPENAMP_VQUEUE_DEBUG into OPENAMP_DEBUG

to simplify the configuration

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

openamp/Kconfig

@@ -18,12 +18,8 @@ config OPENAMP_CACHE
 		Enable or disable OpenAMP Cache support (VIRTIO_CACHED_BUFFERS and
 		VIRTIO_CACHED_VRINGS)
 
-config OPENAMP_RPMSG_DEBUG
+config OPENAMP_DEBUG
-	bool "Enable OpenAMP Rpmsg Debug"
+	bool "Enable OpenAMP Debug"
-	default n
-
-config OPENAMP_VQUEUE_DEBUG
-	bool "Enable OpenAMP Virtio Queue Debug"
 	default n
 
 endif # OPENAMP

openamp/open-amp.cmake

@@ -92,11 +92,8 @@ if(CONFIG_OPENAMP_CACHE)
   set(WITH_DCACHE_VRINGS ON)
 endif()
 
-if(CONFIG_OPENAMP_RPMSG_DEBUG)
+if(CONFIG_OPENAMP_DEBUG)
   add_compile_definitions(RPMSG_DEBUG)
-endif()
-
-if(CONFIG_OPENAMP_VQUEUE_DEBUG)
   add_compile_definitions(VQUEUE_DEBUG)
 endif()
 

openamp/open-amp.defs

@@ -26,12 +26,8 @@ ifeq ($(CONFIG_OPENAMP_CACHE),y)
   CFLAGS += -DVIRTIO_CACHED_BUFFERS -DVIRTIO_CACHED_VRINGS
 endif
 
-ifeq ($(CONFIG_OPENAMP_RPMSG_DEBUG),y)
+ifeq ($(CONFIG_OPENAMP_DEBUG),y)
-  CFLAGS += -DRPMSG_DEBUG
+  CFLAGS += -DRPMSG_DEBUG -DVQUEUE_DEBUG
-endif
-
-ifeq ($(CONFIG_OPENAMP_VQUEUE_DEBUG),y)
-  CFLAGS += -DVQUEUE_DEBUG
 endif
 
 CSRCS += open-amp/lib/remoteproc/elf_loader.c