Message ID | 20230615201849.211619-1-afd@ti.com |
---|---|
State | Accepted |
Delegated to: | Ryan Eatmon |
Headers | show |
Series | [meta-ti,master/kirkstone] ti-sci-fw: Include the TIFS LPM stub with the rest of SYSFW | expand |
On 6/15/2023 3:18 PM, Andrew Davis via lists.yoctoproject.org wrote: > 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> > --- > .../recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 1 - > .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 + > .../tifs-lpm-stub/tifs-lpm-stub_git.bb | 23 ------------------- > .../recipes-kernel/linux/kernel-rdepends.inc | 4 ---- > 4 files changed, 1 insertion(+), 28 deletions(-) > delete mode 100644 meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb > > 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 8e1b68c4..a3d43fd1 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" > CADENCE_MHDP_FW_VERSION = "2.1.0" > IMG_DEC_FW_VERSION = "1.0" > CNM_WAVE521_FW_VERSION = "1.0.00" > -TIFS_LPM_STUB_FW_VERSION = "08.06.04" > TI_DM_FW_VERSION = "08.06.04" > TI_SYSFW_VERSION = "08.06.04" > > 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() { > install -d ${D}${nonarch_base_libdir}/firmware/ti-sysfw > install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw > install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw > + install -m 644 ${S}/ti-sysfw/ti-fs-stub-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw > } > > 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 @@ > -SUMMARY = "TI Foundational security Low Power Management Stub" > - > -require recipes-bsp/ti-linux-fw/ti-linux-fw.inc > - > -PV = "${TIFS_LPM_STUB_FW_VERSION}" > -PR = "${INC_PR}.0" > - > -CLEANBROKEN = "1" > - > -COMPATIBLE_MACHINE = "am62xx|am62axx" > - > -PACKAGE_ARCH = "${MACHINE_ARCH}" > - > -S = "${WORKDIR}/git" > - > -TARGET = "ti-fs-stub-firmware-am62x-gp-signed.bin" > - > -do_install() { > - install -d ${D}${nonarch_base_libdir}/firmware/ti-sysfw/ > - install -m 0644 ${S}/ti-sysfw/${TARGET} ${D}${nonarch_base_libdir}/firmware/ti-sysfw/${TARGET} > -} > - > -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" > RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cnm-wave-fw" > RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cnm-wave-fw" > RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62axx = " cnm-wave-fw" > - > -# Add run-time dependency for TIFS Low Power Module stub > -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62xx = " tifs-lpm-stub" > -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62axx = " tifs-lpm-stub" > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#16736): https://lists.yoctoproject.org/g/meta-ti/message/16736 > Mute This Topic: https://lists.yoctoproject.org/mt/99557243/2167429 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [praneeth@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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 8e1b68c4..a3d43fd1 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" CADENCE_MHDP_FW_VERSION = "2.1.0" IMG_DEC_FW_VERSION = "1.0" CNM_WAVE521_FW_VERSION = "1.0.00" -TIFS_LPM_STUB_FW_VERSION = "08.06.04" TI_DM_FW_VERSION = "08.06.04" TI_SYSFW_VERSION = "08.06.04" 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() { install -d ${D}${nonarch_base_libdir}/firmware/ti-sysfw install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw + install -m 644 ${S}/ti-sysfw/ti-fs-stub-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw } 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 @@ -SUMMARY = "TI Foundational security Low Power Management Stub" - -require recipes-bsp/ti-linux-fw/ti-linux-fw.inc - -PV = "${TIFS_LPM_STUB_FW_VERSION}" -PR = "${INC_PR}.0" - -CLEANBROKEN = "1" - -COMPATIBLE_MACHINE = "am62xx|am62axx" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/git" - -TARGET = "ti-fs-stub-firmware-am62x-gp-signed.bin" - -do_install() { - install -d ${D}${nonarch_base_libdir}/firmware/ti-sysfw/ - install -m 0644 ${S}/ti-sysfw/${TARGET} ${D}${nonarch_base_libdir}/firmware/ti-sysfw/${TARGET} -} - -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" RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cnm-wave-fw" RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cnm-wave-fw" RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62axx = " cnm-wave-fw" - -# Add run-time dependency for TIFS Low Power Module stub -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62xx = " tifs-lpm-stub" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62axx = " tifs-lpm-stub"
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> --- .../recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 1 - .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 + .../tifs-lpm-stub/tifs-lpm-stub_git.bb | 23 ------------------- .../recipes-kernel/linux/kernel-rdepends.inc | 4 ---- 4 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb