From patchwork Fri Aug 5 02:49:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 10981 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 7BDC8C25B0C for ; Fri, 5 Aug 2022 02:49:46 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web08.2720.1659667779297815791 for ; Thu, 04 Aug 2022 19:49:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=cW+UoqFy; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: afd@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 2752nZfm042235; Thu, 4 Aug 2022 21:49:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1659667775; bh=UFl49sCEObSx124kzpBp88BwN8raT3RoEFNlX34LyTI=; h=From:To:CC:Subject:Date; b=cW+UoqFyr4OOihF3MOPixDB+YUcM2zL19ha9326bNwxS0CLqrVVgzNCV1PrzgT6PM 1OODabv0TR6LTuAl3MI4i7EftSmYfZeaWQkrJWM3BCl34L9IDhn2gqr5TNaiSyo5zv n16j0gpCGMiZBBVXsaAM5BzgKd2PW4X3usCc2w6w= Received: from DLEE101.ent.ti.com (dlee101.ent.ti.com [157.170.170.31]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 2752nZr5073784 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Aug 2022 21:49:35 -0500 Received: from DLEE110.ent.ti.com (157.170.170.21) by DLEE101.ent.ti.com (157.170.170.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Thu, 4 Aug 2022 21:49:34 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Thu, 4 Aug 2022 21:49:34 -0500 Received: from ula0226330.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 2752nYEN111537; Thu, 4 Aug 2022 21:49:34 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][dunfell][PATCH 1/8] u-boot-ti: Do not prepend output files with DEPLOYDIR Date: Thu, 4 Aug 2022 21:49:27 -0500 Message-ID: <20220805024934.23349-1-afd@ti.com> X-Mailer: git-send-email 2.36.1 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 ; Fri, 05 Aug 2022 02:49:46 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14932 We already cd into DEPLOYDIR so this is not needed. This now matches the keystone version below. Also fixes build in some odd situations. Signed-off-by: Andrew Davis --- recipes-bsp/u-boot/u-boot-ti.inc | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc index 1f8fb6de..acc06fea 100644 --- a/recipes-bsp/u-boot/u-boot-ti.inc +++ b/recipes-bsp/u-boot/u-boot-ti.inc @@ -187,15 +187,15 @@ do_deploy_append () { then cd ${DEPLOYDIR} if [ "x${SPL_UART_BINARY}" != "x" ]; then - install ${B}/${config}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}-${type} - rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK} - ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY}-${type} - ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY} - ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK}-${type} - ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK} + install ${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type} + rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK} + ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type} + ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY} + ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type} + ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK} fi if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then - install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}-${type} + install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type} rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type} ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK} @@ -203,7 +203,7 @@ do_deploy_append () { ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY} fi if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then - install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}-${type} + install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type} rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type} ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK} @@ -211,7 +211,7 @@ do_deploy_append () { ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY} fi if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then - install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE}-${type} + install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type} rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type} ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK} @@ -219,7 +219,7 @@ do_deploy_append () { ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY} fi if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then - install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE}-${type} + install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type} rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type} ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK} @@ -234,31 +234,31 @@ do_deploy_append () { else cd ${DEPLOYDIR} if [ "x${SPL_UART_BINARY}" != "x" ]; then - install ${B}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE} - rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK} - ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY} - ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK} + install ${B}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE} + rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK} + ln -sf ${SPL_UART_IMAGE} ${SPL_UART_BINARY} + ln -sf ${SPL_UART_IMAGE} ${SPL_UART_SYMLINK} fi if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then - install ${B}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE} + install ${B}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE} rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK} ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY} fi if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then - install ${B}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE} + install ${B}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE} rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK} ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY} fi if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then - install ${B}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE} + install ${B}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE} rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK} ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY} fi if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then - install ${B}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE} + install ${B}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE} rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK} ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY} From patchwork Fri Aug 5 02:49:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 10978 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 673EAC3F6B0 for ; Fri, 5 Aug 2022 02:49:46 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web10.2797.1659667777032165576 for ; Thu, 04 Aug 2022 19:49:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=Tct3TO3f; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: afd@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 2752nZog090721; Thu, 4 Aug 2022 21:49:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1659667775; bh=BCySKzb4zt6TupdfN2huC5TSooAdWdgmCys1ZUj3W0c=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Tct3TO3f6P238Cl6kujqTPllt13d3ufqDdvY6tCKCzRorhmJMZTMzu1hbaGCj2lwW WBmNk3r7FpxD08o2iFVTZfa/JO5St7FZ1ImOGkv/LQkb6dxSU9w4vJHtkHEzj0USzc 6nYq4Zz3zHMd+QQEZOO65dCbpibggD74Eslscagk= Received: from DLEE103.ent.ti.com (dlee103.ent.ti.com [157.170.170.33]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 2752nZrO025972 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Aug 2022 21:49:35 -0500 Received: from DLEE100.ent.ti.com (157.170.170.30) 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.2308.14; Thu, 4 Aug 2022 21:49:35 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) 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.2308.14 via Frontend Transport; Thu, 4 Aug 2022 21:49:35 -0500 Received: from ula0226330.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 2752nYEO111537; Thu, 4 Aug 2022 21:49:35 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][dunfell][PATCH 2/8] optee-os: Allow build to continue without TI_SECURE_DEV_PKG set Date: Thu, 4 Aug 2022 21:49:28 -0500 Message-ID: <20220805024934.23349-2-afd@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220805024934.23349-1-afd@ti.com> References: <20220805024934.23349-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 ; Fri, 05 Aug 2022 02:49:46 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14927 Signed-off-by: Andrew Davis --- recipes-security/optee/optee-os_%.bbappend | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend index 7fe5f26e..5a25bd99 100644 --- a/recipes-security/optee/optee-os_%.bbappend +++ b/recipes-security/optee/optee-os_%.bbappend @@ -43,7 +43,12 @@ optee_sign_legacyhs() { # Signing procedure for K3 HS devices optee_sign_k3hs() { ( cd out/arm-plat-${OPTEEOUTPUTMACHINE}/core/; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee-pager_v2.bin tee-pager.bin.signed; \ + if [ -f ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ]; then \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee-pager_v2.bin tee-pager.bin.signed; \ + else \ + echo "Warning: TI_SECURE_DEV_PKG not set, OP-TEE not signed."; \ + cp tee-pager_v2.bin tee-pager.bin.signed; \ + fi; \ mv tee-pager.bin.signed ${B}/bl32.bin; \ cp tee.elf ${B}/bl32.elf; \ ) From patchwork Fri Aug 5 02:49:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 10985 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 8C059C25B0E for ; Fri, 5 Aug 2022 02:49:46 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web11.2828.1659667776960074181 for ; Thu, 04 Aug 2022 19:49:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=kbsZp3St; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: afd@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 2752naFJ090725; Thu, 4 Aug 2022 21:49:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1659667776; bh=oG+7dh5gmbfZr4MUpLa8EMxNopp5xoalVHby/wqhSMI=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=kbsZp3StlQtjZFOT02C2UZ1bBLWSudj8TskmKHWJZpJAv0waTWXJKX/uCtQW+iQqU XaEKMVIyH6fFhmGLQG5o3/Ao80i7BosuNE3hwF87VIKdArQOm6GQ+ebLmU2tQ6HKqy u/hr3Q1KospeTD3kUm+istQbQguyjm9G59LggiWM= Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 2752nZq5025981 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Aug 2022 21:49:35 -0500 Received: from DFLE110.ent.ti.com (10.64.6.31) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Thu, 4 Aug 2022 21:49:35 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Thu, 4 Aug 2022 21:49:35 -0500 Received: from ula0226330.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 2752nYEP111537; Thu, 4 Aug 2022 21:49:35 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][dunfell][PATCH 3/8] trusted-firmware-a: Allow build to continue without TI_SECURE_DEV_PKG set Date: Thu, 4 Aug 2022 21:49:29 -0500 Message-ID: <20220805024934.23349-3-afd@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220805024934.23349-1-afd@ti.com> References: <20220805024934.23349-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 ; Fri, 05 Aug 2022 02:49:46 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14928 Signed-off-by: Andrew Davis --- .../trusted-firmware-a_%.bbappend | 38 ++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 9645137e..965c99d4 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -9,42 +9,36 @@ TFA_SPD_k3 = "opteed" EXTRA_OEMAKE_append_k3 = "${@ 'K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}" EXTRA_OEMAKE_append_k3 = "${@ 'K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}" -do_compile_append_am65xx-hs-evm() { +# Signing procedure for K3 HS devices +tfa_sign_k3hs() { export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} ( cd ${B}/${BUILD_DIR}/release/; \ mv bl31.bin bl31.bin.unsigned; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \ + if [ -f ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ]; then \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \ + else \ + echo "Warning: TI_SECURE_DEV_PKG not set, TF-A not signed."; \ + cp bl31.bin.unsigned bl31.bin; \ + fi; \ ) } +do_compile_append_am65xx-hs-evm() { + tfa_sign_k3hs +} + do_compile_append_am64xx-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} - ( cd ${B}/${BUILD_DIR}/release/; \ - mv bl31.bin bl31.bin.unsigned; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \ - ) + tfa_sign_k3hs } do_compile_append_j7-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} - ( cd ${B}/${BUILD_DIR}/release/; \ - mv bl31.bin bl31.bin.unsigned; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \ - ) + tfa_sign_k3hs } do_compile_append_j7200-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} - ( cd ${B}/${BUILD_DIR}/release/; \ - mv bl31.bin bl31.bin.unsigned; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \ - ) + tfa_sign_k3hs } do_compile_append_j721s2-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} - ( cd ${B}/${BUILD_DIR}/release/; \ - mv bl31.bin bl31.bin.unsigned; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \ - ) + tfa_sign_k3hs } From patchwork Fri Aug 5 02:49:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 10982 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 89843C25B0D for ; Fri, 5 Aug 2022 02:49:46 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web11.2829.1659667777299957892 for ; Thu, 04 Aug 2022 19:49:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=Kqpgtmhh; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: afd@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 2752nabn017574; Thu, 4 Aug 2022 21:49:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1659667776; bh=czVNxQdvUYwOCs/EoZ1mIMbVVpAtUb3aKkSes74MWG0=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=KqpgtmhhSqQcL6MxBodreKAH/cA6/kliKVkPYHcoJEpRZwjp14QZhgbM1x7tCFP2J dcu9qXLYq3IU5bmnhYRWJbwgh0vv4kQ0fpBIK5kW/79AjZpYluuCnCXoSaEOrn8suU prBGcWn+YnMb2PtD86pLYc8eHRQQx6UdMRbJshkE= Received: from DFLE108.ent.ti.com (dfle108.ent.ti.com [10.64.6.29]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 2752naNx123441 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Aug 2022 21:49:36 -0500 Received: from DFLE108.ent.ti.com (10.64.6.29) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Thu, 4 Aug 2022 21:49:36 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Thu, 4 Aug 2022 21:49:36 -0500 Received: from ula0226330.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 2752nYEQ111537; Thu, 4 Aug 2022 21:49:35 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][dunfell][PATCH 4/8] prueth-fw: Deploy for AM64xx based on SoC not EVM Date: Thu, 4 Aug 2022 21:49:30 -0500 Message-ID: <20220805024934.23349-4-afd@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220805024934.23349-1-afd@ti.com> References: <20220805024934.23349-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 ; Fri, 05 Aug 2022 02:49:46 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14929 This makes sense but looks like was done wrong to match AM65xx which needed the exact EVM specified due to this only working on SR2. Signed-off-by: Andrew Davis --- recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb | 2 +- recipes-kernel/linux/kernel-rdepends.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb b/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb index cf65e09a..e5446423 100644 --- a/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb +++ b/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb @@ -7,7 +7,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "am65xx-evm|am64xx-evm" +COMPATIBLE_MACHINE = "am65xx-evm|am64xx" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-kernel/linux/kernel-rdepends.inc b/recipes-kernel/linux/kernel-rdepends.inc index 2ac6eac4..143e6545 100644 --- a/recipes-kernel/linux/kernel-rdepends.inc +++ b/recipes-kernel/linux/kernel-rdepends.inc @@ -35,7 +35,7 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti43x = " prueth-fw pruhsr-fw pruprp RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti33x = " prueth-fw pruhsr-fw pruprp-fw" RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx = " prueth-fw-am65x" RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx-evm = " prueth-fw-am65x-sr2 prusw-fw-am65x-sr2" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am64xx-evm = " prueth-fw-am65x-sr2" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am64xx = " prueth-fw-am65x-sr2" # Add run-time dependency for Cadence MHDP firmware to the rootfs RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7-evm = " cadence-mhdp-fw" From patchwork Fri Aug 5 02:49:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 10983 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 7F768C25B06 for ; Fri, 5 Aug 2022 02:49:46 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web12.2770.1659667778992074592 for ; Thu, 04 Aug 2022 19:49:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=vwMVeSUF; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: afd@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 2752naVm035238; Thu, 4 Aug 2022 21:49:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1659667776; bh=dN+eQsLvtbytWP/Qk138UYyeL8gI3itn2T6zegQ2doI=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=vwMVeSUFhcVjzOWiWnsz5xVrOuvMvImW6s9OYQbIYeLQdN3sC/gS4tDBLNHxUe/BF PQlxwrr8oRBEpDkFLXzRPvcnhjLDfRa4rWx5u1VGc7pLXgro+W5QEefenvIBepZrfc y+H7Amr0+oATusZCnhhFgYfTtxXXn9UfyANSF/4U= Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 2752na53041009 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Aug 2022 21:49:36 -0500 Received: from DFLE102.ent.ti.com (10.64.6.23) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Thu, 4 Aug 2022 21:49:36 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Thu, 4 Aug 2022 21:49:36 -0500 Received: from ula0226330.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 2752nYER111537; Thu, 4 Aug 2022 21:49:36 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][dunfell][PATCH 5/8] machine: k3r5: Make combined R5 boot the default Date: Thu, 4 Aug 2022 21:49:31 -0500 Message-ID: <20220805024934.23349-5-afd@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220805024934.23349-1-afd@ti.com> References: <20220805024934.23349-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 ; Fri, 05 Aug 2022 02:49:46 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14931 Going forward, the combined tiboot3.bin is going to be the standard. Only AM65x and J721e will still use the split boot. Set the output of U-Boot to be u-boot-spl.bin by default and override only for the two split boot platforms. This makes it easier to add new platforms and simplifies deployment logic. Signed-off-by: Andrew Davis --- conf/machine/am65xx-evm-k3r5.conf | 6 ++++ conf/machine/am65xx-hs-evm-k3r5.conf | 6 ++++ conf/machine/include/k3r5.inc | 6 ++-- conf/machine/j7-evm-k3r5.conf | 6 ++++ conf/machine/j7-hs-evm-k3r5.conf | 6 ++++ recipes-bsp/u-boot/u-boot-ti.inc | 51 ++++------------------------ 6 files changed, 33 insertions(+), 48 deletions(-) diff --git a/conf/machine/am65xx-evm-k3r5.conf b/conf/machine/am65xx-evm-k3r5.conf index bd17474e..a484e444 100644 --- a/conf/machine/am65xx-evm-k3r5.conf +++ b/conf/machine/am65xx-evm-k3r5.conf @@ -9,4 +9,10 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" SYSFW_SYMLINK = "" +SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" +SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" + UBOOT_MACHINE = "am65x_evm_r5_defconfig" diff --git a/conf/machine/am65xx-hs-evm-k3r5.conf b/conf/machine/am65xx-hs-evm-k3r5.conf index d6d4b1e3..81b8c75f 100644 --- a/conf/machine/am65xx-hs-evm-k3r5.conf +++ b/conf/machine/am65xx-hs-evm-k3r5.conf @@ -9,6 +9,12 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" SYSFW_SYMLINK = "" +SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" +SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" + UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/include/k3r5.inc b/conf/machine/include/k3r5.inc index a32accae..035ad812 100644 --- a/conf/machine/include/k3r5.inc +++ b/conf/machine/include/k3r5.inc @@ -16,9 +16,9 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" SPL_BINARY = "" UBOOT_SUFFIX = "bin" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" PACKAGECONFIG_pn-u-boot-ti-staging = "" PACKAGECONFIG_pn-u-boot-ti-mainline = "" diff --git a/conf/machine/j7-evm-k3r5.conf b/conf/machine/j7-evm-k3r5.conf index b9e8cc01..862b017c 100644 --- a/conf/machine/j7-evm-k3r5.conf +++ b/conf/machine/j7-evm-k3r5.conf @@ -8,4 +8,10 @@ SYSFW_SOC = "j721e" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" +SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" +SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" + UBOOT_MACHINE = "j721e_evm_r5_defconfig" diff --git a/conf/machine/j7-hs-evm-k3r5.conf b/conf/machine/j7-hs-evm-k3r5.conf index 92d37dee..c0ddfcec 100644 --- a/conf/machine/j7-hs-evm-k3r5.conf +++ b/conf/machine/j7-hs-evm-k3r5.conf @@ -9,6 +9,12 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" SYSFW_SYMLINK = "" +SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" +SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" + UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc index acc06fea..e7020613 100644 --- a/recipes-bsp/u-boot/u-boot-ti.inc +++ b/recipes-bsp/u-boot/u-boot-ti.inc @@ -57,13 +57,6 @@ SPL_UART_BINARY = "u-boot-spl.bin" SPL_UART_BINARY_keystone = "" SPL_UART_BINARY_k3r5 = "" SPL_UART_BINARY_lego-ev3 = "" -SPL_UART_BINARY_j7200-evm-k3r5 = "u-boot-spl.bin" -SPL_UART_BINARY_j7200-hs-evm-k3r5 = "u-boot-spl.bin" -SPL_UART_BINARY_j721s2-evm-k3r5 = "u-boot-spl.bin" -SPL_UART_BINARY_j721s2-hs-evm-k3r5 = "u-boot-spl.bin" -SPL_UART_BINARY_am64xx-evm-k3r5 = "u-boot-spl.bin" -SPL_UART_BINARY_am64xx-hs-evm-k3r5 = "u-boot-spl.bin" -SPL_UART_BINARY_am62xx-evm-k3r5 = "u-boot-spl.bin" SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" @@ -113,6 +106,12 @@ UBOOT_HS_2ND_BINARY = "u-boot-spl_HS_2ND" UBOOT_HS_2ND_IMAGE = "u-boot-spl_HS_2ND-${MACHINE}-${PV}-${PR}" UBOOT_HS_2ND_SYMLINK = "u-boot-spl_HS_2ND-${MACHINE}" +do_compile_append_k3r5 () { + if ! [ -f ${B}/${UBOOT_BINARY} ]; then + ln -s spl/${UBOOT_BINARY} ${B}/${UBOOT_BINARY} + fi +} + do_install_append () { if [ -n "${UBOOT_CONFIG}" ] then @@ -386,42 +385,4 @@ do_deploy_append_keystone () { fi } -# j7200 uses combined image for tiboot3.bin that includes u-boot-spl.bin and sysfw -# along with board PM/RM configs generated by k3-image-gen and comes from ti-sci-fw -# hence move the legacy u-boot's tiboot3.bin and u-boot-spl.bin out of the way -do_deploy_append_j7200-evm-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true -} - -do_deploy_append_j7200-hs-evm-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true -} - -do_deploy_append_j721s2-evm-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true -} - -do_deploy_append_j721s2-hs-evm-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true -} - -do_deploy_append_am64xx-evm-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true -} - -do_deploy_append_am64xx-hs-evm-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true -} - -do_deploy_append_am62xx-evm-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true -} - TOOLCHAIN = "gcc" From patchwork Fri Aug 5 02:49:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 10984 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 898B3C25B0F for ; Fri, 5 Aug 2022 02:49:46 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web08.2719.1659667778108684638 for ; Thu, 04 Aug 2022 19:49:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=UqaSpebL; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: afd@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 2752nb0V090734; Thu, 4 Aug 2022 21:49:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1659667777; bh=wIz013/vMQXJdoThWuZs4/oD6Hke5EUdOLTbuCqN7ag=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=UqaSpebLurY+YH29DwNSFUqPhEbLOPuYbLjPi6sOXdwJdYLbXiSs6cH8DmQoupTys br+Oh6Val1b3UTNe+zEw2LPqWUXm5/NfQoIuNDf6PE3sgJXl8GDxlfXepnMH26YJUd gVnTuXN0/APxMLSVxVCx/cN8BKCk8Dzd3Ue1kRyI= Received: from DFLE101.ent.ti.com (dfle101.ent.ti.com [10.64.6.22]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 2752nbvd123460 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Aug 2022 21:49:37 -0500 Received: from DFLE107.ent.ti.com (10.64.6.28) by DFLE101.ent.ti.com (10.64.6.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Thu, 4 Aug 2022 21:49:36 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE107.ent.ti.com (10.64.6.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Thu, 4 Aug 2022 21:49:36 -0500 Received: from ula0226330.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 2752nYES111537; Thu, 4 Aug 2022 21:49:36 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][dunfell][PATCH 6/8] ti-sci-fw: Make combined R5 boot the default Date: Thu, 4 Aug 2022 21:49:32 -0500 Message-ID: <20220805024934.23349-6-afd@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220805024934.23349-1-afd@ti.com> References: <20220805024934.23349-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 ; Fri, 05 Aug 2022 02:49:46 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14930 Going forward, the combined tiboot3.bin is going to be the standard. Only AM65x and J721e will still use the split boot. Set DEPENDS and EXTRA_OEMAKE for combined boot and override only for the two split boot platforms. This makes it easier to add new platforms and simplifies deployment logic. Signed-off-by: Andrew Davis --- conf/machine/j7-hs-evm.conf | 1 + recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 30 ++++++++++++-------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf index 5cb2a3cd..ff998dc7 100644 --- a/conf/machine/j7-hs-evm.conf +++ b/conf/machine/j7-hs-evm.conf @@ -17,6 +17,7 @@ UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" +SYSFW_SYMLINK = "" BBMULTICONFIG += "k3r5-sr1-1" diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 1b2ea184..b06f6abe 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -1,13 +1,12 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc -DEPENDS = "openssl-native u-boot-mkimage-native dtc-native" -DEPENDS_append_j7200-evm-k3r5 = " virtual/bootloader" -DEPENDS_append_j7200-hs-evm-k3r5 = " virtual/bootloader" -DEPENDS_append_j721s2-evm-k3r5 = " virtual/bootloader" -DEPENDS_append_j721s2-hs-evm-k3r5 = " virtual/bootloader" -DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader" -DEPENDS_append_am64xx-hs-evm-k3r5 = " virtual/bootloader" -DEPENDS_append_am62xx-evm-k3r5 = " virtual/bootloader" +DEPENDS = "openssl-native u-boot-mkimage-native dtc-native virtual/bootloader" +DEPENDS_remove_am65xx-evm-k3r5 = " virtual/bootloader" +DEPENDS_remove_am65xx-hs-evm-k3r5 = " virtual/bootloader" +DEPENDS_remove_am65xx-hs-evm-k3r5-sr2 = " virtual/bootloader" +DEPENDS_remove_j7-evm-k3r5 = " virtual/bootloader" +DEPENDS_remove_j7-hs-evm-k3r5 = " virtual/bootloader" +DEPENDS_remove_j7-hs-evm-k3r5-sr1-1 = " virtual/bootloader" CLEANBROKEN = "1" PR = "${INC_PR}.2" @@ -54,15 +53,14 @@ do_configure[noexec] = "1" EXTRA_OEMAKE = "\ CROSS_COMPILE=${TARGET_PREFIX} SOC=${SYSFW_SOC} SOC_TYPE=${SYSFW_SUFFIX} \ CONFIG=${SYSFW_CONFIG} SYSFW_DIR="${S}/ti-sysfw" \ + SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin" \ " - -EXTRA_OEMAKE_append_j7200-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE_append_j7200-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE_append_j721s2-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE_append_j721s2-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE_append_am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE_append_am64xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE_append_am62xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_remove_am65xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_remove_am65xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_remove_am65xx-hs-evm-k3r5-sr2 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_remove_j7-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_remove_j7-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_remove_j7-hs-evm-k3r5-sr1-1 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" do_compile() { cd ${WORKDIR}/imggen/ From patchwork Fri Aug 5 02:49:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 10980 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 7BD80C25B08 for ; Fri, 5 Aug 2022 02:49:46 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web09.2755.1659667779502999597 for ; Thu, 04 Aug 2022 19:49:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=tmUA6YA4; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: afd@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 2752nbZq035242; Thu, 4 Aug 2022 21:49:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1659667777; bh=58lj4GWY6OpVBDts60z3jLuGbHdDd25Ebz3afpF3WCA=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=tmUA6YA4ieae9dQy+RAXw56OYPBsj8SCzAPlz0qS7N1Gx0DgPvQO1GxvhIK42PjVj OOvE38ihHNuVOVeieCzihqtckxdC9o8d440vgJhgftWB3leIW+iKFks06XBN9gSWIr QfNQXArsx6ORgmonATiXUTvur5IQMgCmkMtp/mNI= Received: from DFLE106.ent.ti.com (dfle106.ent.ti.com [10.64.6.27]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 2752nbAH025997 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Aug 2022 21:49:37 -0500 Received: from DFLE109.ent.ti.com (10.64.6.30) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Thu, 4 Aug 2022 21:49:37 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Thu, 4 Aug 2022 21:49:37 -0500 Received: from ula0226330.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 2752nYET111537; Thu, 4 Aug 2022 21:49:36 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][dunfell][PATCH 7/8] ti-sci-fw: Only install and deploy combined boot symlink when set Date: Thu, 4 Aug 2022 21:49:33 -0500 Message-ID: <20220805024934.23349-7-afd@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220805024934.23349-1-afd@ti.com> References: <20220805024934.23349-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 ; Fri, 05 Aug 2022 02:49:46 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14933 Add SYSFW_TIBOOT3_SYMLINK and use it the same way we use SYSFW_SYMLINK for the non-combined boot flow, to allow not setting the default for some machine types. Signed-off-by: Andrew Davis --- recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index b06f6abe..72a3120e 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -37,6 +37,7 @@ SYSFW_PREFIX_am62xx-evm-k3r5 = "fs" SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" SYSFW_TIBOOT3 = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.bin" +SYSFW_TIBOOT3_SYMLINK ?= "tiboot3.bin" SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" @@ -80,7 +81,9 @@ do_install() { if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${D}/boot/${SYSFW_TIBOOT3} - ln -sf ${SYSFW_TIBOOT3} ${D}/boot/tiboot3.bin + if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then + ln -sf ${SYSFW_TIBOOT3} ${D}/boot/${SYSFW_TIBOOT3_SYMLINK} + fi fi } @@ -101,7 +104,9 @@ do_deploy () { if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3} - ln -sf ${SYSFW_TIBOOT3} ${DEPLOYDIR}/tiboot3.bin + if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then + ln -sf ${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3_SYMLINK} + fi fi install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ From patchwork Fri Aug 5 02:49:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 10979 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 663E2C19F2D for ; Fri, 5 Aug 2022 02:49:46 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web11.2830.1659667779967214024 for ; Thu, 04 Aug 2022 19:49:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=GWtaQY8e; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: afd@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 2752nbSS035246; Thu, 4 Aug 2022 21:49:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1659667777; bh=8mpOFecEvi0hJmmHbE+OLrF4wwkCbFvYzxlDaecSja4=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=GWtaQY8egqdAHaakNp0SFoAHv3A2tM3oXvp75aPGOKGWCp03ickpR8eJ+TXg8kY8C ydggl4hKsKQq07MNjswiN0nMWAbhgxVBE88ckcN/63A3tfFX/gaJ77nA6q3az3MZJA QBvQnZwJ4/DSf5c9msfXEHq9M1we9Bm8MTHXd/Wc= Received: from DLEE100.ent.ti.com (dlee100.ent.ti.com [157.170.170.30]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 2752nbM9041021 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 4 Aug 2022 21:49:37 -0500 Received: from DLEE114.ent.ti.com (157.170.170.25) 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.2308.14; Thu, 4 Aug 2022 21:49:37 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Thu, 4 Aug 2022 21:49:37 -0500 Received: from ula0226330.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 2752nYEU111537; Thu, 4 Aug 2022 21:49:37 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , CC: Andrew Davis Subject: [meta-ti][dunfell][PATCH 8/8] conf: machine: Move K3 TI_SECURE_DEV_PKG definition to common include Date: Thu, 4 Aug 2022 21:49:34 -0500 Message-ID: <20220805024934.23349-8-afd@ti.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220805024934.23349-1-afd@ti.com> References: <20220805024934.23349-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 ; Fri, 05 Aug 2022 02:49:46 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14934 The K3 TI_SECURE_DEV_PKG is the same for all devices, move this out of each machine file and into the common K3 includes. This doesn't have any effect on the GP machines as they make no use of it. Signed-off-by: Andrew Davis --- conf/machine/am64xx-hs-evm-k3r5.conf | 2 -- conf/machine/am64xx-hs-evm.conf | 2 -- conf/machine/am65xx-hs-evm-k3r5.conf | 2 -- conf/machine/am65xx-hs-evm.conf | 2 -- conf/machine/include/k3.inc | 2 ++ conf/machine/include/k3r5.inc | 2 ++ conf/machine/j7-hs-evm-k3r5.conf | 2 -- conf/machine/j7-hs-evm.conf | 2 -- conf/machine/j7200-hs-evm-k3r5.conf | 2 -- conf/machine/j7200-hs-evm.conf | 2 -- conf/machine/j721s2-hs-evm-k3r5.conf | 2 -- conf/machine/j721s2-hs-evm.conf | 2 -- 12 files changed, 4 insertions(+), 20 deletions(-) diff --git a/conf/machine/am64xx-hs-evm-k3r5.conf b/conf/machine/am64xx-hs-evm-k3r5.conf index d12c030f..647c8beb 100644 --- a/conf/machine/am64xx-hs-evm-k3r5.conf +++ b/conf/machine/am64xx-hs-evm-k3r5.conf @@ -10,5 +10,3 @@ SYSFW_SUFFIX = "hs" SYSFW_SYMLINK = "" UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf index ebbe2e62..3ab9a49e 100644 --- a/conf/machine/am64xx-hs-evm.conf +++ b/conf/machine/am64xx-hs-evm.conf @@ -17,5 +17,3 @@ UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/am65xx-hs-evm-k3r5.conf b/conf/machine/am65xx-hs-evm-k3r5.conf index 81b8c75f..d9041c9d 100644 --- a/conf/machine/am65xx-hs-evm-k3r5.conf +++ b/conf/machine/am65xx-hs-evm-k3r5.conf @@ -16,5 +16,3 @@ UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf index de92cacb..ea1f8ff1 100644 --- a/conf/machine/am65xx-hs-evm.conf +++ b/conf/machine/am65xx-hs-evm.conf @@ -17,5 +17,3 @@ UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc index 24741dee..a5f96087 100644 --- a/conf/machine/include/k3.inc +++ b/conf/machine/include/k3.inc @@ -47,3 +47,5 @@ WKS_FILE ?= "sdimage-2part.wks" do_image_wic[depends] += "virtual/bootloader:do_deploy" do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy" + +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/include/k3r5.inc b/conf/machine/include/k3r5.inc index 035ad812..c29d6c95 100644 --- a/conf/machine/include/k3r5.inc +++ b/conf/machine/include/k3r5.inc @@ -22,3 +22,5 @@ UBOOT_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" PACKAGECONFIG_pn-u-boot-ti-staging = "" PACKAGECONFIG_pn-u-boot-ti-mainline = "" + +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j7-hs-evm-k3r5.conf b/conf/machine/j7-hs-evm-k3r5.conf index c0ddfcec..e4b233db 100644 --- a/conf/machine/j7-hs-evm-k3r5.conf +++ b/conf/machine/j7-hs-evm-k3r5.conf @@ -16,5 +16,3 @@ UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf index ff998dc7..bbfe6fcb 100644 --- a/conf/machine/j7-hs-evm.conf +++ b/conf/machine/j7-hs-evm.conf @@ -25,5 +25,3 @@ BBMULTICONFIG += "k3r5-sr1-1" IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb" do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy" do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j7200-hs-evm-k3r5.conf b/conf/machine/j7200-hs-evm-k3r5.conf index 3f134877..3fe06e74 100644 --- a/conf/machine/j7200-hs-evm-k3r5.conf +++ b/conf/machine/j7200-hs-evm-k3r5.conf @@ -9,5 +9,3 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" UBOOT_MACHINE = "j7200_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf index 8821ffac..ef7268b1 100644 --- a/conf/machine/j7200-hs-evm.conf +++ b/conf/machine/j7200-hs-evm.conf @@ -17,5 +17,3 @@ UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j721s2-hs-evm-k3r5.conf b/conf/machine/j721s2-hs-evm-k3r5.conf index ac4df86e..a4d51904 100644 --- a/conf/machine/j721s2-hs-evm-k3r5.conf +++ b/conf/machine/j721s2-hs-evm-k3r5.conf @@ -9,5 +9,3 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" UBOOT_MACHINE = "j721s2_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j721s2-hs-evm.conf b/conf/machine/j721s2-hs-evm.conf index 7ffad45a..84db90bb 100644 --- a/conf/machine/j721s2-hs-evm.conf +++ b/conf/machine/j721s2-hs-evm.conf @@ -17,5 +17,3 @@ UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"