From 6b0c22c775f7764da0d7d82ff4155a85e9a27e61 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Wed, 6 Mar 2024 17:33:05 +0800
Subject: [PATCH] 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        | 8 ++------
 openamp/open-amp.cmake | 5 +----
 openamp/open-amp.defs  | 8 ++------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/openamp/Kconfig b/openamp/Kconfig
index f32d1a05364..f4e02c735aa 100644
--- a/openamp/Kconfig
+++ b/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
-	bool "Enable OpenAMP Rpmsg Debug"
-	default n
-
-config OPENAMP_VQUEUE_DEBUG
-	bool "Enable OpenAMP Virtio Queue Debug"
+config OPENAMP_DEBUG
+	bool "Enable OpenAMP Debug"
 	default n
 
 endif # OPENAMP
diff --git a/openamp/open-amp.cmake b/openamp/open-amp.cmake
index 6e290f93245..419bce9c745 100644
--- a/openamp/open-amp.cmake
+++ b/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()
 
diff --git a/openamp/open-amp.defs b/openamp/open-amp.defs
index 102873c5291..508e26ea071 100644
--- a/openamp/open-amp.defs
+++ b/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)
-  CFLAGS += -DRPMSG_DEBUG
-endif
-
-ifeq ($(CONFIG_OPENAMP_VQUEUE_DEBUG),y)
-  CFLAGS += -DVQUEUE_DEBUG
+ifeq ($(CONFIG_OPENAMP_DEBUG),y)
+  CFLAGS += -DRPMSG_DEBUG -DVQUEUE_DEBUG
 endif
 
 CSRCS += open-amp/lib/remoteproc/elf_loader.c