diff --git a/openamp/Kconfig b/openamp/Kconfig
index a60ff0e4d6..bb1f771007 100644
--- a/openamp/Kconfig
+++ b/openamp/Kconfig
@@ -18,4 +18,12 @@ 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"
+	default n
+
 endif # OPENAMP
diff --git a/openamp/open-amp.defs b/openamp/open-amp.defs
index 51e78358a5..3bc27629ef 100644
--- a/openamp/open-amp.defs
+++ b/openamp/open-amp.defs
@@ -24,6 +24,14 @@ 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
+endif
+
 CSRCS += open-amp/lib/remoteproc/elf_loader.c
 CSRCS += open-amp/lib/remoteproc/remoteproc.c
 CSRCS += open-amp/lib/remoteproc/remoteproc_virtio.c