summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Davis <afd@ti.com>2024-12-13 09:59:13 -0600
committerRyan Eatmon <reatmon@ti.com>2024-12-13 12:03:31 -0600
commit7b41d83f372214dbd1ebcf6ea8c80cb1fca75e6f (patch)
treec55d61718e635539420b4fce6123fc4b69fa143a
parentc58af0b172660ef1248a3454af06251d872770b1 (diff)
downloadmeta-ti-7b41d83f372214dbd1ebcf6ea8c80cb1fca75e6f.tar.gz
wl18xx-fw: Do not depend on the makefile for install
We use the makefile shipped with the firmware to deploy the firmware instead of just manually moving it in the install step. But the makefile doesn't do the right thing, so we also modify the makefile. Skip all this and just move the firmware ourselves. Signed-off-by: Andrew Davis <afd@ti.com>
-rw-r--r--meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw/0001-Add-Makefile-to-install-firmware-files.patch31
-rw-r--r--meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb12
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 @@
1From 3a8fc3ccf00796254d6cef4b6d4cd70dc37012e1 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com>
3Date: Fri, 10 Mar 2017 13:28:29 -0500
4Subject: [PATCH] Add Makefile to install firmware files
5
6Upstream-Status: Pending
7
8Signed-off-by: Denys Dmytriyenko <denys@ti.com>
9---
10 Makefile | 9 +++++++++
11 1 file changed, 9 insertions(+)
12 create mode 100644 Makefile
13
14diff --git a/Makefile b/Makefile
15new file mode 100644
16index 0000000..1cf38e3
17--- /dev/null
18+++ b/Makefile
19@@ -0,0 +1,9 @@
20+# Installs the the ti-connectivity wlan firmware files into the root file system
21+
22+install:
23+ @if [ ! -d $(DESTDIR) ] ; then \
24+ echo "Target filesystem directory doesn't exist."; \
25+ exit 1; \
26+ fi
27+ install -d $(DEST_DIR)/lib/firmware/ti-connectivity
28+ cp *.bin $(DEST_DIR)/lib/firmware/ti-connectivity/
29--
302.7.4
31
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"
2LICENSE = "TI-TSPA" 2LICENSE = "TI-TSPA"
3LIC_FILES_CHKSUM = "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e" 3LIC_FILES_CHKSUM = "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e"
4 4
5SRC_URI = " \ 5SRC_URI = "git://git.ti.com/git/wilink8-wlan/wl18xx_fw.git;protocol=https;branch=${BRANCH}"
6 git://git.ti.com/git/wilink8-wlan/wl18xx_fw.git;protocol=https;branch=${BRANCH} \
7 file://0001-Add-Makefile-to-install-firmware-files.patch \
8"
9 6
10SRCREV = "5ec05007f2662f460f881c5868311fd3ab7e6e71" 7SRCREV = "5ec05007f2662f460f881c5868311fd3ab7e6e71"
11BRANCH = "master" 8BRANCH = "master"
@@ -19,11 +16,8 @@ do_compile() {
19} 16}
20 17
21do_install() { 18do_install() {
22 if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then 19 install -d ${D}${nonarch_base_libdir}/firmware/ti-connectivity
23 oe_runmake 'DEST_DIR=${D}/usr' install 20 install -m 0644 ${S}/*.bin ${D}${nonarch_base_libdir}/firmware/ti-connectivity/
24 else
25 oe_runmake 'DEST_DIR=${D}' install
26 fi
27} 21}
28 22
29FILES:${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*" 23FILES:${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*"