From patchwork Thu May 1 14:26:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 62204 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF62DC369DC for ; Thu, 1 May 2025 14:26:42 +0000 (UTC) Received: from fllvem-ot04.ext.ti.com (fllvem-ot04.ext.ti.com [198.47.19.246]) by mx.groups.io with SMTP id smtpd.web10.1.1746109591664806896 for ; Thu, 01 May 2025 07:26:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=lnOu+QyU; spf=pass (domain: ti.com, ip: 198.47.19.246, mailfrom: afd@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllvem-ot04.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 541EQPCK020545 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 1 May 2025 09:26:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1746109585; bh=+F5vJCmGArMtXTGdPvSs+CgMFCgzM2UYAwujCZbsWGM=; h=From:To:CC:Subject:Date; b=lnOu+QyUt4jRnIPm4QPIgUc59lB3KLMn2+AObXoaynQuQSJWT4UBSXqbzpf5uQd0C mAKwnMNQgspmcWDfovLNVdUpC1hfxCxBQY9Bsyy5aN6K7ac0uSRDSoMCE33fZnslRm jY0ZwP9TpspsXqaXJBNx6u7uwdmyMpIpJf+mFZlY= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 541EQPpn046156 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 1 May 2025 09:26:25 -0500 Received: from DLEE100.ent.ti.com (157.170.170.30) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 1 May 2025 09:26:24 -0500 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Thu, 1 May 2025 09:26:24 -0500 Received: from fllvsmtp8.itg.ti.com ([10.250.35.60]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 541EQO6i077683; Thu, 1 May 2025 09:26:24 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][scarthgap/master][PATCH 1/3] ti-eth-fw: Only include information for supported machines Date: Thu, 1 May 2025 09:26:21 -0500 Message-ID: <20250501142623.351217-1-afd@ti.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 May 2025 14:26:42 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18526 These other machines are not compatible with this recipe, no need to setup definitions for these. Signed-off-by: Andrew Davis --- meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) 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 cf9566dc..e4b6d1de 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 @@ -3,7 +3,7 @@ SUMMARY = "TI Ethernet prebuilt binary firmware images" LICENSE = "TI-TFL" LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a" -COMPATIBLE_MACHINE = "k3" +COMPATIBLE_MACHINE = "j721e|j7200|j784s4" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -22,15 +22,7 @@ inherit ti-secdev PLAT_SFX = "" PLAT_SFX:j721e = "j721e" PLAT_SFX:j7200 = "j7200" -PLAT_SFX:j721s2 = "j721s2" PLAT_SFX:j784s4 = "j784s4" -PLAT_SFX:j722s = "j722s" -PLAT_SFX:j742s2 = "j742s2" -PLAT_SFX:am65xx = "am65xx" -PLAT_SFX:am64xx = "am64xx" -PLAT_SFX:am62xx = "am62xx" -PLAT_SFX:am62pxx = "am62pxx" -PLAT_SFX:am62axx = "am62axx" ETH_FW_DIR = "ti-eth/${PLAT_SFX}" @@ -41,15 +33,7 @@ ETH_FW = "app_remoteswitchcfg_server_strip.xer5f" ETH_FW_LIST = "" ETH_FW_LIST:j721e = "${ETH_FW}" ETH_FW_LIST:j7200 = "${ETH_FW}" -ETH_FW_LIST:j721s2 = "" ETH_FW_LIST:j784s4 = "${ETH_FW}" -ETH_FW_LIST:j722s = "" -ETH_FW_LIST:j742s2 = "" -ETH_FW_LIST:am65xx = "" -ETH_FW_LIST:am64xx = "" -ETH_FW_LIST:am62xx = "" -ETH_FW_LIST:am62pxx = "" -ETH_FW_LIST:am62axx = "" do_install() { # ETH firmware From patchwork Thu May 1 14:26:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 62202 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF97CC369DC for ; Thu, 1 May 2025 14:26:32 +0000 (UTC) Received: from lelvem-ot01.ext.ti.com (lelvem-ot01.ext.ti.com [198.47.23.234]) by mx.groups.io with SMTP id smtpd.web11.5.1746109586633462805 for ; Thu, 01 May 2025 07:26:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=L6+br7IF; spf=pass (domain: ti.com, ip: 198.47.23.234, mailfrom: afd@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelvem-ot01.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 541EQPJH3632429 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 1 May 2025 09:26:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1746109585; bh=MiNbT9BifPUXVLGhGgrgHV17vKu+Ysa+1QfEJtjibyE=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=L6+br7IFwbeq+nvVTC/oReHm02WyVCVwS/OCPwVLI9RotsGdN1GUGmrIvc1ANFRoD QrIZr+2EvcGEuRiAy5tQJuP+yJiR0k5M6bgKOxxGIxmrCaXutGwchKAxSq4u4mgYEJ 7S1nmycI1Y5L238UKAy7A+SZ1VMBn+PU9iXWDrc0= Received: from DLEE100.ent.ti.com (dlee100.ent.ti.com [157.170.170.30]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 541EQPcf102934 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 1 May 2025 09:26:25 -0500 Received: from DLEE112.ent.ti.com (157.170.170.23) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 1 May 2025 09:26:24 -0500 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Thu, 1 May 2025 09:26:24 -0500 Received: from fllvsmtp8.itg.ti.com ([10.250.35.60]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 541EQO6j077683; Thu, 1 May 2025 09:26:24 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][scarthgap/master][PATCH 2/3] ti-linux-fw: Set INHIBIT_DEFAULT_DEPS Date: Thu, 1 May 2025 09:26:22 -0500 Message-ID: <20250501142623.351217-2-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250501142623.351217-1-afd@ti.com> References: <20250501142623.351217-1-afd@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 May 2025 14:26:32 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18524 Firmware here are not built, no need for C compiler nor std libs. Add INHIBIT_DEFAULT_DEPS=1 and remove the same from all recipes that include this file. Signed-off-by: Andrew Davis --- meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb | 2 -- meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb | 2 -- meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 3 +++ meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 2 -- 4 files changed, 3 insertions(+), 6 deletions(-) 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 638138f4..d6dbd402 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 @@ -7,8 +7,6 @@ COMPATIBLE_MACHINE = "k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -INHIBIT_DEFAULT_DEPS = "1" - inherit deploy inherit update-alternatives 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 e4b6d1de..8037ac6c 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 @@ -7,8 +7,6 @@ COMPATIBLE_MACHINE = "j721e|j7200|j784s4" PACKAGE_ARCH = "${MACHINE_ARCH}" -INHIBIT_DEFAULT_DEPS = "1" - inherit update-alternatives require recipes-bsp/ti-linux-fw/ti-linux-fw.inc 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 2aa07f71..0426e803 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 @@ -43,6 +43,9 @@ 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" +# Firmware here are prebuilt with no external dependencies +INHIBIT_DEFAULT_DEPS = "1" + # Disable arch checking as firmware is likely to be a different arch from the Yocto build INSANE_SKIP:${PN} += "arch" 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 00112017..15c48e6f 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 @@ -7,8 +7,6 @@ COMPATIBLE_MACHINE = "k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -INHIBIT_DEFAULT_DEPS = "1" - inherit update-alternatives PLAT_SFX = "" From patchwork Thu May 1 14:26:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 62203 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0EB5C3ABA3 for ; Thu, 1 May 2025 14:26:32 +0000 (UTC) Received: from fllvem-ot04.ext.ti.com (fllvem-ot04.ext.ti.com [198.47.19.246]) by mx.groups.io with SMTP id smtpd.web11.6.1746109587301188521 for ; Thu, 01 May 2025 07:26:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=u7jOvedu; spf=pass (domain: ti.com, ip: 198.47.19.246, mailfrom: afd@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllvem-ot04.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 541EQQTu020549 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 1 May 2025 09:26:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1746109586; bh=jXYzyztaWuxW+nApvusg18qVRUDCH7w2yahVlsoOXSQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=u7jOvedu2kIhP27c+j8lNp3iBcBhQnIFjBrG+V3eMSJjkZLfzSVmcvIDdYp+wGU5v tjzMvGs8hMuEK4wrPESDM1TEc/+FzfNqyrNlZjr8Zch8ZSlIQKqZUBuWUC+qv0IvxD apa5JIHnaSXXCVNFRtSttmmTqs7vGB5kTgM/+/Bs= Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 541EQQvY072061 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 1 May 2025 09:26:26 -0500 Received: from DLEE103.ent.ti.com (157.170.170.33) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 1 May 2025 09:26:25 -0500 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DLEE103.ent.ti.com (157.170.170.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Thu, 1 May 2025 09:26:25 -0500 Received: from fllvsmtp8.itg.ti.com ([10.250.35.60]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 541EQO6k077683; Thu, 1 May 2025 09:26:24 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][scarthgap/master][PATCH 3/3] ti-linux-fw: Split firmware in to machine packages Date: Thu, 1 May 2025 09:26:23 -0500 Message-ID: <20250501142623.351217-3-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250501142623.351217-1-afd@ti.com> References: <20250501142623.351217-1-afd@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 May 2025 14:26:32 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18525 Firmware, like kernel modules, may be only relevant to a small subset of hardware. Shipping all firmware for all hardware can waste space. For this reason modules are split out into packages, and the same should be done for firmware. What we do currently is change the content of the package itself based on what device we are building for. Having a package change content for each machine means we cannot generate one image that supports multiple machines, nor host a common machine agnostic package repo. Instead we can generate different packages for the different firmwares and only include the firmware packages needed for each machine. Signed-off-by: Andrew Davis --- meta-ti-bsp/conf/machine/include/am69.inc | 2 +- meta-ti-bsp/conf/machine/include/j7200.inc | 2 +- meta-ti-bsp/conf/machine/include/j721e.inc | 2 +- meta-ti-bsp/conf/machine/include/j784s4.inc | 2 +- .../recipes-bsp/ti-eth-fw/ti-eth-fw.bb | 76 ++++++++++--------- 5 files changed, 46 insertions(+), 38 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc index da8a5a8b..1a19410a 100644 --- a/meta-ti-bsp/conf/machine/include/am69.inc +++ b/meta-ti-bsp/conf/machine/include/am69.inc @@ -18,4 +18,4 @@ TFA_BOARD = "j784s4" OPTEEMACHINE = "k3-j784s4" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw-j784s4" diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc index b60b98e1..3cba71b6 100644 --- a/meta-ti-bsp/conf/machine/include/j7200.inc +++ b/meta-ti-bsp/conf/machine/include/j7200.inc @@ -26,4 +26,4 @@ TFA_BOARD = "generic" OPTEEMACHINE = "k3-j721e" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw-j7200" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index b5ba448e..30aa2a69 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -40,4 +40,4 @@ TI_VXE_VXD_DRIVER = "ti-vxe-vxd-driver" TI_VXE_VXD_DRIVER:bsp-ti-6_6 = "" TI_VXE_VXD_DRIVER:bsp-ti-6_1 = "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw ${TI_VXE_VXD_DRIVER}" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw-j721e ${TI_VXE_VXD_DRIVER}" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index fd3990a6..33224ee3 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -21,4 +21,4 @@ TFA_BOARD = "j784s4" OPTEEMACHINE = "k3-j784s4" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw-j784s4" 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 8037ac6c..04e43609 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 @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9d COMPATIBLE_MACHINE = "j721e|j7200|j784s4" -PACKAGE_ARCH = "${MACHINE_ARCH}" - inherit update-alternatives require recipes-bsp/ti-linux-fw/ti-linux-fw.inc @@ -17,50 +15,60 @@ PR = "${INC_PR}.0" # Secure Build inherit ti-secdev -PLAT_SFX = "" -PLAT_SFX:j721e = "j721e" -PLAT_SFX:j7200 = "j7200" -PLAT_SFX:j784s4 = "j784s4" - -ETH_FW_DIR = "ti-eth/${PLAT_SFX}" - -INSTALL_ETH_FW_DIR = "${nonarch_base_libdir}/firmware/${ETH_FW_DIR}" +PACKAGES += " \ + ${PN}-j721e \ + ${PN}-j7200 \ + ${PN}-j784s4 \ +" +# Disable arch checking as firmware is likely to be a different arch from the Yocto build +INSANE_SKIP:${PN}-j721e += "arch" +INSANE_SKIP:${PN}-j7200 += "arch" +INSANE_SKIP:${PN}-j784s4 += "arch" + +RDEPENDS:${PN} += " \ + ${PN}-j721e \ + ${PN}-j7200 \ + ${PN}-j784s4 \ +" + +PLATS = "\ + j721e \ + j7200 \ + j784s4 \ +" ETH_FW = "app_remoteswitchcfg_server_strip.xer5f" -ETH_FW_LIST = "" -ETH_FW_LIST:j721e = "${ETH_FW}" -ETH_FW_LIST:j7200 = "${ETH_FW}" -ETH_FW_LIST:j784s4 = "${ETH_FW}" - do_install() { - # ETH firmware - for FW_NAME in ${ETH_FW_LIST} + for PLAT in ${PLATS} do - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${ETH_FW_DIR}/${FW_NAME} ${S}/${ETH_FW_DIR}/${FW_NAME}.signed - done + # Sign ETH firmware + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/ti-eth/${PLAT}/${ETH_FW} ${S}/ti-eth/${PLAT}/${ETH_FW}.signed - # ETH firmware - install -d ${D}${INSTALL_ETH_FW_DIR} - for FW_NAME in ${ETH_FW_LIST} - do - install -m 0644 ${S}/${ETH_FW_DIR}/${FW_NAME} ${D}${INSTALL_ETH_FW_DIR} - install -m 0644 ${S}/${ETH_FW_DIR}/${FW_NAME}.signed ${D}${INSTALL_ETH_FW_DIR} + # Install ETH firmware + install -d ${D}${nonarch_base_libdir}/firmware/ti-eth/${PLAT} + install -m 0644 ${S}/ti-eth/${PLAT}/${ETH_FW} ${D}${nonarch_base_libdir}/firmware/ti-eth/${PLAT} + install -m 0644 ${S}/ti-eth/${PLAT}/${ETH_FW}.signed ${D}${nonarch_base_libdir}/firmware/ti-eth/${PLAT} done } +FILES:${PN} = "" +FILES:${PN}-j721e = "${nonarch_base_libdir}/firmware/ti-eth/j721e" +FILES:${PN}-j7200 = "${nonarch_base_libdir}/firmware/ti-eth/j7200" +FILES:${PN}-j784s4 = "${nonarch_base_libdir}/firmware/ti-eth/j784s4" + # Set up names for the firmwares -ALTERNATIVE:${PN}:j721e = "\ +ALTERNATIVE:${PN}-j721e = "\ j7-main-r5f0_0-fw \ j7-main-r5f0_0-fw-sec \ " -ALTERNATIVE:${PN}:j7200 = "\ +ALTERNATIVE:${PN}-j7200 = "\ j7200-main-r5f0_0-fw \ j7200-main-r5f0_0-fw-sec \ " -ALTERNATIVE:${PN}:j784s4 = "\ +ALTERNATIVE:${PN}-j784s4 = "\ j784s4-main-r5f0_0-fw \ j784s4-main-r5f0_0-fw-sec \ " @@ -76,13 +84,13 @@ ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmw ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f0_0-fw-sec" # Create the firmware alternatives -ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" -ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/ti-eth/j721e/${ETH_FW}" +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/ti-eth/j721e/${ETH_FW}.signed" -ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" -ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" +ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/ti-eth/j7200/${ETH_FW}" +ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/ti-eth/j7200/${ETH_FW}.signed" -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_TARGET[j784s4-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/ti-eth/j784s4/${ETH_FW}" +ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/ti-eth/j784s4/${ETH_FW}.signed" ALTERNATIVE_PRIORITY = "5"