From 667fbe16d99073abbc0bde90c8a6e6fd004d008b Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Tue, 23 Jul 2019 11:29:40 +0200 Subject: [PATCH] tibluetooth: Cleanup and use MACHINE_FEATURES --- conf/machine/am335x-nmhw21.conf | 2 +- conf/machine/am335x-nrhw16.conf | 2 ++ conf/machine/am335x-nrhw20.conf | 2 +- conf/machine/imx8-nmhw23.conf | 2 +- .../tibluetooth/tibluetooth.bb | 36 ++----------------- .../tibluetooth.service} | 0 .../tibluetooth.service} | 0 .../tibluetooth.service} | 0 8 files changed, 8 insertions(+), 36 deletions(-) rename recipes-connectivity/tibluetooth/tibluetooth/{tibluetooth-nmhw21.service => am335x-nmhw21/tibluetooth.service} (100%) rename recipes-connectivity/tibluetooth/tibluetooth/{tibluetooth-nbhw16.service => am335x-nrhw16/tibluetooth.service} (100%) rename recipes-connectivity/tibluetooth/tibluetooth/{tibluetooth-nrhw20.service => am335x-nrhw20/tibluetooth.service} (100%) diff --git a/conf/machine/am335x-nmhw21.conf b/conf/machine/am335x-nmhw21.conf index 16ff9e7..1be48f2 100644 --- a/conf/machine/am335x-nmhw21.conf +++ b/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" diff --git a/conf/machine/am335x-nrhw16.conf b/conf/machine/am335x-nrhw16.conf index 2a15da1..4713d69 100644 --- a/conf/machine/am335x-nrhw16.conf +++ b/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" diff --git a/conf/machine/am335x-nrhw20.conf b/conf/machine/am335x-nrhw20.conf index 01e81dc..db87772 100644 --- a/conf/machine/am335x-nrhw20.conf +++ b/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" diff --git a/conf/machine/imx8-nmhw23.conf b/conf/machine/imx8-nmhw23.conf index 0cc57f7..3d75af7 100644 --- a/conf/machine/imx8-nmhw23.conf +++ b/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" diff --git a/recipes-connectivity/tibluetooth/tibluetooth.bb b/recipes-connectivity/tibluetooth/tibluetooth.bb index 541d413..26d53b8 100644 --- a/recipes-connectivity/tibluetooth/tibluetooth.bb +++ b/recipes-connectivity/tibluetooth/tibluetooth.bb @@ -10,9 +10,7 @@ PR = "r2" inherit systemd SRC_URI = " \ - file://tibluetooth-nbhw16.service \ - file://tibluetooth-nrhw20.service \ - file://tibluetooth-nmhw21.service \ + file://tibluetooth.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 -} diff --git a/recipes-connectivity/tibluetooth/tibluetooth/tibluetooth-nmhw21.service b/recipes-connectivity/tibluetooth/tibluetooth/am335x-nmhw21/tibluetooth.service similarity index 100% rename from recipes-connectivity/tibluetooth/tibluetooth/tibluetooth-nmhw21.service rename to recipes-connectivity/tibluetooth/tibluetooth/am335x-nmhw21/tibluetooth.service diff --git a/recipes-connectivity/tibluetooth/tibluetooth/tibluetooth-nbhw16.service b/recipes-connectivity/tibluetooth/tibluetooth/am335x-nrhw16/tibluetooth.service similarity index 100% rename from recipes-connectivity/tibluetooth/tibluetooth/tibluetooth-nbhw16.service rename to recipes-connectivity/tibluetooth/tibluetooth/am335x-nrhw16/tibluetooth.service diff --git a/recipes-connectivity/tibluetooth/tibluetooth/tibluetooth-nrhw20.service b/recipes-connectivity/tibluetooth/tibluetooth/am335x-nrhw20/tibluetooth.service similarity index 100% rename from recipes-connectivity/tibluetooth/tibluetooth/tibluetooth-nrhw20.service rename to recipes-connectivity/tibluetooth/tibluetooth/am335x-nrhw20/tibluetooth.service