Enabled general Intel bluetooth driver support instead of specific one.

ibt-11-5 is the specific firmware for Joule. The image for IA should be able
to include multiple firmware, including this one.

For having the firmware in the image, please include linux-firmware-ibt by
IMAGE_INSTALL_append = ' linux-firmware-ibt'

Change-Id: I4451dbbf54145df784b763dd3ef924d8a7ac8863
Signed-off-by: Kien Dinh <kien.t.dinh@intel.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/12511
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

diff --git a/meta-agl-bsp/conf/include/agl_joule.inc b/meta-agl-bsp/conf/include/agl_joule.inc
index d295634..a7773b2 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_joule.inc
+++ b/meta-agl-bsp/conf/include/agl_joule.inc
@@ -1,6 +1,6 @@
 INTEL_MACHINE_SUBTYPE = "broxton-m"
 
-IMAGE_INSTALL_append = " linux-firmware-iwlwifi-8000c linux-firmware-ibt-11-5"
+IMAGE_INSTALL_append = " linux-firmware-iwlwifi-8000c linux-firmware-ibt"
 IMAGE_INSTALL_append = " \
         libva \
         va-intel \

diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/meta-agl-bsp/meta-intel/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
index d7052af..a34159c 100644 (file)
--- a/meta-agl-bsp/meta-intel/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
+++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
@@ -1,11 +1,8 @@
 LICENSE_${PN}-ibt-license              = "Firmware-ibt_firmware"
 LICENSE_${PN}-ibt-11-5                 = "Firmware-ibt_firmware"
 FILES_${PN}-ibt-license                = "/lib/firmware/LICENCE.ibt_firmware"
-FILES_${PN}-ibt-11-5           = " \
-       /lib/firmware/intel/ibt-11-5.sfi \
-       /lib/firmware/intel/ibt-11-5.ddc \
-"
+FILES_${PN}-ibt                 = "/lib/firmware/intel"
 
-RDEPENDS_${PN}-ibt-11-5                += "${PN}-ibt-license"
+RDEPENDS_${PN}-ibt      += "${PN}-ibt-license"
 
-PACKAGES =+ " ${PN}-ibt-license ${PN}-ibt-11-5 "
+PACKAGES =+ " ${PN}-ibt-license ${PN}-ibt "