Skip to contentSkip to conversation

libdce: Runtime depend on IPU firmware not the other way around

PATCH Superseded Andrew Davis 4 participants 6 messages Feb 17 – Feb 18

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 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.

---
 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
index bca91df8..246255e3 100644
@@ -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
index 2ae44086..26b384e2 100644
@@ -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
#3 lore raw

PATCH 3/3 ti-codec-engine: Remove this recipe

This was a build dependency of IPUMM firmware which is now removed. That was the only user, remove this recipe.

---
 .../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
deleted file mode 100644
index b248683b..00000000
@@ -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
index 9f8b5897..ed199dec 100644
@@ -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
#1 lore raw

PATCH 2/3 ipumm-fw: Use prebuilt firmware from ti-linux-firmware repo

In reply to Andrew Davis

Use a prebuilt version of this firmware from ti-linux-firmware. This removes the need to build this locally.

---
 .../recipes-bsp/ipumm-fw/ipumm-fw_git.bb      | 55 ++-----------------
 1 file changed, 6 insertions(+), 49 deletions(-)
meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +6 -49
index 246255e3..c1fac30d 100644
@@ -1,7 +1,7 @@
 SUMMARY = "Firmware for IPU to suppor Accelerated MM decode and encode"
 LICENSE = "TI-TSPA"
 
-LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f"
+LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"
 
 COMPATIBLE_MACHINE = "am57xx"
 
@@ -9,64 +9,21 @@ inherit features_check
 
 REQUIRED_MACHINE_FEATURES = "mmip"
 
-SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https;branch=master"
-
-SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5"
+require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
 PV = "3.00.15.00"
-PR = "r7"
-
-require recipes-ti/includes/ti-paths.inc
+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.
-#
-# The ti-cgt-arm compiler is a custom TI compiler.  It does not
-# currently support reproducible builds and is provided via a
-# binary blob download that we cannot patch in the recipe to address
-# the issue.
-INSANE_SKIP:${PN} += "buildpaths"
Signature · 1 line
2.39.2
#4 lore raw
In reply to Andrew Davis

meta-ti / na / 20260217180339.128793-1-afd

PRC Results: FAIL

=========================================================
check-yocto-patches: FAIL
=========================================================
Patches
----------------------------------------
FAIL - [meta-ti][master][PATCH 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

For details on the above errors/warnings visit: https://lists.yoctoproject.org/g/meta-ti/wiki/40887

#2 lore raw

Re: [meta-ti][master][PATCH 2/3] ipumm-fw: Use prebuilt firmware from ti-linux-firmware repo

In reply to Andrew Davis
Quoted 22 lines · Andrew Davis via lists.yoctoproject.org

Use a prebuilt version of this firmware from ti-linux-firmware. This removes the need to build this locally.

---
 .../recipes-bsp/ipumm-fw/ipumm-fw_git.bb      | 55 ++-----------------
 1 file changed, 6 insertions(+), 49 deletions(-)
meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +1 -1
index 246255e3..c1fac30d 100644
@@ -1,7 +1,7 @@
 SUMMARY = "Firmware for IPU to suppor Accelerated MM decode and encode"
 LICENSE = "TI-TSPA"
 
-LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f"
+LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"
 
 COMPATIBLE_MACHINE = "am57xx"
 

meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb inherit features_check · line 14

Quoted 9 lines
meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +1 -3
@@ -9,64 +9,21 @@ inherit features_check
 
 REQUIRED_MACHINE_FEATURES = "mmip"
 
-SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https;branch=master"
-
-SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5"
+require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
 
 PV = "3.00.15.00"

Aren't PVs for prebuilt FWs now being set centrally in the ti-linux-fw.inc?

Quoted 62 lines
meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +4 -45
-PR = "r7"
-
-require recipes-ti/includes/ti-paths.inc
+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.
-#
-# The ti-cgt-arm compiler is a custom TI compiler.  It does not
-# currently support reproducible builds and is provided via a
-# binary blob download that we cannot patch in the recipe to address
-# the issue.
-INSANE_SKIP:${PN} += "buildpaths"
Signature · 1 line
2.39.2
#5 lore raw
In reply to Andrew Davis

Hi Andrew,

Quoted 28 lines · Andrew Davis via lists.yoctoproject.org

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.

---
 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
index bca91df8..246255e3 100644
@@ -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 +0 -0
index 2ae44086..26b384e2 100644

meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb LIC_FILES_CHKSUM = "file://libdce.h;beginline=1;endline=31;md5=0a398cf815b8b5f31 · line 8

Quoted 4 lines
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"

RDEPENDS:${PN} += "ipumm-fw" to avoid overwriting any RDEPENDS set by inherited classes.

meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb LIC_FILES_CHKSUM = "file://libdce.h;beginline=1;endline=31;md5=0a398cf815b8b5f31 · line 11

Quoted 3 lines
meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb +0 -0
 SRC_URI = "git://git.ti.com/git/omapzoom/libdce.git;protocol=https;branch=master"
 

Regards
Yogesh