From patchwork Wed Feb 15 19:33:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 19602 X-Patchwork-Delegate: reatmon@ti.com 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 6D5F1C6FA99 for ; Wed, 15 Feb 2023 19:34:02 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web10.2564.1676489639021902768 for ; Wed, 15 Feb 2023 11:33:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=IyzZGPUo; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: afd@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 31FJXvtO094841; Wed, 15 Feb 2023 13:33:57 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1676489637; bh=WcuYwGEXmga70SETZLgnAhqce5o9zSisWPRSyElJ6Rc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=IyzZGPUoR71eC/VKIOWgd4i6WqdC3vIfVk4JMBSQtmvxAHnV8V4lipr4GgUunakfc uHR4YW25fdNOBWhzr0oVsu/fVGPmSfmlKYPZXLr9bBicmmFheC17Ss0ckgRlmZLpVy rcczNPXxgI6/0x0Em6PACeIj3YfxEFwqhoR18EVQ= Received: from DLEE107.ent.ti.com (dlee107.ent.ti.com [157.170.170.37]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 31FJXviL010988 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 15 Feb 2023 13:33:57 -0600 Received: from DLEE113.ent.ti.com (157.170.170.24) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Wed, 15 Feb 2023 13:33:57 -0600 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Wed, 15 Feb 2023 13:33:57 -0600 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 31FJXt6i014221; Wed, 15 Feb 2023 13:33:57 -0600 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][PATCH v2 05/15] ti-rtos-firmware: Use new ti-secdev class to sign the images Date: Wed, 15 Feb 2023 13:33:45 -0600 Message-ID: <20230215193355.9676-6-afd@ti.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230215193355.9676-1-afd@ti.com> References: <20230215193355.9676-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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 ; Wed, 15 Feb 2023 19:34:02 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15862 Use ti-k3-secdev native package to provide secure-binary-image.sh script when it is not passed on as an environment variable. This fixes an issue with AM64xx which is always HS but should not require TI_SECURE_DEV_PKG when building for HS-FS or GP platforms. Signed-off-by: Andrew Davis Tested-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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 9a6da088..fddb5e2e 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 @@ -31,9 +31,7 @@ CLEANBROKEN = "1" PR = "${INC_PR}.0" # Secure Build -DEPENDS += "openssl-native" - -TI_SECURE_DEV_PKG ?= "" +inherit ti-secdev RTOS_ETH_FW_DIR = "${S}/ti-eth/${PLAT_SFX}" RTOS_DM_FW_DIR = "${S}/ti-dm/${PLAT_SFX}" @@ -49,7 +47,6 @@ DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" # J721e HS support do_install:prepend:j721e-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} ( cd ${RTOS_DM_FW_DIR}; \ mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ @@ -80,7 +77,6 @@ do_install:prepend:j721e-hs-evm() { # J7200 HS support do_install:prepend:j7200-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} ( cd ${RTOS_DM_FW_DIR}; \ mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ @@ -101,7 +97,6 @@ do_install:prepend:j7200-hs-evm() { # J721s2 HS support do_install:prepend:j721s2-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} ( cd ${RTOS_DM_FW_DIR}; \ mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \