8 files changed, 4 insertions, 41 deletions
diff --git a/conf/machine/dragonboard-410c-32.conf b/conf/machine/dragonboard-410c-32.conf
index 859bbfd..8d732ed 100644
--- a/conf/machine/dragonboard-410c-32.conf
+++ b/conf/machine/dragonboard-410c-32.conf
@@ -15,7 +15,6 @@ RDEPENDS_kernel-base = ""
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wcnss-config wcnss-start', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5-noinst-tools', '', d)} \
     firmware-qcom-dragonboard410c \
 "
diff --git a/conf/machine/dragonboard-410c.conf b/conf/machine/dragonboard-410c.conf
index 769c0bb..ffb5a21 100644
--- a/conf/machine/dragonboard-410c.conf
+++ b/conf/machine/dragonboard-410c.conf
@@ -15,7 +15,6 @@ SERIAL_CONSOLE ?= "115200 ttyMSM0"
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
     kernel-modules \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wcnss-config wcnss-start', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5-noinst-tools', '', d)} \
     firmware-qcom-dragonboard410c \
 "
diff --git a/conf/machine/include/qcom-apq8016.inc b/conf/machine/include/qcom-apq8016.inc
index 27eb27e..08bd660 100644
--- a/conf/machine/include/qcom-apq8016.inc
+++ b/conf/machine/include/qcom-apq8016.inc
@@ -33,6 +33,3 @@ IMAGE_ROOTFS_ALIGNMENT = "4096"
 
 QCOM_BOOTIMG_KERNEL_BASE ?= "0x80000000"
 QCOM_BOOTIMG_PAGE_SIZE ?= "2048"
-
-KERNEL_MODULE_PROBECONF += "qcom_q6v5_pil"
-module_conf_qcom_q6v5_pil = "blacklist qcom_q6v5_pil"
diff --git a/conf/machine/sd-600eval.conf b/conf/machine/sd-600eval.conf
index f7da072..f4ed1cb 100644
--- a/conf/machine/sd-600eval.conf
+++ b/conf/machine/sd-600eval.conf
@@ -9,7 +9,6 @@ MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
 MACHINE_EXTRA_RRECOMMENDS = " \
     kernel-modules \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wcnss-config wcnss-start', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5-noinst-tools', '', d)} \
     firmware-qcom-sd-600eval \
 "
diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb b/recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb
index dc81dcd..c33cecb 100644
--- a/recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb
+++ b/recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb
@@ -19,10 +19,11 @@ do_compile() {
 do_install() {
     install -d ${D}${nonarch_base_libdir}/firmware/
     install -d ${D}${nonarch_base_libdir}/firmware/qcom/venus-4.2/
+    install -d ${D}${nonarch_base_libdir}/firmware/qcom/msm8996/
     
     install -m 0444 ./proprietary-linux/a530*.* ${D}${nonarch_base_libdir}/firmware/
     install -m 0444 ./proprietary-linux/venus.* ${D}${nonarch_base_libdir}/firmware/qcom/venus-4.2/
-    install -m 0444 ./proprietary-linux/adsp.* ${D}${nonarch_base_libdir}/firmware/
+    install -m 0444 ./proprietary-linux/adsp.* ${D}${nonarch_base_libdir}/firmware/qcom/msm8996/
 
     install -d ${D}${sysconfdir}/
     install -m 0644 LICENSE ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE
diff --git a/recipes-bsp/wcnss-config/wcnss-config_1.13.bb b/recipes-bsp/wcnss-config/wcnss-config_1.13.bb
deleted file mode 100644
index 79711ad..0000000
--- a/recipes-bsp/wcnss-config/wcnss-config_1.13.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "WLAN and BT configuration files for QCOM WCN"
-HOMEPAGE = "https://git.linaro.org/landing-teams/working/qualcomm/wcnss-config.git"
-SECTION = "devel"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://debian/copyright;md5=9ffc7d99f148b53a339cd4374c5c431f"
-
-# TAG:debian/1.13
-SRCREV = "655a59f30915bed785d39cc90130dc06b44d7f6f"
-SRC_URI = "git://git.linaro.org/landing-teams/working/qualcomm/wcnss-config.git;branch=master;protocol=https"
-
-S = "${WORKDIR}/git"
-
-inherit systemd allarch
-
-PACKAGES =+ "wcnss-start"
-
-do_install () {
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${S}/debian/wcnss-start.service ${D}${systemd_unitdir}/system
-
-    install -d ${D}${sbindir}
-    install -m 0755 ${S}/wcnss-start ${D}${sbindir}
-}
-
-# They are empty, and would break dev-pkgs image feature.
-PACKAGES_remove = "${PN}-dev ${PN}-staticdev"
-
-FILES_wcnss-start = "${sbindir}/wcnss-start ${systemd_unitdir}/system/wcnss-start.service"
-
-SYSTEMD_PACKAGES = "wcnss-start"
-SYSTEMD_SERVICE_wcnss-start = "wcnss-start.service"
diff --git a/recipes-kernel/linux/linux-linaro-qcomlt_5.4.bb b/recipes-kernel/linux/linux-linaro-qcomlt_5.4.bb
index b25dbe1..24b162c 100644
--- a/recipes-kernel/linux/linux-linaro-qcomlt_5.4.bb
+++ b/recipes-kernel/linux/linux-linaro-qcomlt_5.4.bb
@@ -11,7 +11,7 @@ require recipes-kernel/linux/linux-qcom-bootimg.inc
 
 LOCALVERSION ?= "-linaro-lt-qcom"
 SRCBRANCH ?= "release/qcomlt-5.4"
-SRCREV ?= "9a980779332866fe32e66fa949e5cbc19a35e453"
+SRCREV ?= "447814278e3fcaef6db32a458e976b8c0c30ea0d"
 
 COMPATIBLE_MACHINE = "(apq8016|apq8096|sdm845)"
 
diff --git a/recipes-support/rmtfs/rmtfs_git.bb b/recipes-support/rmtfs/rmtfs_git.bb
index a5a0f23..8655346 100644
--- a/recipes-support/rmtfs/rmtfs_git.bb
+++ b/recipes-support/rmtfs/rmtfs_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ca25dbf5ebfc1a058bfc657c895aac2f"
 
 inherit systemd
 
-SRCREV = "df6c19d0330d251af0a7c812bf5ddb847962ce2c"
+SRCREV = "dfb8f3ed1c8fbde621cd08aaf9e7724a4c55cbd1"
 SRC_URI = "git://github.com/andersson/${BPN}.git;branch=master;protocol=https"
 DEPENDS = "qmic-native qrtr udev"