2 files changed, 3 insertions, 40 deletions

diff --git a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw/0001-Add-Makefile-to-install-firmware-files.patch b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw/0001-Add-Makefile-to-install-firmware-files.patch
deleted file mode 100644
index bb05c6fe..00000000
--- a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw/0001-Add-Makefile-to-install-firmware-files.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3a8fc3ccf00796254d6cef4b6d4cd70dc37012e1 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
-Date: Fri, 10 Mar 2017 13:28:29 -0500
-Subject: [PATCH] Add Makefile to install firmware files
-
-Upstream-Status: Pending
-
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
----
- Makefile | 9 +++++++++
- 1 file changed, 9 insertions(+)
- create mode 100644 Makefile
-
-diff --git a/Makefile b/Makefile
-new file mode 100644
-index 0000000..1cf38e3
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,9 @@
-+# Installs the the ti-connectivity wlan firmware files into the root file system
-+
-+install:
-+       @if [ ! -d $(DESTDIR) ] ; then \
-+               echo "Target filesystem directory doesn't exist."; \
-+               exit 1; \
-+       fi
-+       install -d  $(DEST_DIR)/lib/firmware/ti-connectivity
-+       cp *.bin $(DEST_DIR)/lib/firmware/ti-connectivity/
--- 
-2.7.4
-
diff --git a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
index dbae5a21..954330bf 100644
--- a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
+++ b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
@@ -2,10 +2,7 @@ DESCRIPTION = "Firmware files for use with TI wl18xx"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e"
 
-SRC_URI = " \
-        git://git.ti.com/git/wilink8-wlan/wl18xx_fw.git;protocol=https;branch=${BRANCH} \
-        file://0001-Add-Makefile-to-install-firmware-files.patch \
-"
+SRC_URI = "git://git.ti.com/git/wilink8-wlan/wl18xx_fw.git;protocol=https;branch=${BRANCH}"
 
 SRCREV = "5ec05007f2662f460f881c5868311fd3ab7e6e71"
 BRANCH = "master"
@@ -19,11 +16,8 @@ do_compile() {
 }
 
 do_install() {
-    if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
-        oe_runmake 'DEST_DIR=${D}/usr' install
-    else
-        oe_runmake 'DEST_DIR=${D}' install
-    fi
+    install -d ${D}${nonarch_base_libdir}/firmware/ti-connectivity
+    install -m 0644 ${S}/*.bin ${D}${nonarch_base_libdir}/firmware/ti-connectivity/
 }
 
 FILES:${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*"