diff --git a/recipes-connectivity/tibluetooth/tibluetooth.bb b/recipes-connectivity/tibluetooth/tibluetooth.bb
index c63bfec..fe4dc6e 100644
--- a/recipes-connectivity/tibluetooth/tibluetooth.bb
+++ b/recipes-connectivity/tibluetooth/tibluetooth.bb
@@ -10,7 +10,8 @@ PR = "r2"
 inherit systemd
 
 SRC_URI =  " \
-    file://tibluetooth.service\
+    file://tibluetooth-nbhw16.service \
+    file://tibluetooth-nrhw20.service \
     file://TIInit_11.8.32.bts \
     "
 
@@ -25,11 +26,19 @@ FILES_${PN}_append = " \
                     /lib \
                     "
 
-do_install () {
+do_install_am335x-nbhw16 () {
     install -d ${D}${systemd_unitdir}/system/
-    install -m 0644 tibluetooth.service ${D}${systemd_unitdir}/system/
+    install -m 0644 tibluetooth-nbhw16.service ${D}${systemd_unitdir}/system/tibluetooth.service
 
     install -d ${D}/lib/firmware/ti-connectivity
     install -m 0644 TIInit_11.8.32.bts ${D}/lib/firmware/ti-connectivity/
-
 }
+
+do_install_am335x-nrhw20 () {
+    install -d ${D}${systemd_unitdir}/system/
+    install -m 0644 tibluetooth-nrhw20.service ${D}${systemd_unitdir}/system/tibluetooth.service
+
+    install -d ${D}/lib/firmware/ti-connectivity
+    install -m 0644 TIInit_11.8.32.bts ${D}/lib/firmware/ti-connectivity/
+}
+
diff --git a/recipes-connectivity/tibluetooth/tibluetooth/tibluetooth.service b/recipes-connectivity/tibluetooth/tibluetooth/tibluetooth-nbhw16.service
similarity index 100%
rename from recipes-connectivity/tibluetooth/tibluetooth/tibluetooth.service
rename to recipes-connectivity/tibluetooth/tibluetooth/tibluetooth-nbhw16.service
diff --git a/recipes-connectivity/tibluetooth/tibluetooth/tibluetooth-nrhw20.service b/recipes-connectivity/tibluetooth/tibluetooth/tibluetooth-nrhw20.service
new file mode 100644
index 0000000..6ad68d8
--- /dev/null
+++ b/recipes-connectivity/tibluetooth/tibluetooth/tibluetooth-nrhw20.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Attach ti bluetooth
+Before=bluetooth
+Requires=bluetooth.target
+
+[Service]
+Type=forking
+ExecStartPre=-/bin/sh -c "/bin/echo 52 > /sys/class/gpio/export"
+ExecStartPre=-/bin/sh -c "/bin/echo out > /sys/class/gpio/gpio52/direction"
+ExecStartPre=/bin/sh -c "/bin/echo 1 > /sys/class/gpio/gpio52/value"
+ExecStart=/usr/bin/hciattach /dev/ttyS5 texas 3000000 flow
+
+ExecStopPost=/bin/sh -c "/bin/echo 0 > /sys/class/gpio/gpio52/value"
+
+[Install]
+WantedBy=multi-user.target