libdce: Runtime depend on IPU firmware not the other way around
PATCH v2 1/3 libdce: Runtime depend on IPU firmware not the other way around
The DCE library depends on the firmware to function, the firmware has no dependency on any one userspace library. Switch the runtime dependency around here.
---
Changes for v2:
- Use += to avoid overwriting any existing RDEPENDS
meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb | 2 -- meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)
meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +0 -2
@@ -9,8 +9,6 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "mmip" -RDEPENDS:${PN} = "libdce" - SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https;branch=master" SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5"
meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb +1 -0
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://libdce.h;beginline=1;endline=31;md5=0a398cf815b8b5f31 inherit autotools pkgconfig DEPENDS = "libdrm ti-ipc" +RDEPENDS:${PN} += "ipumm-fw" SRC_URI = "git://git.ti.com/git/omapzoom/libdce.git;protocol=https;branch=master"
Signature · 1 line
2.39.2
PATCH v2 2/3 ipumm-fw: Use prebuilt firmware from ti-linux-firmware repo
Use a prebuilt version of this firmware from ti-linux-firmware. This removes the need to build this locally.
---
Changes for v2:
- Fix s/suppor/support in SUMMARY while here
- Move PV definition to ti-linux-fw.inc like other prebuilt FWs
.../recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 1 + .../recipes-bsp/ipumm-fw/ipumm-fw_git.bb | 52 ++++--------------- 2 files changed, 10 insertions(+), 43 deletions(-)
meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +1 -0
@@ -20,6 +20,7 @@ TI_HSM_DEMO_FW_VERSION = "11.00.09" TI_PKA_FW_VERSION = "2.1.0" TI_IPC_EXAMPLES_FW_VERSION = "3.52.00.01" PCM6240_FW_VERSION = "1.0.0.0" +IPUMM_FW_VERSION = "3.00.15.00" TI_LINUX_FW_SRCREV ?= "ec029baad8b4b147af8331a5e099ef891e5ae1f4" SRCREV = "${TI_LINUX_FW_SRCREV}"
meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +9 -43
75 lines not on this page · raw message
Signature · 1 line
2.39.2
Re: [meta-ti][master/wrynose][PATCH v2 2/3] ipumm-fw: Use prebuilt firmware from ti-linux-firmware repo
Missing License-Update: in the commit message.
https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#license-updates
Quoted 107 lines · Andrew Davis
Use a prebuilt version of this firmware from ti-linux-firmware. This removes the need to build this locally.
Signed-off-by Andrew Davis <[email protected]>---
Changes for v2:
- Fix s/suppor/support in SUMMARY while here
- Move PV definition to ti-linux-fw.inc like other prebuilt FWs.../recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 1 + .../recipes-bsp/ipumm-fw/ipumm-fw_git.bb | 52 ++++--------------- 2 files changed, 10 insertions(+), 43 deletions(-)meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +1
-0@@ -20,6 +20,7 @@ TI_HSM_DEMO_FW_VERSION = "11.00.09" TI_PKA_FW_VERSION = "2.1.0" TI_IPC_EXAMPLES_FW_VERSION = "3.52.00.01" PCM6240_FW_VERSION = "1.0.0.0" +IPUMM_FW_VERSION = "3.00.15.00" TI_LINUX_FW_SRCREV ?= "ec029baad8b4b147af8331a5e099ef891e5ae1f4" SRCREV = "${TI_LINUX_FW_SRCREV}"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +9
-43@@ -1,7 +1,7 @@ -SUMMARY = "Firmware for IPU to suppor Accelerated MM decode and encode" -LICENSE = "TI-TSPA" +SUMMARY = "Firmware for IPU to support Accelerated MM decode and encode" -LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f" +LICENSE = "TI-TSPA" +LIC_FILES_CHKSUM = "file://LICENCE.ti-tspa;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a" COMPATIBLE_MACHINE = "am57xx"@@ -9,59 +9,25 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "mmip" -SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https;branch=master" - -SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5" - -PV = "3.00.15.00" -PR = "r7" +require recipes-bsp/ti-linux-fw/ti-linux-fw.inc -require recipes-ti/includes/ti-paths.inc +PV = "${IPUMM_FW_VERSION}" +PR = "r8" inherit update-alternatives -DEPENDS = "ti-xdctools-native ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-cgt-arm-native ti-ipc-rtos" - -export HWVERSION = "ES10" -export BIOSTOOLSROOT = "${STAGING_DIR_TARGET}/usr/share/ti" - -export XDCVERSION = "ti-xdctools-tree" -export BIOSVERSION = "ti-sysbios-tree" -export IPCVERSION = "ti-ipc-tree" -export CEVERSION = "ti-codec-engine-tree" -export FCVERSION = "ti-framework-components-tree" -export XDAISVERSION = "ti-xdais-tree" - -export TMS470CGTOOLPATH = "${M4_TOOLCHAIN_INSTALL_DIR}" -export IPCSRC = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree" - -EXTRA_OEMAKE += "XDCDIST_TREE=${STAGING_DIR_NATIVE}/usr/share/ti/${XDCVERSION}" - -do_configure() { - oe_runmake unconfig - oe_runmake vayu_smp_config -} - -do_compile() { - oe_runmake -} - TARGET = "dra7-ipu2-fw.xem4" -TARGET_MAP = "platform/ti/dce/baseimage/package/cfg/out/ipu/release/ipu.xem4.map" do_install() { - install -d ${D}${nonarch_base_libdir}/firmware - install -m 0644 ${S}/${TARGET} ${D}${nonarch_base_libdir}/firmware/${TARGET}.${BPN} - install -m 0644 ${S}/${TARGET_MAP} ${D}${nonarch_base_libdir}/firmware/${TARGET}.map + install -d ${D}${nonarch_base_libdir}/firmware/ti-ce-fw + install -m 0644 ${S}/ti-ce-fw/${TARGET} ${D}${nonarch_base_libdir}/firmware/ti-ce-fw/${TARGET} } ALTERNATIVE:${PN} = "dra7-ipu2-fw.xem4" ALTERNATIVE_LINK_NAME[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/${TARGET}" -ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/${TARGET}.${BPN}" +ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/ti-ce-fw/${TARGET}" ALTERNATIVE_PRIORITY = "20" -FILES:${PN} += "${nonarch_base_libdir}/firmware/*" - # Disable the "buildpaths" check while we figure out how we are # going to address this issue. #
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
Re: [meta-ti][master/wrynose][PATCH v2 2/3] ipumm-fw: Use prebuilt firmware from ti-linux-firmware repo
Quoted 6 lines · Ryan Eatmon
Missing License-Update: in the commit message.
https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#license-updates
Hmm, so in this case the license isn't changing, just moving location, would something like this work?:
License-Update: License text moved from source manifest to standalone file
Andrew
Quoted 98 lines · Andrew Davis
Quoted 95 lines
Use a prebuilt version of this firmware from ti-linux-firmware. This removes the need to build this locally.
Signed-off-by Andrew Davis <[email protected]>---
Changes for v2:
- Fix s/suppor/support in SUMMARY while here
- Move PV definition to ti-linux-fw.inc like other prebuilt FWs.../recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 1 + .../recipes-bsp/ipumm-fw/ipumm-fw_git.bb | 52 ++++---------------
2 files changed, 10 insertions(+), 43 deletions(-)meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +0
-0@@ -20,6 +20,7 @@ TI_HSM_DEMO_FW_VERSION = "11.00.09"
TI_PKA_FW_VERSION= "2.1.0"TI_IPC_EXAMPLES_FW_VERSION= "3.52.00.01"PCM6240_FW_VERSION= "1.0.0.0"
+IPUMM_FW_VERSION = "3.00.15.00"
TI_LINUX_FW_SRCREV?= "ec029baad8b4b147af8331a5e099ef891e5ae1f4" SRCREV = "${TI_LINUX_FW_SRCREV}"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +3
-3@@ -1,7 +1,7 @@ -SUMMARY = "Firmware for IPU to suppor Accelerated MM decode and encode" -LICENSE = "TI-TSPA" +SUMMARY = "Firmware for IPU to support Accelerated MM decode and encode" -LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f" +LICENSE = "TI-TSPA" +LIC_FILES_CHKSUM = "file://LICENCE.ti-tspa;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"
COMPATIBLE_MACHINE= "am57xx"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +0
-0@@ -9,59 +9,25 @@ inherit features_check
REQUIRED_MACHINE_FEATURES= "mmip"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +3
-7-SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https;branch=master" - -SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5" - -PV = "3.00.15.00" -PR = "r7" +require recipes-bsp/ti-linux-fw/ti-linux-fw.inc -require recipes-ti/includes/ti-paths.inc +PV = "${IPUMM_FW_VERSION}" +PR = "r8"inherit update-alternatives
meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +0
-26-DEPENDS = "ti-xdctools-native ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-cgt-arm-native ti-ipc-rtos" - -export HWVERSION = "ES10" -export BIOSTOOLSROOT = "${STAGING_DIR_TARGET}/usr/share/ti" - -export XDCVERSION = "ti-xdctools-tree" -export BIOSVERSION = "ti-sysbios-tree" -export IPCVERSION = "ti-ipc-tree" -export CEVERSION = "ti-codec-engine-tree" -export FCVERSION = "ti-framework-components-tree" -export XDAISVERSION = "ti-xdais-tree" - -export TMS470CGTOOLPATH = "${M4_TOOLCHAIN_INSTALL_DIR}" -export IPCSRC = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree" - -EXTRA_OEMAKE += "XDCDIST_TREE=${STAGING_DIR_NATIVE}/usr/share/ti/${XDCVERSION}" - -do_configure() { - oe_runmake unconfig - oe_runmake vayu_smp_config -} - -do_compile() { - oe_runmake -} -TARGET = "dra7-ipu2-fw.xem4"
-TARGET_MAP = "platform/ti/dce/baseimage/package/cfg/out/ipu/release/ipu.xem4.map"do_install(){
- install -d ${D}${nonarch_base_libdir}/firmware
- install -m 0644 ${S}/${TARGET} ${D}${nonarch_base_libdir}/firmware/${TARGET}.${BPN} - install -m 0644 ${S}/${TARGET_MAP} ${D}${nonarch_base_libdir}/firmware/${TARGET}.map + install -d ${D}${nonarch_base_libdir}/firmware/ti-ce-fw
+ install -m 0644 ${S}/ti-ce-fw/${TARGET} ${D}${nonarch_base_libdir}/firmware/ti-ce-fw/${TARGET} }
ALTERNATIVE:${PN} = "dra7-ipu2-fw.xem4"
ALTERNATIVE_LINK_NAME[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/${TARGET}"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +1
-1-ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/${TARGET}.${BPN}" +ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/ti-ce-fw/${TARGET}"
ALTERNATIVE_PRIORITY= "20"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +0
-2-FILES:${PN} += "${nonarch_base_libdir}/firmware/*" -# Disable the "buildpaths" check while we figure out how we are
# going to address this issue. #
Re: [meta-ti][master/wrynose][PATCH v2 2/3] ipumm-fw: Use prebuilt firmware from ti-linux-firmware repo
Quoted 4 lines · Andrew Davis via lists.yoctoproject.org
Quoted 3 lines · Ryan Eatmon
Missing License-Update: in the commit message.
Quoted 8 lines
Quoted 3 lines
https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#license-updates
Hmm, so in this case the license isn't changing, just moving location, would something like this work?:
License-Update: License text moved from source manifest to standalone file
Aren't they both standaline files? The old one is a pdf and the new one is presumably text?
Quoted 101 lines
Andrew
Quoted 98 lines · Andrew Davis
Quoted 95 lines
Use a prebuilt version of this firmware from ti-linux-firmware. This removes the need to build this locally.
Signed-off-by Andrew Davis <[email protected]>---
Changes for v2:
- Fix s/suppor/support in SUMMARY while here
- Move PV definition to ti-linux-fw.inc like other prebuilt FWs.../recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 1 + .../recipes-bsp/ipumm-fw/ipumm-fw_git.bb | 52 ++++---------------
2 files changed, 10 insertions(+), 43 deletions(-)meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +0
-0@@ -20,6 +20,7 @@ TI_HSM_DEMO_FW_VERSION = "11.00.09"
TI_PKA_FW_VERSION= "2.1.0"TI_IPC_EXAMPLES_FW_VERSION= "3.52.00.01"PCM6240_FW_VERSION= "1.0.0.0"
+IPUMM_FW_VERSION = "3.00.15.00"
TI_LINUX_FW_SRCREV?= "ec029baad8b4b147af8331a5e099ef891e5ae1f4" SRCREV = "${TI_LINUX_FW_SRCREV}"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +3
-3@@ -1,7 +1,7 @@ -SUMMARY = "Firmware for IPU to suppor Accelerated MM decode and encode" -LICENSE = "TI-TSPA" +SUMMARY = "Firmware for IPU to support Accelerated MM decode and encode" -LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f" +LICENSE = "TI-TSPA" +LIC_FILES_CHKSUM = "file://LICENCE.ti-tspa;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"
COMPATIBLE_MACHINE= "am57xx"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +0
-0@@ -9,59 +9,25 @@ inherit features_check
REQUIRED_MACHINE_FEATURES= "mmip"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +3
-7-SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https;branch=master" - -SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5" - -PV = "3.00.15.00" -PR = "r7" +require recipes-bsp/ti-linux-fw/ti-linux-fw.inc -require recipes-ti/includes/ti-paths.inc +PV = "${IPUMM_FW_VERSION}" +PR = "r8"inherit update-alternatives
meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +0
-26-DEPENDS = "ti-xdctools-native ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-cgt-arm-native ti-ipc-rtos" - -export HWVERSION = "ES10" -export BIOSTOOLSROOT = "${STAGING_DIR_TARGET}/usr/share/ti" - -export XDCVERSION = "ti-xdctools-tree" -export BIOSVERSION = "ti-sysbios-tree" -export IPCVERSION = "ti-ipc-tree" -export CEVERSION = "ti-codec-engine-tree" -export FCVERSION = "ti-framework-components-tree" -export XDAISVERSION = "ti-xdais-tree" - -export TMS470CGTOOLPATH = "${M4_TOOLCHAIN_INSTALL_DIR}" -export IPCSRC = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree" - -EXTRA_OEMAKE += "XDCDIST_TREE=${STAGING_DIR_NATIVE}/usr/share/ti/${XDCVERSION}" - -do_configure() { - oe_runmake unconfig - oe_runmake vayu_smp_config -} - -do_compile() { - oe_runmake -} -TARGET = "dra7-ipu2-fw.xem4"
-TARGET_MAP = "platform/ti/dce/baseimage/package/cfg/out/ipu/release/ipu.xem4.map"do_install(){
- install -d ${D}${nonarch_base_libdir}/firmware
- install -m 0644 ${S}/${TARGET} ${D}${nonarch_base_libdir}/firmware/${TARGET}.${BPN} - install -m 0644 ${S}/${TARGET_MAP} ${D}${nonarch_base_libdir}/firmware/${TARGET}.map + install -d ${D}${nonarch_base_libdir}/firmware/ti-ce-fw
+ install -m 0644 ${S}/ti-ce-fw/${TARGET} ${D}${nonarch_base_libdir}/firmware/ti-ce-fw/${TARGET} }
ALTERNATIVE:${PN} = "dra7-ipu2-fw.xem4"
ALTERNATIVE_LINK_NAME[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/${TARGET}"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +1
-1-ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/${TARGET}.${BPN}" +ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/ti-ce-fw/${TARGET}"
ALTERNATIVE_PRIORITY= "20"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +0
-2-FILES:${PN} += "${nonarch_base_libdir}/firmware/*" -# Disable the "buildpaths" check while we figure out how we are
# going to address this issue. #
Re: [meta-ti][master/wrynose][PATCH v2 2/3] ipumm-fw: Use prebuilt firmware from ti-linux-firmware repo
Quoted 9 lines · Denys Dmytriyenko
Quoted 8 lines · Andrew Davis via lists.yoctoproject.org
Quoted 6 lines · Ryan Eatmon
Missing License-Update: in the commit message.
https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#license-updates
Quoted 8 lines
Quoted 4 lines
Hmm, so in this case the license isn't changing, just moving location, would something like this work?:
License-Update: License text moved from source manifest to standalone file
Aren't they both standaline files? The old one is a pdf and the new one is presumably text?
The old one included other information, in fact it probably wasn't even the right file to use for the LIC_FILES_CHKSUM, it should have been this file:
https://git.ti.com/cgit/ivimm/ipumm/plain/SRAS_3443-TSPA_Click_Wrap_License.pdf
But that is an mistake someone made many years ago.. So what we are doing here is moving the LIC_FILES_CHKSUM from the source manifest (incorrect), to the standalone TI-TSPA license file.
Andrew
Quoted 102 lines
Quoted 102 lines
Andrew
Quoted 98 lines · Andrew Davis
Quoted 95 lines
Use a prebuilt version of this firmware from ti-linux-firmware. This removes the need to build this locally.
Signed-off-by Andrew Davis <[email protected]>---
Changes for v2:
- Fix s/suppor/support in SUMMARY while here
- Move PV definition to ti-linux-fw.inc like other prebuilt FWs.../recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 1 + .../recipes-bsp/ipumm-fw/ipumm-fw_git.bb | 52 ++++--------------- 2 files changed, 10 insertions(+), 43 deletions(-)meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +1
-0@@ -20,6 +20,7 @@ TI_HSM_DEMO_FW_VERSION = "11.00.09" TI_PKA_FW_VERSION = "2.1.0" TI_IPC_EXAMPLES_FW_VERSION = "3.52.00.01" PCM6240_FW_VERSION = "1.0.0.0" +IPUMM_FW_VERSION = "3.00.15.00" TI_LINUX_FW_SRCREV ?= "ec029baad8b4b147af8331a5e099ef891e5ae1f4" SRCREV = "${TI_LINUX_FW_SRCREV}"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +9
-43@@ -1,7 +1,7 @@ -SUMMARY = "Firmware for IPU to suppor Accelerated MM decode and encode" -LICENSE = "TI-TSPA" +SUMMARY = "Firmware for IPU to support Accelerated MM decode and encode" -LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f" +LICENSE = "TI-TSPA" +LIC_FILES_CHKSUM = "file://LICENCE.ti-tspa;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a" COMPATIBLE_MACHINE = "am57xx"@@ -9,59 +9,25 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "mmip" -SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https;branch=master" - -SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5" - -PV = "3.00.15.00" -PR = "r7" +require recipes-bsp/ti-linux-fw/ti-linux-fw.inc -require recipes-ti/includes/ti-paths.inc +PV = "${IPUMM_FW_VERSION}" +PR = "r8" inherit update-alternatives -DEPENDS = "ti-xdctools-native ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-cgt-arm-native ti-ipc-rtos" - -export HWVERSION = "ES10" -export BIOSTOOLSROOT = "${STAGING_DIR_TARGET}/usr/share/ti" - -export XDCVERSION = "ti-xdctools-tree" -export BIOSVERSION = "ti-sysbios-tree" -export IPCVERSION = "ti-ipc-tree" -export CEVERSION = "ti-codec-engine-tree" -export FCVERSION = "ti-framework-components-tree" -export XDAISVERSION = "ti-xdais-tree" - -export TMS470CGTOOLPATH = "${M4_TOOLCHAIN_INSTALL_DIR}" -export IPCSRC = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree" - -EXTRA_OEMAKE += "XDCDIST_TREE=${STAGING_DIR_NATIVE}/usr/share/ti/${XDCVERSION}" - -do_configure() { - oe_runmake unconfig - oe_runmake vayu_smp_config -} - -do_compile() { - oe_runmake -} - TARGET = "dra7-ipu2-fw.xem4" -TARGET_MAP = "platform/ti/dce/baseimage/package/cfg/out/ipu/release/ipu.xem4.map" do_install() { - install -d ${D}${nonarch_base_libdir}/firmware - install -m 0644 ${S}/${TARGET} ${D}${nonarch_base_libdir}/firmware/${TARGET}.${BPN} - install -m 0644 ${S}/${TARGET_MAP} ${D}${nonarch_base_libdir}/firmware/${TARGET}.map + install -d ${D}${nonarch_base_libdir}/firmware/ti-ce-fw + install -m 0644 ${S}/ti-ce-fw/${TARGET} ${D}${nonarch_base_libdir}/firmware/ti-ce-fw/${TARGET} } ALTERNATIVE:${PN} = "dra7-ipu2-fw.xem4" ALTERNATIVE_LINK_NAME[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/${TARGET}" -ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/${TARGET}.${BPN}" +ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/ti-ce-fw/${TARGET}" ALTERNATIVE_PRIORITY = "20" -FILES:${PN} += "${nonarch_base_libdir}/firmware/*" - # Disable the "buildpaths" check while we figure out how we are # going to address this issue. #
Re: [meta-ti][master/wrynose][PATCH v2 2/3] ipumm-fw: Use prebuilt firmware from ti-linux-firmware repo
Quoted 19 lines · Andrew Davis via lists.yoctoproject.org
Quoted 9 lines · Denys Dmytriyenko
Quoted 8 lines · Andrew Davis via lists.yoctoproject.org
Quoted 6 lines · Ryan Eatmon
Missing License-Update: in the commit message.
https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#license-updates
Quoted 8 lines
Quoted 4 lines
Hmm, so in this case the license isn't changing, just moving location, would something like this work?:
License-Update: License text moved from source manifest to standalone file
Aren't they both standaline files? The old one is a pdf and the new one is presumably text?
Quoted 8 lines
The old one included other information, in fact it probably wasn't even the right file to use for the
LIC_FILES_CHKSUM, it should have been this file:https://git.ti.com/cgit/ivimm/ipumm/plain/SRAS_3443-TSPA_Click_Wrap_License.pdf
But that is an mistake someone made many years ago.. So what we are doing here is moving the
LIC_FILES_CHKSUMfrom the source manifest (incorrect), to the standalone TI-TSPA license file.
Can you just say in the License-Update: tag something along the lines:
"The license stays the same, just use the correct file for checksum"
Quoted 104 lines
Andrew
Quoted 102 lines
Quoted 102 lines
Andrew
Quoted 98 lines · Andrew Davis
Quoted 95 lines
Use a prebuilt version of this firmware from ti-linux-firmware. This removes the need to build this locally.
Signed-off-by Andrew Davis <[email protected]>---
Changes for v2:
- Fix s/suppor/support in SUMMARY while here
- Move PV definition to ti-linux-fw.inc like other prebuilt FWs.../recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 1 + .../recipes-bsp/ipumm-fw/ipumm-fw_git.bb | 52 ++++---------------
2 files changed, 10 insertions(+), 43 deletions(-)meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +0
-0@@ -20,6 +20,7 @@ TI_HSM_DEMO_FW_VERSION = "11.00.09"
TI_PKA_FW_VERSION= "2.1.0"TI_IPC_EXAMPLES_FW_VERSION= "3.52.00.01"PCM6240_FW_VERSION= "1.0.0.0"
+IPUMM_FW_VERSION = "3.00.15.00"
TI_LINUX_FW_SRCREV?= "ec029baad8b4b147af8331a5e099ef891e5ae1f4" SRCREV = "${TI_LINUX_FW_SRCREV}"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +3
-3@@ -1,7 +1,7 @@ -SUMMARY = "Firmware for IPU to suppor Accelerated MM decode and encode" -LICENSE = "TI-TSPA" +SUMMARY = "Firmware for IPU to support Accelerated MM decode and encode" -LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f" +LICENSE = "TI-TSPA" +LIC_FILES_CHKSUM = "file://LICENCE.ti-tspa;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"
COMPATIBLE_MACHINE= "am57xx"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +0
-0@@ -9,59 +9,25 @@ inherit features_check
REQUIRED_MACHINE_FEATURES= "mmip"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +3
-7-SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https;branch=master" - -SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5" - -PV = "3.00.15.00" -PR = "r7" +require recipes-bsp/ti-linux-fw/ti-linux-fw.inc -require recipes-ti/includes/ti-paths.inc +PV = "${IPUMM_FW_VERSION}" +PR = "r8"inherit update-alternatives
meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +0
-26-DEPENDS = "ti-xdctools-native ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-cgt-arm-native ti-ipc-rtos" - -export HWVERSION = "ES10" -export BIOSTOOLSROOT = "${STAGING_DIR_TARGET}/usr/share/ti" - -export XDCVERSION = "ti-xdctools-tree" -export BIOSVERSION = "ti-sysbios-tree" -export IPCVERSION = "ti-ipc-tree" -export CEVERSION = "ti-codec-engine-tree" -export FCVERSION = "ti-framework-components-tree" -export XDAISVERSION = "ti-xdais-tree" - -export TMS470CGTOOLPATH = "${M4_TOOLCHAIN_INSTALL_DIR}" -export IPCSRC = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree" - -EXTRA_OEMAKE += "XDCDIST_TREE=${STAGING_DIR_NATIVE}/usr/share/ti/${XDCVERSION}" - -do_configure() { - oe_runmake unconfig - oe_runmake vayu_smp_config -} - -do_compile() { - oe_runmake -} -TARGET = "dra7-ipu2-fw.xem4"
-TARGET_MAP = "platform/ti/dce/baseimage/package/cfg/out/ipu/release/ipu.xem4.map"do_install(){
- install -d ${D}${nonarch_base_libdir}/firmware
- install -m 0644 ${S}/${TARGET} ${D}${nonarch_base_libdir}/firmware/${TARGET}.${BPN} - install -m 0644 ${S}/${TARGET_MAP} ${D}${nonarch_base_libdir}/firmware/${TARGET}.map + install -d ${D}${nonarch_base_libdir}/firmware/ti-ce-fw
+ install -m 0644 ${S}/ti-ce-fw/${TARGET} ${D}${nonarch_base_libdir}/firmware/ti-ce-fw/${TARGET} }
ALTERNATIVE:${PN} = "dra7-ipu2-fw.xem4"
ALTERNATIVE_LINK_NAME[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/${TARGET}"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +1
-1-ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/${TARGET}.${BPN}" +ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/ti-ce-fw/${TARGET}"
ALTERNATIVE_PRIORITY= "20"meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +0
-2-FILES:${PN} += "${nonarch_base_libdir}/firmware/*" -# Disable the "buildpaths" check while we figure out how we are
# going to address this issue. #
PATCH v2 3/3 ti-codec-engine: Remove this recipe
In reply to Andrew DavisThis was a build dependency of IPUMM firmware which is now removed. That was the only user, remove this recipe.
---
Changes for v2:
- None
.../ti-codec-engine_3.24.00.08.bb | 29 ------------------- .../recipes-ti/includes/ti-paths.inc | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 meta-ti-extras/recipes-ti/codec-engine/ti-codec-engine_3.24.00.08.bb
meta-ti-extras/recipes-ti/codec-engine/ti-codec-engine_3.24.00.08.bb deleted +0 -29
@@ -1,29 +0,0 @@ -SUMMARY = "Codec Engine for TI ARM/DSP processors" -HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce" -SECTION = "devel" -LICENSE = "BSD-3-Clause" - -require recipes-ti/includes/ti-paths.inc -require recipes-ti/includes/ti-staging.inc - -PV = "3_24_00_08" -PR = "r0" - -LIC_FILES_CHKSUM = "file://codec_engine_${PV}_Manifest.html;md5=de7d9c2594a6f3868e42a33b6a748ce7" - -SRC_URI[cetarball.md5sum] = "d66a8ccbd6cdfe9f735af9f4a07e2b9b" -SRC_URI[cetarball.sha256sum] = "ed7b7399903bbf76af06ee6457836f344ad75b903618339bae82b3967f27ffa1" - -S = "${UNPACKDIR}/codec_engine_${PV}" - -SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce/${PV}/exports/codec_engine_${PV},lite.tar.gz;name=cetarball " - -do_install() { - CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" - # Install/Stage the Source Tree - install -d ${D}${CE_INSTALL_DIR_RECIPE} - cp ${CP_ARGS} ${S}/* ${D}${CE_INSTALL_DIR_RECIPE} -} - -ALLOW_EMPTY:${PN} = "1" -FILES:${PN}-dev += "${CE_INSTALL_DIR_RECIPE}"
meta-ti-extras/recipes-ti/includes/ti-paths.inc +0 -2
@@ -3,7 +3,6 @@ installdir = "${datadir}/ti" export TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_SYS}" # This is where do_install will put it -export CE_INSTALL_DIR_RECIPE = "${installdir}/ti-codec-engine-tree" export CODEC_INSTALL_DIR_RECIPE = "${installdir}/ti-codecs-tree" export CODEGEN_ARM_INSTALL_DIR_RECIPE = "${installdir}/ti-cgt470-tree" export CG_XML_INSTALL_DIR_RECIPE = "${installdir}/ti-cg-xml-tree"
@@ -31,7 +30,6 @@ export XDAIS_INSTALL_DIR_RECIPE = "${installdir}/ti-xdais-tree" export XDC_INSTALL_DIR_RECIPE = "${installdir}/ti-xdctools-tree" # This is where the tools will end up in sysroot -export CE_INSTALL_DIR = "${STAGING_DIR_TARGET}${CE_INSTALL_DIR_RECIPE}" export CODEGEN_ARM_INSTALL_DIR = "${STAGING_DIR_TARGET}${CODEGEN_ARM_INSTALL_DIR_RECIPE}" export CG_XML_INSTALL_DIR = "${STAGING_DIR_NATIVE}${CG_XML_INSTALL_DIR_RECIPE}" export DSPLIB_C66_INSTALL_DIR = "${STAGING_DIR_TARGET}${DSPLIB_C66_INSTALL_DIR_RECIPE}"
Signature · 1 line
2.39.2
meta-ti / na / 20260624195533.1152173-1-afd
PRC Results: FAIL
=========================================================
check-yocto-patches: FAIL
=========================================================
Patches
----------------------------------------
FAIL - [meta-ti][master/wrynose][PATCH v2 2/3] ipumm-fw: Use prebuilt firmware from ti-linux-firmware repo
ERROR: Missing License-Update for change in LIC_FILES_CHKSUM. (LICENSE-UPDATE-1)
patch
ERROR: Missing License-Update for change in LICENSE. (LICENSE-UPDATE-2)
patch
For details on the above errors/warnings visit: https://lists.yoctoproject.org/g/meta-ti/wiki/40887