diff --git a/VERSION b/VERSION
index 07f90cb3..a32a5502 100644
--- a/VERSION
+++ b/VERSION
@@ -1,3 +1,3 @@
 VERSION_MAJOR = 1
 VERSION_MINOR = 6
-VERSION_PATCH = 0
+VERSION_PATCH = 1
diff --git a/lib/include/openamp/virtio.h b/lib/include/openamp/virtio.h
index 07103488..c4d4927b 100644
--- a/lib/include/openamp/virtio.h
+++ b/lib/include/openamp/virtio.h
@@ -70,28 +70,35 @@ extern "C" {
 #define VIRTIO_DEV_DRIVER	0UL
 #define VIRTIO_DEV_DEVICE	1UL
 
-#if !defined(VIRTIO_DRIVER_SUPPORT) && !defined(VIRTIO_DEVICE_SUPPORT)
 #ifdef VIRTIO_DRIVER_ONLY
 #warning "VIRTIO_DRIVER_ONLY is deprecated, please use VIRTIO_DEVICE_SUPPORT=0"
 #define VIRTIO_DRIVER_SUPPORT 1
 #define VIRTIO_DEVICE_SUPPORT 0
-#elif VIRTIO_DEVICE_ONLY
+#endif /* VIRTIO_DRIVER_ONLY */
+
+#ifdef VIRTIO_DEVICE_ONLY
 #warning "VIRTIO_DEVICE_ONLY is deprecated, please use VIRTIO_DRIVER_SUPPORT=0"
 #define VIRTIO_DRIVER_SUPPORT 0
 #define VIRTIO_DEVICE_SUPPORT 1
-#else
-#warning "VIRTIO_DRIVER_SUPPORT and/or VIRTIO_DEVICE_SUPPORT should be defined"
-#define VIRTIO_DRIVER_SUPPORT 1
-#define VIRTIO_DEVICE_SUPPORT 1
-#endif /* VIRTIO_DRIVER_ONLY */
-#endif /*!defined(VIRTIO_DRIVER_SUPPORT) && !defined(VIRTIO_DEVICE_SUPPORT)*/
+#endif /* VIRTIO_DEVICE_ONLY */
 
 #define VIRTIO_ENABLED(option) (option == 1)
 
+#ifdef VIRTIO_DRIVER_SUPPORT
 #define VIRTIO_ROLE_IS_DRIVER(vdev) \
 	(VIRTIO_ENABLED(VIRTIO_DRIVER_SUPPORT) && (vdev->role) == VIRTIO_DEV_DRIVER)
+#else
+/* Default definition without code size optimization */
+#define VIRTIO_ROLE_IS_DRIVER(vdev) (vdev->role == VIRTIO_DEV_DRIVER)
+#endif
+
+#ifdef VIRTIO_DEVICE_SUPPORT
 #define VIRTIO_ROLE_IS_DEVICE(vdev) \
 	(VIRTIO_ENABLED(VIRTIO_DEVICE_SUPPORT) && (vdev->role) == VIRTIO_DEV_DEVICE)
+#else
+/* Default definition without code size optimization */
+#define VIRTIO_ROLE_IS_DEVICE(vdev) (vdev->role == VIRTIO_DEV_DEVICE)
+#endif
 
 /** @brief Virtio device identifier. */
 struct virtio_device_id {
diff --git a/lib/rpmsg/rpmsg.c b/lib/rpmsg/rpmsg.c
index 7a0e0282..39774bc1 100644
--- a/lib/rpmsg/rpmsg.c
+++ b/lib/rpmsg/rpmsg.c
@@ -354,7 +354,7 @@ int rpmsg_create_ept(struct rpmsg_endpoint *ept, struct rpmsg_device *rdev,
 		 */
 	}
 
-	rpmsg_register_endpoint(rdev, ept, name, addr, dest, cb, unbind_cb, NULL);
+	rpmsg_register_endpoint(rdev, ept, name, addr, dest, cb, unbind_cb, ept->priv);
 	metal_mutex_release(&rdev->lock);
 
 	/* Send NS announcement to remote processor */