tibluetooth: Cleanup and use MACHINE_FEATURES

conf/machine/am335x-nmhw21.conf

@@ -14,5 +14,5 @@ KERNEL_IMAGETYPE = "fitImage"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nmhw21"
 
-MACHINE_FEATURES += "toby-l2"
+MACHINE_FEATURES += "toby-l2 bluetooth tibluetooth"
 

conf/machine/am335x-nrhw16.conf

@@ -16,3 +16,5 @@ KERNEL_DEVICETREE = "am335x-nrhw16.dtb \
 KERNEL_IMAGETYPE = "fitImage"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw16-v2"
+
+MACHINE_FEATURES += "bluetooth tibluetooth"

conf/machine/am335x-nrhw20.conf

@@ -13,4 +13,4 @@ KERNEL_IMAGETYPE = "fitImage"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am335x-nrhw20-v1"
 
-MACHINE_FEATURES += "toby-l2"
+MACHINE_FEATURES += "toby-l2 bluetooth tibluetooth"

conf/machine/imx8-nmhw23.conf

@@ -36,7 +36,7 @@ UBOOT_SUFFIX = "bin"
 UBOOT_CONFIG ??= "flash"
 UBOOT_CONFIG[flash] = "imx8_nmhw23_defconfig"
 
-MACHINE_FEATURES += "toby-l2"
+MACHINE_FEATURES += "toby-l2 bluetooth"
 
 ACCEPT_FSL_EULA = "1"
 

recipes-connectivity/tibluetooth/tibluetooth.bb

@@ -10,9 +10,7 @@ PR = "r2"
 inherit systemd
 
 SRC_URI =  " \
-    file://tibluetooth-nbhw16.service \
+    file://tibluetooth.service \
-    file://tibluetooth-nrhw20.service \
-    file://tibluetooth-nmhw21.service \
     file://TIInit_11.8.32.bts \
     "
 
@@ -27,39 +25,11 @@ FILES_${PN}_append = " \
                     ${nonarch_base_libdir} \
                     "
 
-install_nrhw16 () {
+do_install () {
     install -d ${D}${systemd_unitdir}/system/
-    install -m 0644 tibluetooth-nbhw16.service ${D}${systemd_unitdir}/system/tibluetooth.service
+    install -m 0644 tibluetooth.service ${D}${systemd_unitdir}/system/tibluetooth.service
 
     install -d ${D}${nonarch_base_libdir}/firmware/ti-connectivity
     install -m 0644 TIInit_11.8.32.bts ${D}${nonarch_base_libdir}/firmware/ti-connectivity/
 }
 
-do_install_am335x-nrhw16 () {
-    install_nrhw16
-}
-
-install_nrhw20 () {
-    install -d ${D}${systemd_unitdir}/system/
-    install -m 0644 tibluetooth-nrhw20.service ${D}${systemd_unitdir}/system/tibluetooth.service
-
-    install -d ${D}${nonarch_base_libdir}/firmware/ti-connectivity
-    install -m 0644 TIInit_11.8.32.bts ${D}${nonarch_base_libdir}/firmware/ti-connectivity/
-}
-
-do_install_am335x-nrhw20 () {
-    install_nrhw20
-}
-
-
-install_nmhw21 () {
-    install -d ${D}${systemd_unitdir}/system/
-    install -m 0644 tibluetooth-nmhw21.service ${D}${systemd_unitdir}/system/tibluetooth.service
-
-    install -d ${D}${nonarch_base_libdir}/firmware/ti-connectivity
-    install -m 0644 TIInit_11.8.32.bts ${D}${nonarch_base_libdir}/firmware/ti-connectivity/
-}
-
-do_install_am335x-nmhw21 () {
-    install_nmhw21
-}