diff --git a/meta-ti-bsp/recipes-ti/ti-rpmsg-char/ti-rpmsg-char-examples/0001-examples-Remove-use-of-includedir-and-libdir.patch b/meta-ti-bsp/recipes-ti/ti-rpmsg-char/ti-rpmsg-char-examples/0001-examples-Remove-use-of-includedir-and-libdir.patch
deleted file mode 100644
index 3539e8d9..00000000
--- a/meta-ti-bsp/recipes-ti/ti-rpmsg-char/ti-rpmsg-char-examples/0001-examples-Remove-use-of-includedir-and-libdir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 1a26cb577ba54dd9214eeb94fed0ce3a0f4603b6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 24 Oct 2020 23:46:39 -0700
-Subject: [PATCH] examples: Remove use of includedir and libdir
-
-These point to standard include and library paths which already are used
-from sysroot relative paths secondly, they use absolute paths which
-means we are asking to add -I/usr/include which might be ok in a native
-build but not in cross build. This helps mitigate QA errors found with
-OE build system since it finds it adding host include and library search
-paths to linker/compiler commandline
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- examples/Makefile.am | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index da34204..34ac7a8 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -1,6 +1,4 @@
--INCLUDE = -I${includedir}
--
--AM_CFLAGS = -Wall -g -O2 $(INCLUDE)
-+AM_CFLAGS = -Wall -g -O2
- 
- bin_PROGRAMS = rpmsg_char_simple rpmsg_char_benchmark
- 
-@@ -8,10 +6,8 @@ bin_PROGRAMS = rpmsg_char_simple rpmsg_char_benchmark
- rpmsg_char_simple_SOURCES = rpmsg_char_simple.c
- rpmsg_char_simple_CPPFLAGS = $(AM_CFLAGS)
- rpmsg_char_simple_LDADD = -lpthread -lti_rpmsg_char
--rpmsg_char_simple_LDFLAGS = -L${libdir}
-
- # rpmsg_char_benchmark program
- rpmsg_char_benchmark_SOURCES = rpmsg_char_benchmark.c
- rpmsg_char_benchmark_CPPFLAGS = $(AM_CFLAGS)
- rpmsg_char_benchmark_LDADD = -lpthread -lti_rpmsg_char
--rpmsg_char_benchmark_LDFLAGS = -L${libdir}
--- 
-2.29.1
-
diff --git a/meta-ti-bsp/recipes-ti/ti-rpmsg-char/ti-rpmsg-char-examples_git.bb b/meta-ti-bsp/recipes-ti/ti-rpmsg-char/ti-rpmsg-char-examples_git.bb
deleted file mode 100644
index cbe4d7fd..00000000
--- a/meta-ti-bsp/recipes-ti/ti-rpmsg-char/ti-rpmsg-char-examples_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "TI RPMsg Char Sample Applications and Tests"
-
-require ti-rpmsg-char.inc
-
-SRC_URI += "file://0001-examples-Remove-use-of-includedir-and-libdir.patch"
-
-DEPENDS = "ti-rpmsg-char"
-
-inherit autotools pkgconfig
-
-EXTRA_OEMAKE = "-C ${B}/examples"
-
-PR = "r0"
diff --git a/meta-ti-bsp/recipes-ti/ti-rpmsg-char/ti-rpmsg-char.inc b/meta-ti-bsp/recipes-ti/ti-rpmsg-char/ti-rpmsg-char.inc
deleted file mode 100644
index f9fb0f25..00000000
--- a/meta-ti-bsp/recipes-ti/ti-rpmsg-char/ti-rpmsg-char.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "TI RPMsg Char Utility Library"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${S}/src/rpmsg_char.c;beginline=1;endline=31;md5=71987db43a2159cff5ea00505c6fce58"
-
-PROTOCOL = "https"
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/git/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};"
-
-# 0.6.11 release
-SRCREV = "dd4783422bf4fbed1015bfaa51054e40057b4f04"
-
-PV = "0.6.11+git"
-
-COMPATIBLE_MACHINE = "^(k3)$"
diff --git a/meta-ti-bsp/recipes-ti/ti-rpmsg-char/ti-rpmsg-char_git.bb b/meta-ti-bsp/recipes-ti/ti-rpmsg-char/ti-rpmsg-char_git.bb
index 50565300..a0043caf 100644
--- a/meta-ti-bsp/recipes-ti/ti-rpmsg-char/ti-rpmsg-char_git.bb
+++ b/meta-ti-bsp/recipes-ti/ti-rpmsg-char/ti-rpmsg-char_git.bb
@@ -1,9 +1,23 @@
 SUMMARY = "TI RPMsg Char Utility Library"
 
-require ti-rpmsg-char.inc
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://${S}/src/rpmsg_char.c;beginline=1;endline=31;md5=71987db43a2159cff5ea00505c6fce58"
 
-inherit autotools pkgconfig
+PROTOCOL = "https"
+BRANCH = "master"
+SRC_URI = "git://git.ti.com/git/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};"
 
+# 0.6.11 release
+SRCREV = "e36103aac7d9f6d64125eb917d3c69022cb86e0b"
+
+PV = "0.6.11+git"
 PR = "r0"
 
-DISABLE_STATIC = ""
+COMPATIBLE_MACHINE = "^(k3)$"
+
+inherit cmake
+
+PACKAGES =+ "${PN}-examples"
+FILES:${PN}-examples += "${bindir}/rpmsg_char_simple"
+FILES:${PN}-examples += "${bindir}/rpmsg_char_benchmark"
+RDEPENDS:${PN}-examples += "${PN}"