diff options
author | Andrew Davis <afd@ti.com> | 2023-06-15 15:18:49 -0500 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-06-19 13:40:25 -0500 |
commit | f2c401efc32ea868362309e0f1c1243d75ce1b7e (patch) | |
tree | e419d531f4fbd360ce10d26e052a4e7b8e87dcc9 /meta-ti-bsp | |
parent | bc5a7c7a619a49c29b2cc9c6e00f5df61275ef9b (diff) | |
download | meta-ti-f2c401efc32ea868362309e0f1c1243d75ce1b7e.tar.gz |
ti-sci-fw: Include the TIFS LPM stub with the rest of SYSFW
This firmware is shipped with the rest of ti-sysfw blobs, it shares
the same versions too and so should be simply bundled with the same.
This stub is also built into U-Boot and not loaded during kernel
runtime anymore, so remove the RDEPENDS in kernel.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'meta-ti-bsp')
4 files changed, 1 insertions, 28 deletions
diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc index d500e341..5d0e06c6 100644 --- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | |||
@@ -14,7 +14,6 @@ GOODIX_FW_VERSION = "1.0.0.0" | |||
14 | CADENCE_MHDP_FW_VERSION = "2.1.0" | 14 | CADENCE_MHDP_FW_VERSION = "2.1.0" |
15 | IMG_DEC_FW_VERSION = "1.0" | 15 | IMG_DEC_FW_VERSION = "1.0" |
16 | CNM_WAVE521_FW_VERSION = "1.0.00" | 16 | CNM_WAVE521_FW_VERSION = "1.0.00" |
17 | TIFS_LPM_STUB_FW_VERSION = "08.06.04" | ||
18 | TI_DM_FW_VERSION = "08.06.04" | 17 | TI_DM_FW_VERSION = "08.06.04" |
19 | TI_SYSFW_VERSION = "08.06.04" | 18 | TI_SYSFW_VERSION = "08.06.04" |
20 | 19 | ||
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 6a4c03f9..5ad1e688 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | |||
@@ -18,6 +18,7 @@ do_install() { | |||
18 | install -d ${D}${nonarch_base_libdir}/firmware/ti-sysfw | 18 | install -d ${D}${nonarch_base_libdir}/firmware/ti-sysfw |
19 | install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw | 19 | install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw |
20 | install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw | 20 | install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw |
21 | install -m 644 ${S}/ti-sysfw/ti-fs-stub-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw | ||
21 | } | 22 | } |
22 | 23 | ||
23 | FILES:${PN} = "${nonarch_base_libdir}/firmware" | 24 | FILES:${PN} = "${nonarch_base_libdir}/firmware" |
diff --git a/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb b/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb deleted file mode 100644 index 2db761ba..00000000 --- a/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | SUMMARY = "TI Foundational security Low Power Management Stub" | ||
2 | |||
3 | require recipes-bsp/ti-linux-fw/ti-linux-fw.inc | ||
4 | |||
5 | PV = "${TIFS_LPM_STUB_FW_VERSION}" | ||
6 | PR = "${INC_PR}.0" | ||
7 | |||
8 | CLEANBROKEN = "1" | ||
9 | |||
10 | COMPATIBLE_MACHINE = "am62xx|am62axx" | ||
11 | |||
12 | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | TARGET = "ti-fs-stub-firmware-am62x-gp-signed.bin" | ||
17 | |||
18 | do_install() { | ||
19 | install -d ${D}${nonarch_base_libdir}/firmware/ti-sysfw/ | ||
20 | install -m 0644 ${S}/ti-sysfw/${TARGET} ${D}${nonarch_base_libdir}/firmware/ti-sysfw/${TARGET} | ||
21 | } | ||
22 | |||
23 | FILES:${PN} = "${nonarch_base_libdir}/firmware" | ||
diff --git a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc index 69796915..18984e80 100644 --- a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc +++ b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc | |||
@@ -31,7 +31,3 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721e = " vxd-dec-fw" | |||
31 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cnm-wave-fw" | 31 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cnm-wave-fw" |
32 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cnm-wave-fw" | 32 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cnm-wave-fw" |
33 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62axx = " cnm-wave-fw" | 33 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62axx = " cnm-wave-fw" |
34 | |||
35 | # Add run-time dependency for TIFS Low Power Module stub | ||
36 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62xx = " tifs-lpm-stub" | ||
37 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62axx = " tifs-lpm-stub" | ||