From 547ec80a732bceaf889417dfed4d96aa1fe3a0ca Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Wed, 25 Oct 2023 11:56:28 -0500 Subject: ti-linux-fw: Add several more firmware helper lines to this common include These are all useful for firmware recipes but some recipes did not have them. For firmware including ti-linux-fw.inc let's add these all to one spot and remove them from any recipe that did already have these. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon --- meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb | 4 ---- .../recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb | 2 -- meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb | 2 -- meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb | 2 -- .../recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb | 2 -- meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb | 2 -- meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb | 2 -- meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb | 2 -- meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb | 2 -- meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb | 12 ------------ meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb | 12 ------------ meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 14 ++++++++++++++ meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 12 ------------ 13 files changed, 14 insertions(+), 56 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb index a87f21ac..4de3ec6c 100644 --- a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb @@ -30,7 +30,3 @@ do_install() { install -d ${D}${nonarch_base_libdir}/firmware/cnm install -m 0644 ${S}/cnm/${SOURCE_WAVE521C} ${D}${nonarch_base_libdir}/firmware/cnm/${TARGET_WAVE521C} } - -# we don't want to configure and build the source code -do_compile[noexec] = "1" -do_configure[noexec] = "1" diff --git a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb index 8fe1f838..2c0736ed 100644 --- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb +++ b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb @@ -24,5 +24,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb index 4f648075..8b15ab7f 100644 --- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb +++ b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x_git.bb @@ -22,5 +22,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb index 99b9e11c..463f3faa 100644 --- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb +++ b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw_5.6.15.bb @@ -19,5 +19,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb index a1fe13d3..ea39d73d 100644 --- a/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb +++ b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw-am65x-sr2_git.bb @@ -24,5 +24,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb index 2cba6350..fe99cb3e 100644 --- a/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb +++ b/meta-ti-bsp/recipes-bsp/pruhsr-fw/pruhsr-fw_2.17.25.bb @@ -20,5 +20,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb b/meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb index 807cf941..842621f6 100644 --- a/meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb +++ b/meta-ti-bsp/recipes-bsp/pruprp-fw/pruprp-fw_2.17.25.bb @@ -20,5 +20,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb index b89e8203..63c2d311 100644 --- a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb +++ b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw-am65x-sr2_git.bb @@ -24,5 +24,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb index d612cdf0..755f93b9 100644 --- a/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb +++ b/meta-ti-bsp/recipes-bsp/prusw-fw/prusw-fw_3.2.9.bb @@ -19,5 +19,3 @@ do_install() { install -m 0644 ${S}/ti-pruss/$f ${D}${nonarch_base_libdir}/firmware/ti-pruss/$f done } - -INSANE_SKIP:${PN} = "arch" diff --git a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb index fcb18c03..1851297f 100644 --- a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb +++ b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb @@ -104,16 +104,4 @@ ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" ALTERNATIVE_PRIORITY = "10" -# This is used to prevent the build system to_strip the executables -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_SYSROOT_STRIP = "1" -# This is used to prevent the build system to split the debug info in a separate file -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -# As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP -INSANE_SKIP:${PN} += "arch" - -# we don't want to configure and build the source code -do_compile[noexec] = "1" -do_configure[noexec] = "1" - addtask deploy after do_install diff --git a/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb b/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb index 0688aebb..75c4de4c 100644 --- a/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb +++ b/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb @@ -101,15 +101,3 @@ ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW} ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" ALTERNATIVE_PRIORITY = "5" - -# This is used to prevent the build system to_strip the executables -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_SYSROOT_STRIP = "1" -# This is used to prevent the build system to split the debug info in a separate file -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -# As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP -INSANE_SKIP:${PN} += "arch" - -# we don't want to configure and build the source code -do_compile[noexec] = "1" -do_configure[noexec] = "1" 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 5d059c99..5def5ade 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 @@ -30,3 +30,17 @@ CLEANBROKEN = "1" # Make sure that lib/firmware, and all its contents are part of the package FILES:${PN} = "${nonarch_base_libdir}/firmware" + +# This is used to prevent the build system from stripping the firmwares +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" + +# This is used to prevent the build system from splitting out the firmware debug info into a separate file +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +# Disable arch checking as firmware is likely to be a different arch from the Yocto build +INSANE_SKIP:${PN} += "arch" + +# Firmware in Linux Firmware has no configure nor build steps +do_compile[noexec] = "1" +do_configure[noexec] = "1" diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb index b10f2f57..fb6420eb 100644 --- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb @@ -366,15 +366,3 @@ ALTERNATIVE_TARGET[j784s4-c71_3-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_4_FW}" ALTERNATIVE_TARGET[j784s4-c71_3-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_4_FW}.signed" ALTERNATIVE_PRIORITY = "10" - -# This is used to prevent the build system to_strip the executables -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_SYSROOT_STRIP = "1" -# This is used to prevent the build system to split the debug info in a separate file -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -# As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP -INSANE_SKIP:${PN} += "arch" - -# we don't want to configure and build the source code -do_compile[noexec] = "1" -do_configure[noexec] = "1" -- cgit v1.2.3-54-g00ecf