From patchwork Fri Nov 4 22:46:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14894 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 CE8D9C43219 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web12.843.1667602017161436788 for ; Fri, 04 Nov 2022 15:46:57 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id A7B8140D7F for ; Fri, 4 Nov 2022 22:46:55 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zS_wWfItMIaK for ; Fri, 4 Nov 2022 22:46:55 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 9491140D7C for ; Fri, 4 Nov 2022 22:46:55 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id D0B10163677 for ; Fri, 4 Nov 2022 18:46:50 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 01/50] machine: k3r5: Make combined R5 boot the default Date: Fri, 4 Nov 2022 22:46:03 +0000 Message-Id: <20221104224653.1223044-2-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:46:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15273 From: Andrew Davis 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 Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf | 6 +++ .../conf/machine/am65xx-hs-evm-k3r5.conf | 6 +++ meta-ti-bsp/conf/machine/include/k3r5.inc | 6 +-- meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf | 6 +++ .../conf/machine/j721e-hs-evm-k3r5.conf | 6 +++ meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 51 +++---------------- 6 files changed, 33 insertions(+), 48 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf index bd17474e..a484e444 100644 --- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf index d6d4b1e3..81b8c75f 100644 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc index 3cc79061..d000404e 100644 --- a/meta-ti-bsp/conf/machine/include/k3r5.inc +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf index 070bf7aa..9544cdb6 100644 --- a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-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/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf index 9c285bae..8e53a5cb 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-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/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index a82981cc..3696a483 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -56,13 +56,6 @@ SYSROOT_DIRS += "/boot" SPL_UART_BINARY = "u-boot-spl.bin" 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}" @@ -100,6 +93,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 @@ -260,42 +259,4 @@ do_deploy:append () { rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true } -# 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 Nov 4 22:46:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14895 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 DA5E2C4167D for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web09.932.1667602017074933160 for ; Fri, 04 Nov 2022 15:46:57 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 7E1C840D86 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hlUp_d_OdNeC for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 6AEB340D7C for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id DC9A716367B for ; Fri, 4 Nov 2022 18:46:50 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 02/50] ti-sci-fw: Use new SOC_TYPE and SYSFW_DIR to simplify recipe Date: Fri, 4 Nov 2022 22:46:04 +0000 Message-Id: <20221104224653.1223044-3-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:46:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15276 From: Andrew Davis The k3-image-gen now has two new helper flags SOC_TYPE and SYSFW_DIR that we can use to simplify this recipe. With these we do not need to do anything different here for HS builds, the SOC_TYPE selects this now. DL_URL also do not need cleared anymore, the k3-image-gen will no longer download missing files when not needed for the current build type. do_install and do_deploy can also check for the existence of either sysfw.itb or tiboot3.bin and install/deploy as needed. k3-image-gen only gerneates the right one now depending on the SoC. Merge all these steps for all SoCs. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 2 +- .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 147 ++++-------------- 2 files changed, 28 insertions(+), 121 deletions(-) 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 6f451439..be714b36 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 @@ -25,7 +25,7 @@ SRCREV = "${TI_LINUX_FW_SRCREV}" BRANCH ?= "ti-linux-firmware" -K3_IMAGE_GEN_SRCREV ?= "85a70059fc24242ea03653a5014b98100e4da2d6" +K3_IMAGE_GEN_SRCREV ?= "91a75b17c616a5cc41b3345905dccba5c29aca66" SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}" SRCREV_FORMAT = "imggen" diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 6a381447..64c71292 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -54,13 +54,9 @@ LD[unexport] = "1" do_configure[noexec] = "1" EXTRA_OEMAKE = "\ - CROSS_COMPILE=${TARGET_PREFIX} SYSFW_DL_URL='' SYSFW_HS_DL_URL='' SYSFW_HS_INNER_CERT_DL_URL='' \ - SYSFW_PATH="${SYSFW_TISCI}" SOC=${SYSFW_SOC} CONFIG=${SYSFW_CONFIG} \ + CROSS_COMPILE=${TARGET_PREFIX} SOC=${SYSFW_SOC} SOC_TYPE=${SYSFW_SUFFIX} \ + CONFIG=${SYSFW_CONFIG} SYSFW_DIR="${S}/ti-sysfw" \ " -EXTRA_OEMAKE_HS = " \ - HS=1 SW_REV=1 SYSFW_HS_PATH="${S}/ti-sysfw/${SYSFW_BASE}-enc.bin" SYSFW_HS_INNER_CERT_PATH="${S}/ti-sysfw/${SYSFW_BASE}-cert.bin" \ -" -EXTRA_OEMAKE:append = "${@['',' ${EXTRA_OEMAKE_HS}']['${SYSFW_SUFFIX}' == 'hs']}" 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"" @@ -77,10 +73,19 @@ do_compile() { do_install() { install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${D}/boot/${SYSFW_VBINARY} - ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_IMAGE} - if [ ! -z "${SYSFW_SYMLINK}" ]; then - ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_SYMLINK} + + if [ -f "${WORKDIR}/imggen/${SYSFW_BINARY}" ]; then + install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${D}/boot/${SYSFW_VBINARY} + ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_IMAGE} + if [ ! -z "${SYSFW_SYMLINK}" ]; then + ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_SYMLINK} + fi + fi + + if [ -f "${WORKDIR}/imggen/${UBOOT_BINARY}" ]; then + install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} fi } @@ -90,119 +95,21 @@ inherit deploy do_deploy () { install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${DEPLOYDIR}/${SYSFW_VBINARY} - rm -f ${DEPLOYDIR}/${SYSFW_IMAGE} - ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_IMAGE} - if [ ! -z "${SYSFW_SYMLINK}" ]; then - rm -f ${DEPLOYDIR}/${SYSFW_SYMLINK} - ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_SYMLINK} - fi - - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ -} - -do_install:j7200-evm-k3r5() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} -} - -do_deploy:j7200-evm-k3r5() { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ -} - -do_install:j7200-hs-evm-k3r5() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} -} - -do_deploy:j7200-hs-evm-k3r5() { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ -} - -do_install:j721s2-evm-k3r5() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} -} - -do_deploy:j721s2-evm-k3r5() { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ -} - -do_install:j721s2-hs-evm-k3r5() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} -} - -do_deploy:j721s2-hs-evm-k3r5() { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ -} -do_install:am64xx-evm-k3r5() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} -} - -do_deploy:am64xx-evm-k3r5() { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ -} - -do_install:am64xx-hs-evm-k3r5() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} -} - -do_deploy:am64xx-hs-evm-k3r5() { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ -} + if [ -f "${WORKDIR}/imggen/${SYSFW_BINARY}" ]; then + install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${DEPLOYDIR}/${SYSFW_VBINARY} + ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_IMAGE} + if [ ! -z "${SYSFW_SYMLINK}" ]; then + ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_SYMLINK} + fi + fi -do_install:am62xx-evm-k3r5() { - install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} -} + if [ -f "${WORKDIR}/imggen/${UBOOT_BINARY}" ]; then + install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} + ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} + fi -do_deploy:am62xx-evm-k3r5() { - install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ } From patchwork Fri Nov 4 22:46:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14893 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 DFB3AC4167E for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web08.826.1667602017114540106 for ; Fri, 04 Nov 2022 15:46:57 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 8848A40D85 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VQPTAHg3Zicb for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 7107C40D81 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id E87A316367C for ; Fri, 4 Nov 2022 18:46:50 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 03/50] ti-sci-fw: Deploy all SYSFW firmware types Date: Fri, 4 Nov 2022 22:46:05 +0000 Message-Id: <20221104224653.1223044-4-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:46:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15275 From: Andrew Davis This allows us to rebuild and re-sign the SYSFW image if needed from the deploy directory for any SoC type. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 64c71292..61afeaeb 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -22,24 +22,20 @@ TI_SECURE_DEV_PKG ?= "" export TI_SECURE_DEV_PKG SYSFW_SOC ?= "unknown" -SYSFW_CONFIG ?= "unknown" - -SYSFW_PREFIX = "ti-sci-firmware" -SYSFW_PREFIX:j721e-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j721e-hs-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "ti-fs-firmware" -SYSFW_PREFIX:j7200-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j7200-hs-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j721s2-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX:am62xx-evm-k3r5 = "ti-fs-firmware" - SYSFW_SUFFIX ?= "unknown" +SYSFW_CONFIG ?= "unknown" -SYSFW_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-${SYSFW_SUFFIX}" -SYSFW_BASE:append = "${@['','*']['${SYSFW_SUFFIX}' == 'hs']}" - -SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}.bin" +SYSFW_PREFIX = "sci" +SYSFW_PREFIX:j721e-evm-k3r5 = "fs" +SYSFW_PREFIX:j721e-hs-evm-k3r5 = "fs" +SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "fs" +SYSFW_PREFIX:j7200-evm-k3r5 = "fs" +SYSFW_PREFIX:j7200-hs-evm-k3r5 = "fs" +SYSFW_PREFIX:j721s2-evm-k3r5 = "fs" +SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "fs" +SYSFW_PREFIX:am62xx-evm-k3r5 = "fs" + +SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" From patchwork Fri Nov 4 22:46:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14900 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 C7377C4167D for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web08.833.1667602020678228730 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 1B5B640D7A for ; Fri, 4 Nov 2022 22:47:00 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lVKpJmM_6Z-c for ; Fri, 4 Nov 2022 22:47:00 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 84D7440D7C for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id EA5FF16367D for ; Fri, 4 Nov 2022 18:46:50 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 04/50] ti-sci-fw: Use SYSFW_TIBOOT3 to point to the SYSFW image Date: Fri, 4 Nov 2022 22:46:06 +0000 Message-Id: <20221104224653.1223044-5-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15318 From: Andrew Davis Currently we reuse UBOOT_* names which usually are the same we want to give to the name of the SYSFW binary. This isn't always correct, we should use a SYSFW specific variable in case the UBOOT names are changed. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 61afeaeb..dc7cd588 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -37,6 +37,8 @@ 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_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" @@ -78,10 +80,9 @@ do_install() { fi fi - if [ -f "${WORKDIR}/imggen/${UBOOT_BINARY}" ]; then - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} + 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 fi } @@ -100,10 +101,9 @@ do_deploy () { fi fi - if [ -f "${WORKDIR}/imggen/${UBOOT_BINARY}" ]; then - install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY} + if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then + install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3} + ln -sf ${SYSFW_TIBOOT3} ${DEPLOYDIR}/tiboot3.bin fi install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ From patchwork Fri Nov 4 22:46:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14938 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 5F230C63716 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.801.1667602018612151491 for ; Fri, 04 Nov 2022 15:46:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 9434240D89 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qDB3UD8Xd1Jz for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 76C6D40D83 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 0201816367E for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 05/50] ti-sci-fw: Make combined R5 boot the default Date: Fri, 4 Nov 2022 22:46:07 +0000 Message-Id: <20221104224653.1223044-6-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15283 From: Andrew Davis 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 Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/j721e-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/meta-ti-bsp/conf/machine/j721e-hs-evm.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf index a24a986b..0c493459 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-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/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index dc7cd588..3daf0c68 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/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:j721e-evm-k3r5 = "virtual/bootloader" +DEPENDS:remove:j721e-hs-evm-k3r5 = "virtual/bootloader" +DEPENDS:remove:j721e-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:j721e-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE:remove:j721e-hs-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE:remove:j721e-hs-evm-k3r5-sr1-1 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" do_compile() { cd ${WORKDIR}/imggen/ From patchwork Fri Nov 4 22:46:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14891 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 CD0F5C43217 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.823.1667602017137303041 for ; Fri, 04 Nov 2022 15:46:57 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 8A92740D8A for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j_HEself6fEf for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 7575840D82 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 0DC8716367F for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 06/50] ti-sci-fw: Only install and deploy combined boot symlink when set Date: Fri, 4 Nov 2022 22:46:08 +0000 Message-Id: <20221104224653.1223044-7-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:46:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15277 From: Andrew Davis 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 Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 3daf0c68..506052ca 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/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 Nov 4 22:46:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14892 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 D0184C433FE for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web09.933.1667602018307077686 for ; Fri, 04 Nov 2022 15:46:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 9366440D81 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xB-9ry7vz8w7 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 79D9940D84 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 0F98F163680 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 07/50] conf: machine: Move K3 TI_SECURE_DEV_PKG definition to common include Date: Fri, 4 Nov 2022 22:46:09 +0000 Message-Id: <20221104224653.1223044-8-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:46:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15278 From: Andrew Davis 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 Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf | 2 -- meta-ti-bsp/conf/machine/am64xx-hs-evm.conf | 2 -- meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf | 2 -- meta-ti-bsp/conf/machine/am65xx-hs-evm.conf | 2 -- meta-ti-bsp/conf/machine/include/k3.inc | 2 ++ meta-ti-bsp/conf/machine/include/k3r5.inc | 2 ++ meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf | 2 -- meta-ti-bsp/conf/machine/j7200-hs-evm.conf | 2 -- meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf | 2 -- meta-ti-bsp/conf/machine/j721e-hs-evm.conf | 2 -- meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf | 2 -- meta-ti-bsp/conf/machine/j721s2-hs-evm.conf | 2 -- 12 files changed, 4 insertions(+), 20 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf index d12c030f..647c8beb 100644 --- a/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf index ebbe2e62..3ab9a49e 100644 --- a/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf index 81b8c75f..d9041c9d 100644 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf index de92cacb..ea1f8ff1 100644 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 8a32e0fe..7cefd6c3 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -49,3 +49,5 @@ WKS_FILE ?= "sdimage-2part-efi.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/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc index d000404e..31646f5a 100644 --- a/meta-ti-bsp/conf/machine/include/k3r5.inc +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf index 3f134877..3fe06e74 100644 --- a/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/j7200-hs-evm.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm.conf index 8821ffac..ef7268b1 100644 --- a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf index 8e53a5cb..a0d000b2 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-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/meta-ti-bsp/conf/machine/j721e-hs-evm.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf index 0c493459..9ef7b86a 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-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/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf index ac4df86e..a4d51904 100644 --- a/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf index 7ffad45a..84db90bb 100644 --- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf +++ b/meta-ti-bsp/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}" From patchwork Fri Nov 4 22:46:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14899 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 BA3BCC4321E for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.810.1667602020725261796 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 1D21540D89 for ; Fri, 4 Nov 2022 22:47:00 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 18mg5bXwzr6y for ; Fri, 4 Nov 2022 22:47:00 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 7F31540D88 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 11B53163681 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 08/50] ti-sci-fw: Only deploy the raw SYSFW images for one machine target Date: Fri, 4 Nov 2022 22:46:10 +0000 Message-Id: <20221104224653.1223044-9-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15320 From: Andrew Davis This recipe deploys the raw SYSFW unconditionally which causes issues when doing multiconfig builds. What should happen is only one deploys these, select that the same way we select which one deploys the default SYSFW symlink. Move the deploy step there. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 506052ca..ae90e877 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -99,6 +99,7 @@ do_deploy () { ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_IMAGE} if [ ! -z "${SYSFW_SYMLINK}" ]; then ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_SYMLINK} + install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ fi fi @@ -106,10 +107,9 @@ do_deploy () { install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3} if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then ln -sf ${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3_SYMLINK} + install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ fi fi - - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ } addtask deploy before do_build after do_compile From patchwork Fri Nov 4 22:46:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14897 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 B1F8BC43219 for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web12.844.1667602018352131661 for ; Fri, 04 Nov 2022 15:46:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id B26E340D87 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ji_XR12xtYVz for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id A735C40D82 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 13772163682 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 09/50] conf: machine: am64xx-hs-evm: Add extra machine to build GP SYSFW Date: Fri, 4 Nov 2022 22:46:11 +0000 Message-Id: <20221104224653.1223044-10-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15279 From: Andrew Davis Use multiconfig to generate a GP SYSFW image. This allows the HS SDK to be used on GP boards by simply switching out the SYSFW image: $ cd /mnt/sd-card/boot $ mv tiboot3-am64x-gp-evm.bin tiboot3.bin Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../conf/machine/am64xx-hs-evm-k3r5-gp.conf | 16 ++++++++++++++++ meta-ti-bsp/conf/machine/am64xx-hs-evm.conf | 6 ++++++ meta-ti-bsp/conf/multiconfig/k3r5-gp.conf | 3 +++ 3 files changed, 25 insertions(+) create mode 100644 meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5-gp.conf create mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-gp.conf diff --git a/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5-gp.conf new file mode 100644 index 00000000..41c7027f --- /dev/null +++ b/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5-gp.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: AM64xx GP EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx GP EVM (R5F core) + +# Booting GP requires different SYSFW, the rest is handled at runtime + +require conf/machine/am64xx-hs-evm-k3r5.conf +SOC_FAMILY:append = ":k3r5-gp" + +SYSFW_SUFFIX = "gp" +SYSFW_TIBOOT3_SYMLINK = "" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf index 3ab9a49e..9f076099 100644 --- a/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf @@ -17,3 +17,9 @@ UBOOT_DTBO_OFFSET = "0x00010000" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" + +# Since default tiboot3.bin on AM64x is for HS, add a version for GP +BBMULTICONFIG += "k3r5-gp" +IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-gp.conf b/meta-ti-bsp/conf/multiconfig/k3r5-gp.conf new file mode 100644 index 00000000..80491e35 --- /dev/null +++ b/meta-ti-bsp/conf/multiconfig/k3r5-gp.conf @@ -0,0 +1,3 @@ +require k3r5.conf + +MACHINE:append = "-gp" From patchwork Fri Nov 4 22:46:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14936 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 5F852C63718 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.824.1667602018534133212 for ; Fri, 04 Nov 2022 15:46:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id B271840D8C for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HRvwa6MDpPjd for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id A888840D83 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 1F396163683 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 10/50] conf: machine: k3: Add fitImage to the default kernel image types Date: Fri, 4 Nov 2022 22:46:12 +0000 Message-Id: <20221104224653.1223044-11-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15281 From: Andrew Davis FIT Image based kernels are valid for all K3 devices, not just HS, deploy this kernel image type by default so it doesn't have to be appended on a per-device-type basis. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/include/k3.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 7cefd6c3..905133f7 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -15,7 +15,7 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" KERNEL_IMAGETYPE = "Image" -KERNEL_IMAGETYPES = "Image vmlinux.gz" +KERNEL_IMAGETYPES = "Image vmlinux.gz fitImage" UBOOT_ARCH = "arm" UBOOT_ENTRYPOINT = "0x80008000" From patchwork Fri Nov 4 22:46:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14920 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 2EB8AC63705 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web09.937.1667602019454357416 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 9CB0A40D9C for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k6SkXF9zW_oI for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 8EA3B40D8E for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 29EA2163684 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 11/50] k3: also inherit kernel-fitimage class for FIT image generation Date: Fri, 4 Nov 2022 22:46:13 +0000 Message-Id: <20221104224653.1223044-12-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15296 From: Denys Dmytriyenko In order to support fitImage image type, kernel-fitimage class is needed. Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/include/k3.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 905133f7..84afd2e2 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -16,6 +16,7 @@ PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" KERNEL_IMAGETYPE = "Image" KERNEL_IMAGETYPES = "Image vmlinux.gz fitImage" +KERNEL_CLASSES += "kernel-fitimage" UBOOT_ARCH = "arm" UBOOT_ENTRYPOINT = "0x80008000" From patchwork Fri Nov 4 22:46:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14934 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 390ECC63708 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web12.848.1667602019440798757 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 9C0A640D9B for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 50p5WdFvKOMi for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 902B340D96 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 34A5E163685 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 12/50] ti-sci-fw: Add am65xx-evm-k3r5-sr2 to combined R5 boot list Date: Fri, 4 Nov 2022 22:46:14 +0000 Message-Id: <20221104224653.1223044-13-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15293 From: Andrew Davis This machine was missed when making combined R5 boot the default. Add this machine to fix build failure. Reported-by: Ryan Eatmon Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index ae90e877..21a38d34 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -2,6 +2,7 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc DEPENDS = "openssl-native u-boot-mkimage-native dtc-native virtual/bootloader" DEPENDS:remove:am65xx-evm-k3r5 = "virtual/bootloader" +DEPENDS:remove:am65xx-evm-k3r5-sr2 = "virtual/bootloader" DEPENDS:remove:am65xx-hs-evm-k3r5 = "virtual/bootloader" DEPENDS:remove:am65xx-hs-evm-k3r5-sr2 = "virtual/bootloader" DEPENDS:remove:j721e-evm-k3r5 = "virtual/bootloader" @@ -57,6 +58,7 @@ EXTRA_OEMAKE = "\ 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-evm-k3r5-sr2 = "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:j721e-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" From patchwork Fri Nov 4 22:46:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14921 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 237E7C4708C for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.805.1667602019595480830 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id C27F240D9D for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uDMMJtNXY5Ie for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id B81B740D97 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 364B7163686 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 13/50] trusted-firmware-a: upgrade to v2.7 Date: Fri, 4 Nov 2022 22:46:15 +0000 Message-Id: <20221104224653.1223044-14-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15298 From: Praneeth Bajjuri upgrade arm-trusted-firmare to v2.7 Signed-off-by: Praneeth Bajjuri Tested-by: Judith Mendez Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 55fc3e29..916d8773 100644 --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -1,5 +1,5 @@ -PV:k3 = "2.6+2.7-rc0" -SRCREV_tfa:k3 = "453abc80b2eacbf2816c838e47e40f063227d934" +PV:k3 = "2.7" +SRCREV_tfa:k3 = "35f4c7295bafeb32c8bcbdfb6a3f2e74a57e732b" SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" COMPATIBLE_MACHINE:k3 = "k3" TFA_BUILD_TARGET:k3 = "all" From patchwork Fri Nov 4 22:46:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14929 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 392C9C63709 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web12.849.1667602019492337622 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id A775F40D96 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WXCyMd_s-qBX for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 9DF7440D9D for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 415F4163687 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 14/50] recipies-ti: Add TI K3 Security Development Package Date: Fri, 4 Nov 2022 22:46:16 +0000 Message-Id: <20221104224653.1223044-15-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15294 From: Andrew Davis Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../recipes-ti/includes/ti-paths.inc | 2 ++ .../recipes-ti/secdev/ti-k3-secdev_git.bb | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 meta-ti-extras/recipes-ti/secdev/ti-k3-secdev_git.bb diff --git a/meta-ti-extras/recipes-ti/includes/ti-paths.inc b/meta-ti-extras/recipes-ti/includes/ti-paths.inc index 358d7dfd..5994ff0a 100644 --- a/meta-ti-extras/recipes-ti/includes/ti-paths.inc +++ b/meta-ti-extras/recipes-ti/includes/ti-paths.inc @@ -51,6 +51,7 @@ export OMP_INSTALL_DIR_RECIPE = "${installdir}/ti-omp-tree" export MPM_INSTALL_DIR_RECIPE = "${installdir}/ti-mpm-tree" export TI_CGT6X_7_INSTALL_DIR_RECIPE = "${installdir}/cgt6x-7" export TI_CGT7X_INSTALL_DIR_RECIPE = "${installdir}/cgt-c7x" +export TI_K3_SECDEV_INSTALL_DIR_RECIPE = "${installdir}/ti-k3-secdev" # This is where the tools will end up in sysroot @@ -100,6 +101,7 @@ export TI_CGT6X_7_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT6X_7_INSTALL_DIR export GCC_LINARO_BAREMETAL_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE}" export GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE}" export TI_CGT7X_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT7X_INSTALL_DIR_RECIPE}" +export TI_K3_SECDEV_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_K3_SECDEV_INSTALL_DIR_RECIPE}" DSPSUFFIX:omapl137 = "x674" diff --git a/meta-ti-extras/recipes-ti/secdev/ti-k3-secdev_git.bb b/meta-ti-extras/recipes-ti/secdev/ti-k3-secdev_git.bb new file mode 100644 index 00000000..7a5dd573 --- /dev/null +++ b/meta-ti-extras/recipes-ti/secdev/ti-k3-secdev_git.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Security development tools for High-Security(HS) TI K3 processors." +HOMEPAGE = "https://git.ti.com/cgit/security-development-tools/core-secdev-k3" +SECTION = "devel" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://manifest/k3-secdev-0.2-manifest.html;md5=f632a78870cc64550078d7b3cbac0892" + +# Native host tool only +COMPATIBLE_MACHINE = "null" +COMPATIBLE_MACHINE:class-native = "(.*)" +COMPATIBLE_MACHINE:class-nativesdk = "(.*)" + +GIT_URI = "git://git.ti.com/git/security-development-tools/core-secdev-k3.git" +GIT_PROTOCOL = "https" +GIT_BRANCH = "master" +GIT_SRCREV = "eb2c4d734487e5095b94cef3fd7213ee71d9e016" + +SRC_URI = "${GIT_URI};protocol=${GIT_PROTOCOL};branch=${GIT_BRANCH}" +SRCREV = "${GIT_SRCREV}" + +S = "${WORKDIR}/git" + +do_install() { + CP_ARGS="-Prf --preserve=mode,links,timestamps --no-preserve=ownership" + install -d ${D}${TI_K3_SECDEV_INSTALL_DIR_RECIPE} + cp ${CP_ARGS} ${S}/* ${D}${TI_K3_SECDEV_INSTALL_DIR_RECIPE} +} + +FILES:${PN} += "${TI_K3_SECDEV_INSTALL_DIR_RECIPE}" + +INSANE_SKIP:${PN} = "arch ldflags file-rdeps" + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +BBCLASSEXTEND = "native nativesdk" From patchwork Fri Nov 4 22:46:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14923 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 2E803C63704 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.828.1667602019486523487 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id A2C0240D8E for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Zi2LwVx7P3kU for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 99C3A40D97 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 4D187163688 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 15/50] ti-sci-fw: Use ti-k3-secdev if TI_SECURE_DEV_PKG_K3 is not defined Date: Fri, 4 Nov 2022 22:46:17 +0000 Message-Id: <20221104224653.1223044-16-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15297 From: Andrew Davis Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 21a38d34..1b0dc4a1 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -1,4 +1,5 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc +require recipes-ti/includes/ti-paths.inc DEPENDS = "openssl-native u-boot-mkimage-native dtc-native virtual/bootloader" DEPENDS:remove:am65xx-evm-k3r5 = "virtual/bootloader" @@ -8,6 +9,7 @@ DEPENDS:remove:am65xx-hs-evm-k3r5-sr2 = "virtual/bootloader" DEPENDS:remove:j721e-evm-k3r5 = "virtual/bootloader" DEPENDS:remove:j721e-hs-evm-k3r5 = "virtual/bootloader" DEPENDS:remove:j721e-hs-evm-k3r5-sr1-1 = "virtual/bootloader" +DEPENDS:append = " ${@ '' if '${TI_SECURE_DEV_PKG_K3}' else 'ti-k3-secdev-native' }" CLEANBROKEN = "1" PR = "${INC_PR}.2" @@ -18,7 +20,7 @@ COMPATIBLE_MACHINE:aarch64 = "null" PACKAGE_ARCH = "${MACHINE_ARCH}" -TI_SECURE_DEV_PKG ?= "" +TI_SECURE_DEV_PKG = "${@ '${TI_SECURE_DEV_PKG_K3}' or '${TI_K3_SECDEV_INSTALL_DIR}' }" export TI_SECURE_DEV_PKG SYSFW_SOC ?= "unknown" From patchwork Fri Nov 4 22:46:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14937 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 5F825C63717 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.800.1667602018384024983 for ; Fri, 04 Nov 2022 15:46:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id C56A140D8B for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ngmcmmrIKMpg for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id B9F8340D82 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 4EC3A163689 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 16/50] u-boot-ti-staging: Update to the latest ti-u-boot-2021.01 Date: Fri, 4 Nov 2022 22:46:18 +0000 Message-Id: <20221104224653.1223044-17-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15282 From: Andrew Davis Update to the latest commit of ti-u-boot-2021.01. As part of this U-Boot update the non-HS AM64x-evm defconfig was removed. This is okay as building this defconfig without defining TI_SECURE_DEV_PKG will still result in usable binaries for the non-HS devices. Use the HS defconfig for both the HS and non-HS machines. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/am64xx-evm.conf | 4 ++++ meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf | 2 +- meta-ti-bsp/conf/machine/am64xx-hs-evm.conf | 2 +- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am64xx-evm.conf b/meta-ti-bsp/conf/machine/am64xx-evm.conf index c6ba2a87..2cb7f55a 100644 --- a/meta-ti-bsp/conf/machine/am64xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am64xx-evm.conf @@ -5,3 +5,7 @@ require conf/machine/include/am64xx.inc UBOOT_MACHINE = "am64x_evm_a53_defconfig" + +SPL_BINARY = "tispl.bin_HS" +UBOOT_BINARY = "u-boot.img_HS" +UBOOT_SYMLINK = "u-boot.img" diff --git a/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf index 647c8beb..95e68751 100644 --- a/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf @@ -9,4 +9,4 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" SYSFW_SYMLINK = "" -UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig" +UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf index 9f076099..1149d4c7 100644 --- a/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf @@ -4,7 +4,7 @@ require conf/machine/include/am64xx.inc -UBOOT_MACHINE = "am64x_hs_evm_a53_defconfig" +UBOOT_MACHINE = "am64x_evm_a53_defconfig" UBOOT_ENTRYPOINT = "0x80080000" UBOOT_LOADADDRESS = "0x80080000" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb index 5560d1a1..bac87cf4 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb @@ -2,8 +2,8 @@ require u-boot-ti.inc LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025" -PR = "r32" +PR = "r33" BRANCH = "ti-u-boot-2021.01" -SRCREV = "a3f87b40a1b6744261d1ac351fe2566dbf64bc66" +SRCREV = "1c29865c3106a1e6c8e2036601ff61a8bf70590b" From patchwork Fri Nov 4 22:46:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14939 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 6903AC63719 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web12.845.1667602018397627488 for ; Fri, 04 Nov 2022 15:46:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id D1DB840D8D for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t8lenUsk8BPH for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id C071740D84 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 59E4916368A for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 17/50] conf: machine: am64xx-evm: Make HS-SE the default Date: Fri, 4 Nov 2022 22:46:19 +0000 Message-Id: <20221104224653.1223044-18-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15280 From: Andrew Davis The HS-SE AM64xx machine can now be run on GP devices and built without needing the TI_SECURE_DEV_PKG for the same. AM64xx will only be available in the HS-FS type going forward. Make the HS-SE the default and remove the original GP machine. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- ...m-k3r5-gp.conf => am64xx-evm-k3r5-gp.conf} | 6 ++++- .../conf/machine/am64xx-evm-k3r5-hs-se.conf | 14 +++++++++++ meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf | 11 -------- meta-ti-bsp/conf/machine/am64xx-evm.conf | 6 +++++ .../conf/machine/am64xx-hs-evm-k3r5.conf | 12 --------- meta-ti-bsp/conf/machine/am64xx-hs-evm.conf | 25 ------------------- meta-ti-bsp/conf/machine/include/am64xx.inc | 5 ++-- meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf | 3 +++ .../trusted-firmware-a_%.bbappend | 2 +- .../optee/optee-os_%.bbappend | 2 +- 10 files changed, 33 insertions(+), 53 deletions(-) rename meta-ti-bsp/conf/machine/{am64xx-hs-evm-k3r5-gp.conf => am64xx-evm-k3r5-gp.conf} (78%) create mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5-hs-se.conf delete mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf delete mode 100644 meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf delete mode 100644 meta-ti-bsp/conf/machine/am64xx-hs-evm.conf create mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf diff --git a/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf similarity index 78% rename from meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5-gp.conf rename to meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf index 41c7027f..50bf6a07 100644 --- a/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5-gp.conf +++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf @@ -4,12 +4,16 @@ # Booting GP requires different SYSFW, the rest is handled at runtime -require conf/machine/am64xx-hs-evm-k3r5.conf +require conf/machine/include/k3r5.inc SOC_FAMILY:append = ":k3r5-gp" +SYSFW_SOC = "am64x" +SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" SYSFW_TIBOOT3_SYMLINK = "" +UBOOT_MACHINE = "am64x_evm_r5_defconfig" + SPL_BINARY = "" UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-hs-se.conf new file mode 100644 index 00000000..7e737b12 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-hs-se.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM64xx HS-SE EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx HS-SE EVM (R5F core) + +# Booting HS-SE requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":k3r5-hs-se" + +SYSFW_SOC = "am64x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf deleted file mode 100644 index afd36b72..00000000 --- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm.conf b/meta-ti-bsp/conf/machine/am64xx-evm.conf index 2cb7f55a..ef3e356d 100644 --- a/meta-ti-bsp/conf/machine/am64xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am64xx-evm.conf @@ -9,3 +9,9 @@ UBOOT_MACHINE = "am64x_evm_a53_defconfig" SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" + +# Since default tiboot3.bin on AM64x is for HS-SE, add a version for GP +BBMULTICONFIG += "k3r5-gp" +IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf deleted file mode 100644 index 95e68751..00000000 --- a/meta-ti-bsp/conf/machine/am64xx-hs-evm-k3r5.conf +++ /dev/null @@ -1,12 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" -SYSFW_SYMLINK = "" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf deleted file mode 100644 index 1149d4c7..00000000 --- a/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf +++ /dev/null @@ -1,25 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM - -require conf/machine/include/am64xx.inc - -UBOOT_MACHINE = "am64x_evm_a53_defconfig" - -UBOOT_ENTRYPOINT = "0x80080000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_RD_LOADADDRESS = "0x84000000" -UBOOT_RD_ENTRYPOINT = "0x84000000" -UBOOT_DTB_LOADADDRESS = "0x83000000" -UBOOT_DTBO_LOADADDRESS = "0x83080000" -UBOOT_DTBO_OFFSET = "0x00010000" - -SPL_BINARY = "tispl.bin_HS" -UBOOT_BINARY = "u-boot.img_HS" -UBOOT_SYMLINK = "u-boot.img" - -# Since default tiboot3.bin on AM64x is for HS, add a version for GP -BBMULTICONFIG += "k3r5-gp" -IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" -do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 297d6007..00ee31b8 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -14,8 +14,9 @@ KERNEL_DEVICETREE = " \ ti/k3-am642-evm-nand.dtbo \ " -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +BBMULTICONFIG = "k3r5-hs-se" +do_image_wic[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" TFA_BOARD = "lite" OPTEEMACHINE = "k3-am64x" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf b/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf new file mode 100644 index 00000000..7e3d7dae --- /dev/null +++ b/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf @@ -0,0 +1,3 @@ +require k3r5.conf + +MACHINE:append = "-hs-se" diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 916d8773..41516e06 100644 --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -30,7 +30,7 @@ do_compile:append:am65xx-hs-evm() { tfa_sign_k3hs } -do_compile:append:am64xx-hs-evm() { +do_compile:append:am64xx-evm() { tfa_sign_k3hs } diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend index e268a542..e59a8e79 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend @@ -64,7 +64,7 @@ do_compile:append:am65xx-hs-evm() { optee_sign_k3hs } -do_compile:append:am64xx-hs-evm() { +do_compile:append:am64xx-evm() { optee_sign_k3hs } From patchwork Fri Nov 4 22:46:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14940 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 4B537C6370E for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.826.1667602018824637272 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id DAABF40D82 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8nJ0P9OFXqVe for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id C020D40D83 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 65F8216368B for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 18/50] all: Stop using git://git.ti.com Date: Fri, 4 Nov 2022 22:46:20 +0000 Message-Id: <20221104224653.1223044-19-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15287 From: Ryan Eatmon Stop using un-encrypted git:// protocol to access TI repositories. This is inline with the same arguments as made by github in https://github.blog/2021-09-01-improving-git-protocol-security-github/ Signed-off-by: Nishanth Menon Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb | 2 +- meta-ti-bsp/recipes-bsp/cmem/cmem.inc | 2 +- .../recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb | 4 ++-- .../gc320-drivers/ti-gc320-driver_5.0.11.p7.bb | 2 +- .../powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb | 2 +- .../powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 2 +- .../ti-img-encode-decode/viddec-test-app_1.0.0.bb | 2 +- .../ti-img-encode-decode/videnc-test-app_1.0.0.bb | 2 +- meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 4 ++-- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 4 ++-- meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv.inc | 4 ++-- meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb | 2 +- meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb | 2 +- .../recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 4 ++-- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb | 4 ++-- meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc | 4 ++-- meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc | 4 ++-- meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb | 4 ++-- meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb | 2 +- meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb | 2 +- meta-ti-extras/recipes-bsp/dsptop/dsptop.inc | 2 +- meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb | 2 +- .../recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb | 2 +- meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb | 2 +- .../wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb | 4 ++-- .../wl18xx-target-scripts/wl18xx-target-scripts_8.7.3.bb | 2 +- .../recipes-connectivity/wlconf/wlconf_8.7.3.bb | 2 +- meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x.inc | 2 +- meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb | 2 +- meta-ti-extras/recipes-ti/dsplib/dsplib.inc | 4 ++-- meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc | 8 ++++---- meta-ti-extras/recipes-ti/mathlib/mathlib.inc | 4 ++-- meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb | 6 +++--- meta-ti-extras/recipes-ti/swtools/swtools_git.bb | 4 ++-- .../recipes-ti/uio-test-pruss/uio-test-pruss_git.bb | 4 ++-- 36 files changed, 55 insertions(+), 55 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb b/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb index 00486677..691ff156 100644 --- a/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb +++ b/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb @@ -9,7 +9,7 @@ PR = "r0" SRCREV = "fb484c5e54f2e31cf0a338d2927a06a2870bcc2c" BRANCH ?= "ti-v4.1.y" -SRC_URI = "git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/meta-ti-bsp/recipes-bsp/cmem/cmem.inc b/meta-ti-bsp/recipes-bsp/cmem/cmem.inc index 99717f87..683e1763 100644 --- a/meta-ti-bsp/recipes-bsp/cmem/cmem.inc +++ b/meta-ti-bsp/recipes-bsp/cmem/cmem.inc @@ -9,7 +9,7 @@ SRCREV = "86269258a48e0a9008dd9d5ebfae9da7ce843393" PV = "4.20.00.01+git${SRCPV}" -SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/ipc/ludev.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" COMPATIBLE_HOST ?= "null" diff --git a/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb b/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb index 371086c1..cf26eb2d 100755 --- a/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb @@ -9,11 +9,11 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit deploy inherit update-alternatives -PROTOCOL = "git" +PROTOCOL = "https" BRANCH = "master" SRCREV = "91f1628507bf7f8716f0bc7cafe88ad7f14c94f5" -SRC_URI = "git://git.ti.com/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb b/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb index f7771caf..a56810d4 100644 --- a/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb +++ b/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb @@ -15,7 +15,7 @@ BRANCH = "ti-${PV}-k5.10" SRCREV = "e2a10f31e255a65ec30a6e10b890e77d7e9cb107" -SRC_URI = "git://git.ti.com/graphics/ti-gc320-driver.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-driver.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git/src" diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb index 109a13d0..95aa3299 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb @@ -20,7 +20,7 @@ PROVIDES = "virtual/gpudriver" BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize" SRC_URI = " \ - git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ + git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH} \ file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \ file://0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch \ " diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb index 2ec2ffef..c22e3096 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb @@ -20,7 +20,7 @@ PROVIDES = "virtual/gpudriver" BRANCH = "ti-img-sgx/${PV}/k5.10" -SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb index ffc3f56e..29af4863 100644 --- a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb +++ b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb @@ -15,6 +15,6 @@ EXTRA_OEMAKE = "CC="${CC}"" TARGET_CC_ARCH += "${LDFLAGS}" BRANCH = "master" -SRC_URI = "git://git.ti.com/jacinto7_multimedia/viddec-test-app.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/jacinto7_multimedia/viddec-test-app.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb index 125a9250..b674c764 100644 --- a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb +++ b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb @@ -15,6 +15,6 @@ EXTRA_OEMAKE = "CC="${CC}"" TARGET_CC_ARCH += "${LDFLAGS}" BRANCH = "master" -SRC_URI = "git://git.ti.com/jacinto7_multimedia/videnc-test-app.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/jacinto7_multimedia/videnc-test-app.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" 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 be714b36..5d9e1979 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 @@ -32,8 +32,8 @@ SRCREV_FORMAT = "imggen" K3_IMAGE_GEN_BRANCH ?= "master" SRC_URI = " \ - git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH} \ - git://git.ti.com/k3-image-gen/k3-image-gen.git;protocol=git;branch=${K3_IMAGE_GEN_BRANCH};destsuffix=imggen;name=imggen \ + git://git.ti.com/git/processor-firmware/ti-linux-firmware.git;protocol=https;branch=${BRANCH} \ + git://git.ti.com/git/k3-image-gen/k3-image-gen.git;protocol=https;branch=${K3_IMAGE_GEN_BRANCH};destsuffix=imggen;name=imggen \ " S = "${WORKDIR}/git" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index 3696a483..c0f876e3 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -16,8 +16,8 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" BRANCH ?= "master" -UBOOT_GIT_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git" -UBOOT_GIT_PROTOCOL = "git" +UBOOT_GIT_URI = "git://git.ti.com/git/ti-u-boot/ti-u-boot.git" +UBOOT_GIT_PROTOCOL = "https" SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};branch=${BRANCH}" PV:append = "+git${SRCPV}" diff --git a/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv.inc b/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv.inc index 5b9ac50e..a74b59bb 100644 --- a/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv.inc +++ b/meta-ti-bsp/recipes-bsp/uio-module-drv/uio-module-drv.inc @@ -7,8 +7,8 @@ UIO_MODULE_DRV_SRCREV = "78c535afe8f8cc0b715500a63eab0bc3606c0579" PV = "2.3.1.0+git${SRCPV}" -UIO_MODULE_DRV_GIT_URI = "git://git.ti.com/keystone-linux/uio-module-drv.git" -UIO_MODULE_DRV_GIT_PROTOCOL = "git" +UIO_MODULE_DRV_GIT_URI = "git://git.ti.com/git/keystone-linux/uio-module-drv.git" +UIO_MODULE_DRV_GIT_PROTOCOL = "https" SRC_URI = "${UIO_MODULE_DRV_GIT_URI};protocol=${UIO_MODULE_DRV_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${UIO_MODULE_DRV_SRCREV}" diff --git a/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb b/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb index 5ca6b62e..7f4e8b77 100644 --- a/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb +++ b/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb @@ -14,7 +14,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" SRCREV = "e3d8db1aa935775f9d196ad7428e0cd9864a36ca" BRANCH ?= "master" -SRC_URI = "git://git.ti.com/vpe_tests/vpe_tests.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/vpe_tests/vpe_tests.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb index 567e8d55..10e2631e 100644 --- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb +++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb @@ -10,7 +10,7 @@ COMPATIBLE_MACHINE = "k3" BRANCH ?= "master" SRCREV = "48cb8e8d7dc962229a9f318cd512b4ddeec5cdc5" -SRC_URI = "git://git.ti.com/k3conf/k3conf.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb b/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb index ab72c109..807f421c 100644 --- a/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb +++ b/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb @@ -13,7 +13,7 @@ CLEANBROKEN = "1" BRANCH = "ti-${PV}" -SRC_URI = "git://git.ti.com/graphics/ti-gc320-libs.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-libs.git;protocol=https;branch=${BRANCH}" SRCREV = "c0afab259de59909cfe74c01f3f7fbaa147f94b5" RRECOMMENDS:${PN} = "ti-gc320-driver" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb index af823b98..0fe54cda 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb @@ -29,10 +29,10 @@ MACHINE_KERNEL_PR:append = "b" PR = "${MACHINE_KERNEL_PR}" KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" -KERNEL_GIT_PROTOCOL = "git" +KERNEL_GIT_PROTOCOL = "https" SRC_URI += " \ ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH};name=linux \ - git://git.ti.com/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=ti-upstream-tools \ + git://git.ti.com/git/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=ti-upstream-tools \ file://defconfig \ " diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb index c23b4f18..84224c5c 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb @@ -32,8 +32,8 @@ PV = "5.10.120+git${SRCPV}" MACHINE_KERNEL_PR:append = "b" PR = "${MACHINE_KERNEL_PR}" -KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" -KERNEL_GIT_PROTOCOL = "git" +KERNEL_GIT_URI = "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" +KERNEL_GIT_PROTOCOL = "https" SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ file://defconfig" diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc b/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc index 3f6b7bce..44be2466 100644 --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc @@ -4,8 +4,8 @@ HOMEPAGE="http://processors.wiki.ti.com/index.php/Category:IPC" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${S}/ipc-linux.mak;beginline=1;endline=30;md5=7b327f9b710fd7c95e545b91cec79255" -TI_IPC_GIT_URI = "git://git.ti.com/ipc/ipcdev.git" -TI_IPC_GIT_PROTOCOL = "git" +TI_IPC_GIT_URI = "git://git.ti.com/git/ipc/ipcdev.git" +TI_IPC_GIT_PROTOCOL = "https" TI_IPC_GIT_BRANCH = "master" #Corresponds to 3.51.00.00A diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc b/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc index 10349b58..c6645f3f 100644 --- a/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc +++ b/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc @@ -3,9 +3,9 @@ SUMMARY = "TI RPMsg Char Utility Library" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${S}/src/rpmsg_char.c;beginline=1;endline=31;md5=71987db43a2159cff5ea00505c6fce58" -PROTOCOL = "git" +PROTOCOL = "https" BRANCH = "master" -SRC_URI = "git://git.ti.com/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};" +SRC_URI = "git://git.ti.com/git/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};" # Initial 0.4.1 release SRCREV = "355d2b0bcde5eb5c895a270d1835102d2bc39fbd" diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb index 67b1d2a9..be1ff013 100644 --- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb @@ -16,8 +16,8 @@ PLAT_SFX:am65xx = "/am65xx" PLAT_SFX:am64xx = "/am64x" # Use weak assignment to set defaults to TI_RTOS_METADATA_* variables -TI_RTOS_METADATA_URI ?= "git://git.ti.com/processor-sdk/coresdk_rtos_releases.git" -TI_RTOS_METADATA_PROTOCOL ?= "git" +TI_RTOS_METADATA_URI ?= "git://git.ti.com/git/processor-sdk/coresdk_rtos_releases.git" +TI_RTOS_METADATA_PROTOCOL ?= "https" TI_RTOS_METADATA_SRCREV ?= "2ecbf45af64bc47806623cc5bf7ab493489acaf9" TI_RTOS_METADATA_BRANCH ?= "master" TI_RTOS_METADATA_DIR ?= "${PLAT_SFX}" diff --git a/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb b/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb index 28edf614..8fef493b 100644 --- a/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb +++ b/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb @@ -8,7 +8,7 @@ CLEANBROKEN = "1" SRCREV = "0ee619b598d023fffc77679f099bc2a4815510e4" BRANCH = "master" -SRC_URI = "git://git.ti.com/ti-bt/service-packs.git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/ti-bt/service-packs.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb b/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb index d9d4ef7e..491ee0f3 100644 --- a/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb +++ b/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb @@ -8,7 +8,7 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "dsp" -SRC_URI = "git://git.ti.com/glsdk/dspdce.git;protocol=git" +SRC_URI = "git://git.ti.com/git/glsdk/dspdce.git;protocol=https;branch=master" SRCREV = "de6e599f067b25c46cc0c8f74a22cc3b8aafbae8" diff --git a/meta-ti-extras/recipes-bsp/dsptop/dsptop.inc b/meta-ti-extras/recipes-bsp/dsptop/dsptop.inc index 31f775e2..ec159c75 100644 --- a/meta-ti-extras/recipes-bsp/dsptop/dsptop.inc +++ b/meta-ti-extras/recipes-bsp/dsptop/dsptop.inc @@ -3,6 +3,6 @@ SRCREV = "816485e68430bbec643eac9498bfa5303eb2c2e1" PV = "1.4.0" INC_PR = "r2" -SRC_URI = "git://git.ti.com/sdo-emu/dsptop.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/sdo-emu/dsptop.git;protocol=https;branch=${BRANCH}" BRANCH = "master" diff --git a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb index e2302d58..8d066eb0 100644 --- a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +++ b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb @@ -11,7 +11,7 @@ REQUIRED_MACHINE_FEATURES = "mmip" RDEPENDS:${PN} = "libdce" -SRC_URI = "git://git.ti.com/ivimm/ipumm.git;protocol=git" +SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https;branch=master" SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5" diff --git a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb index 09968993..dbae5a21 100644 --- a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb +++ b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb @@ -3,7 +3,7 @@ LICENSE = "TI-TSPA" LIC_FILES_CHKSUM = "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e" SRC_URI = " \ - git://git.ti.com/wilink8-wlan/wl18xx_fw.git;protocol=git;branch=${BRANCH} \ + git://git.ti.com/git/wilink8-wlan/wl18xx_fw.git;protocol=https;branch=${BRANCH} \ file://0001-Add-Makefile-to-install-firmware-files.patch \ " diff --git a/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb b/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb index e5912e81..2e528376 100644 --- a/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb +++ b/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb @@ -8,7 +8,7 @@ INITSCRIPT_PARAMS = "defaults 03" inherit update-rc.d SRCREV = "a75f45be2d5c74fc1dd913d08afc30f09a230aa9" -SRC_URI = "git://git.ti.com/ti-bt/uim.git;branch=master;protocol=https" +SRC_URI = "git://git.ti.com/git/ti-bt/uim.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb b/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb index 1b9710af..1e9c445d 100644 --- a/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb +++ b/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb @@ -7,8 +7,8 @@ RDEPENDS:${PN} = "wl18xx-fw" #Tag: R8.7_SP3 (8.7.3) SRCREV = "5048b59a444ac59ba7171d6e122d5a84581aebf2" -SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git;branch=master \ - file://0001-plt.h-Do-not-define-EFUSE_PARAMETER_TYPE_ENMT-type-e.patch \ +SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;branch=master;protocol=https \ + file://0001-plt.h-Do-not-define-EFUSE_PARAMETER_TYPE_ENMT-type-e.patch \ " S = "${WORKDIR}/git" diff --git a/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.7.3.bb b/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.7.3.bb index e553ff49..84e8764f 100644 --- a/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.7.3.bb +++ b/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.7.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=b8d6a0865f50159bf5c # Tag: R8.7_SP3 (8.7.3) SRCREV = "a07b6e711d2a70608101d3d6cdc5749c4d8a96d5" BRANCH = "sitara-scripts" -SRC_URI = "git://git.ti.com/wilink8-wlan/wl18xx-target-scripts.git;protocol=git;branch=${BRANCH} \ +SRC_URI = "git://git.ti.com/git/wilink8-wlan/wl18xx-target-scripts.git;protocol=https;branch=${BRANCH} \ file://0001-print_stat.sh-replace-system-bin-sh-with-bin-sh.patch \ " diff --git a/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb b/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb index a6f62239..a2a8b775 100644 --- a/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb +++ b/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85 # Tag: R8.7_SP3 (8.7.3) SRCREV = "5048b59a444ac59ba7171d6e122d5a84581aebf2" -SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git;branch=master" +SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;branch=master;protocol=https" S = "${WORKDIR}/git/wlconf" diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x.inc b/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x.inc index eeb18fb1..54115f4e 100644 --- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x.inc +++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x.inc @@ -4,6 +4,6 @@ SRCREV = "dd0c82fb5763a6b32dc6d68e561efb66ab8283d7" PV = "1.1.0" INC_PR = "r7" -SRC_URI = "git://git.ti.com/sdo-emu/gdbc6x.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/sdo-emu/gdbc6x.git;protocol=https;branch=${BRANCH}" BRANCH = "master" diff --git a/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb b/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb index ece07183..400221f9 100644 --- a/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb +++ b/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb @@ -7,7 +7,7 @@ PV = "4.19.0.0" LIC_FILES_CHKSUM = "file://../ctoolslib_manifest.html;md5=b7dd369a2e07ef9a71795ee5a9bd01bd" -SRC_URI = "git://git.ti.com/sdo-emu/ctoolslib.git;protocol=git;branch=opencl_aetlib_build" +SRC_URI = "git://git.ti.com/git/sdo-emu/ctoolslib.git;protocol=https;branch=opencl_aetlib_build" SRCREV = "de7954abab0f0caa8a2c7b53095c30226d901a31" DEPENDS = "ti-cgt6x-native" diff --git a/meta-ti-extras/recipes-ti/dsplib/dsplib.inc b/meta-ti-extras/recipes-ti/dsplib/dsplib.inc index 85d79ae3..6ebc3b34 100644 --- a/meta-ti-extras/recipes-ti/dsplib/dsplib.inc +++ b/meta-ti-extras/recipes-ti/dsplib/dsplib.inc @@ -17,8 +17,8 @@ DEPENDS = "ti-cgt6x-native \ S = "${WORKDIR}/git" DSPLIB_GIT_BRANCH = "master" -DSPLIB_GIT_PROTOCOL = "git" -DSPLIB_GIT_URI = "git://git.ti.com/ep-processor-libraries/dsplib.git" +DSPLIB_GIT_PROTOCOL = "https" +DSPLIB_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/dsplib.git" DSPLIB_SRCREV = "0390b171042c602e07669fd28a371cc319b90161" SRC_URI = "${DSPLIB_GIT_URI};protocol=${DSPLIB_GIT_PROTOCOL};branch=${DSPLIB_GIT_BRANCH}" diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc index 56667ad1..14ac7c77 100644 --- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc +++ b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc @@ -1,8 +1,8 @@ require recipes-ti/includes/ti-paths.inc -TI_IPC_EXAMPLES_GIT_URI = "git://git.ti.com/ipc/ipc-examples.git" +TI_IPC_EXAMPLES_GIT_URI = "git://git.ti.com/git/ipc/ipc-examples.git" TI_IPC_EXAMPLES_DEST_SUFFIX = "git/ipc-examples" -TI_IPC_EXAMPLES_GIT_PROTOCOL = "git" +TI_IPC_EXAMPLES_GIT_PROTOCOL = "https" TI_IPC_EXAMPLES_GIT_BRANCH = "master" TI_IPC_EXAMPLES_NAME = "ipc-examples" @@ -12,9 +12,9 @@ protocol=${TI_IPC_EXAMPLES_GIT_PROTOCOL};\ branch=${TI_IPC_EXAMPLES_GIT_BRANCH};\ name=${TI_IPC_EXAMPLES_NAME}" -TI_IPC_METADATA_GIT_URI = "git://git.ti.com/ipc/ipc-metadata.git" +TI_IPC_METADATA_GIT_URI = "git://git.ti.com/git/ipc/ipc-metadata.git" TI_IPC_METADATA_DEST_SUFFIX = "git/ipc-metadata" -TI_IPC_METADATA_GIT_PROTOCOL = "git" +TI_IPC_METADATA_GIT_PROTOCOL = "https" TI_IPC_METADATA_GIT_BRANCH = "master" TI_IPC_METADATA_NAME = "ipc-metadata" diff --git a/meta-ti-extras/recipes-ti/mathlib/mathlib.inc b/meta-ti-extras/recipes-ti/mathlib/mathlib.inc index fe75c099..6ad073ec 100644 --- a/meta-ti-extras/recipes-ti/mathlib/mathlib.inc +++ b/meta-ti-extras/recipes-ti/mathlib/mathlib.inc @@ -17,8 +17,8 @@ DEPENDS = "ti-cgt6x-native \ S = "${WORKDIR}/git" MATHLIB_GIT_BRANCH = "master" -MATHLIB_GIT_PROTOCOL = "git" -MATHLIB_GIT_URI = "git://git.ti.com/ep-processor-libraries/mathlib.git" +MATHLIB_GIT_PROTOCOL = "https" +MATHLIB_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/mathlib.git" MATHLIB_SRCREV = "eadcc9547faf69789661b004bb0b5ef53bb69951" SRC_URI = "${MATHLIB_GIT_URI};protocol=${MATHLIB_GIT_PROTOCOL};branch=${MATHLIB_GIT_BRANCH}" diff --git a/meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb b/meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb index 7c4a3409..aa4bc6cd 100644 --- a/meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb +++ b/meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb @@ -1,5 +1,5 @@ DESCRIPTION = "TI OpenMP RTOS" -HOMEPAGE = "git://git.ti.com/openmp/ti-openmp-dsp-runtime.git" +HOMEPAGE = "git://git.ti.com/git/openmp/ti-openmp-dsp-runtime.git" LICENSE = "BSD-3-Clause" require recipes-ti/includes/ti-paths.inc @@ -12,8 +12,8 @@ REQUIRED_DISTRO_FEATURES = "openmp" PV = "2_06_03_00" PR = "r0" -OPENMP_RTOS_GIT_URI = "git://git.ti.com/openmp/ti-openmp-dsp-runtime.git" -OPENMP_RTOS_GIT_PROTOCOL = "git" +OPENMP_RTOS_GIT_URI = "git://git.ti.com/git/openmp/ti-openmp-dsp-runtime.git" +OPENMP_RTOS_GIT_PROTOCOL = "https" OPENMP_RTOS_GIT_BRANCH = "master" BRANCH = "${OPENMP_RTOS_GIT_BRANCH}" diff --git a/meta-ti-extras/recipes-ti/swtools/swtools_git.bb b/meta-ti-extras/recipes-ti/swtools/swtools_git.bb index a4cb1053..4bcd6754 100644 --- a/meta-ti-extras/recipes-ti/swtools/swtools_git.bb +++ b/meta-ti-extras/recipes-ti/swtools/swtools_git.bb @@ -15,8 +15,8 @@ PR = "r3" S = "${WORKDIR}/git" SWTOOLS_GIT_BRANCH = "master" -SWTOOLS_GIT_PROTOCOL = "git" -SWTOOLS_GIT_URI = "git://git.ti.com/ep-processor-libraries/swtools.git" +SWTOOLS_GIT_PROTOCOL = "https" +SWTOOLS_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/swtools.git" SWTOOLS_SRCREV = "7d1c85e686b1466cd2d535fc9cac5baf1aae24a4" SRC_URI = "${SWTOOLS_GIT_URI};protocol=${SWTOOLS_GIT_PROTOCOL};branch=${SWTOOLS_GIT_BRANCH}" diff --git a/meta-ti-extras/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb b/meta-ti-extras/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb index 59576daa..d9a420d8 100644 --- a/meta-ti-extras/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb +++ b/meta-ti-extras/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb @@ -10,8 +10,8 @@ DEPENDS = "ti-cgt-pru-native" BRANCH = "master" LIC_FILES_CHKSUM = "file://Makefile;startline=1;endline=31;md5=0ee4f2c42eb6b04e37859bb55a18b144" -UIO_TEST_PRUSS_GIT_URI = "git://git.ti.com/processor-sdk/uio-test-pruss.git" -UIO_TEST_PRUSS_GIT_PROTOCOL = "git" +UIO_TEST_PRUSS_GIT_URI = "git://git.ti.com/git/processor-sdk/uio-test-pruss.git" +UIO_TEST_PRUSS_GIT_PROTOCOL = "https" SRC_URI = "${UIO_TEST_PRUSS_GIT_URI};protocol=${UIO_TEST_PRUSS_GIT_PROTOCOL};branch=${BRANCH}" # Corresponds to version 01.00.02.00 From patchwork Fri Nov 4 22:46:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14930 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 55231C63713 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.825.1667602018818597990 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id D2D1340D91 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iyW5ur_L1uk8 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id C871640D82 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 6968E16368C for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 19/50] conf: machine: am64xx-evm: Update default HS names Date: Fri, 4 Nov 2022 22:46:21 +0000 Message-Id: <20221104224653.1223044-20-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15285 From: Andrew Davis In the latest U-Boot the HS images for AM64x have been renamed to the default names, and the GP have been changed to *_unsigned. Remove the overrides to pull the now default HS images. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/am64xx-evm.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am64xx-evm.conf b/meta-ti-bsp/conf/machine/am64xx-evm.conf index ef3e356d..6e1c87ec 100644 --- a/meta-ti-bsp/conf/machine/am64xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am64xx-evm.conf @@ -6,10 +6,6 @@ require conf/machine/include/am64xx.inc UBOOT_MACHINE = "am64x_evm_a53_defconfig" -SPL_BINARY = "tispl.bin_HS" -UBOOT_BINARY = "u-boot.img_HS" -UBOOT_SYMLINK = "u-boot.img" - # Since default tiboot3.bin on AM64x is for HS-SE, add a version for GP BBMULTICONFIG += "k3r5-gp" IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" From patchwork Fri Nov 4 22:46:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14901 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 BA3E0C4167B for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web09.941.1667602022705665552 for ; Fri, 04 Nov 2022 15:47:02 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 2C82140D7C for ; Fri, 4 Nov 2022 22:47:02 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2R7MyD6TZqAG for ; Fri, 4 Nov 2022 22:47:02 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id CFD0540D8F for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 7453E16368D for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 20/50] machine: add am62xx-lp-evm configuration Date: Fri, 4 Nov 2022 22:46:22 +0000 Message-Id: <20221104224653.1223044-21-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15321 From: Anand Gadiyar This platform is similar to the currently supported am62xx-evm, except that we currently need new defconfigs for u-boot and new dtbs in the filesystem. Signed-off-by: Anand Gadiyar Cc: Hari Nagalla Cc: Andrew Davis Cc: Praneeth Bajjuri Cc: Ryan Eatmon Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 11 +++++++++++ meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 16 ++++++++++++++++ .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 + .../tifs-lpm-stub/tifs-lpm-stub_git.bb | 2 +- .../recipes-kernel/linux/kernel-rdepends.inc | 3 +-- 5 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am62xx-lp-evm.conf diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf new file mode 100644 index 00000000..ca4ced5a --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: AM62XX LP EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx LP EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf new file mode 100644 index 00000000..ef8e8692 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: AM62XX LP EVM +#@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM + +require conf/machine/include/am62xx.inc + +MACHINE_FEATURES += "gpu" + +KERNEL_DEVICETREE = " \ + ti/k3-am62x-lp-sk.dtb \ + ti/k3-am625-skeleton.dtb \ + ti/k3-am625-sk-lpmdemo.dtb \ + ti/k3-am625-sk-csi2-ov5640.dtbo \ +" + +UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 1b0dc4a1..6484ae87 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -36,6 +36,7 @@ SYSFW_PREFIX:j7200-hs-evm-k3r5 = "fs" SYSFW_PREFIX:j721s2-evm-k3r5 = "fs" SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "fs" SYSFW_PREFIX:am62xx-evm-k3r5 = "fs" +SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs" SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" diff --git a/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb b/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb index 90af55f1..ce5f4e1f 100644 --- a/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb +++ b/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb @@ -7,7 +7,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "am62xx-evm" +COMPATIBLE_MACHINE = "am62xx" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc index 1071a278..3da41581 100644 --- a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc +++ b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc @@ -30,5 +30,4 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7 = " vxd-dec-fw" RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cnm-wave-fw" # Add run-time dependency for TIFS Low Power Module stub -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62xx-evm = " tifs-lpm-stub" - +RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62xx = " tifs-lpm-stub" From patchwork Fri Nov 4 22:46:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14935 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 553F6C63715 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web09.934.1667602018875452315 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id E183C40D83 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 91WWxHIJqUVm for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id D814340D84 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 7646216368E for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 21/50] optee-os: Upgrade to upstream 3.18.0 Date: Fri, 4 Nov 2022 22:46:23 +0000 Message-Id: <20221104224653.1223044-22-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15284 From: Andrew Davis Update to the latest upstream master which is 3.18.0. Signed-off-by: Andrew Davis Reviewed-by: Praneeth Bajjuri Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend index e59a8e79..76f55257 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend @@ -1,7 +1,5 @@ -PV:ti-soc = "3.17.0+git${SRCPV}" -SRCREV:ti-soc = "15a746d28d10df3d79d72bc9fe4a5a654b88bcca" - -DEPENDS:append:ti-soc = " python3-cryptography-native" +PV:ti-soc = "3.18.0+git${SRCPV}" +SRCREV:ti-soc = "8e155bae3a5eb9d1a3ed9260bd7281a7a35f5086" EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" From patchwork Fri Nov 4 22:46:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14927 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 4F98EC6370D for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.803.1667602018881816528 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id EA84A40D84 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 85WxQPpP81mX for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id DE7B840D8E for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 80CAE16368F for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 22/50] optee-os: Lower log level for AM62x Date: Fri, 4 Nov 2022 22:46:24 +0000 Message-Id: <20221104224653.1223044-23-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15286 From: Andrew Davis During resume from low power mode suspend OP-TEE prints some messages on the UART. It seems this UART is not powered at this point in the sequence breaking suspend/resume. We should track down the exact prints and quiet them. Until we get that fix upstream, lets lower the log level for this platform to unblock the LPM work. Signed-off-by: Andrew Davis Acked-by: Anand Gadiyar Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend index 76f55257..3c4383ba 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend @@ -3,7 +3,7 @@ SRCREV:ti-soc = "8e155bae3a5eb9d1a3ed9260bd7281a7a35f5086" EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" -EXTRA_OEMAKE:append:am62xx = " CFG_WITH_SOFTWARE_PRNG=y" +EXTRA_OEMAKE:append:am62xx = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1" EXTRA_OEMAKE:append:j721s2 = " CFG_WITH_SOFTWARE_PRNG=y" do_compile:prepend:ti-soc() { From patchwork Fri Nov 4 22:46:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14932 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 23D2AC636F9 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.829.1667602019607616728 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id C933840D97 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S6tDxXq_UuLE for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id C034940D7F for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 8B844163690 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 23/50] ti-sci-fw: Use d.getVar() in DEPENDS expression Date: Fri, 4 Nov 2022 22:46:25 +0000 Message-Id: <20221104224653.1223044-24-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15299 From: Randolph Sapp Switch the DEPENDS_append expression to use d.getVar() instead of the usual variable expansion to prevent the inline Python command from becoming mangled. Signed-off-by: Randolph Sapp Acked-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 6484ae87..2772ee22 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -9,7 +9,7 @@ DEPENDS:remove:am65xx-hs-evm-k3r5-sr2 = "virtual/bootloader" DEPENDS:remove:j721e-evm-k3r5 = "virtual/bootloader" DEPENDS:remove:j721e-hs-evm-k3r5 = "virtual/bootloader" DEPENDS:remove:j721e-hs-evm-k3r5-sr1-1 = "virtual/bootloader" -DEPENDS:append = " ${@ '' if '${TI_SECURE_DEV_PKG_K3}' else 'ti-k3-secdev-native' }" +DEPENDS:append = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }" CLEANBROKEN = "1" PR = "${INC_PR}.2" From patchwork Fri Nov 4 22:46:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14926 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 23DADC63703 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.806.1667602019749898950 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id CC7CF40D7F for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fxSfxJMdQtQ5 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id C0DF440D9A for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 9648E163691 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 24/50] cadence-mhdp-fw: Add dependency for j721s2 Date: Fri, 4 Nov 2022 22:46:26 +0000 Message-Id: <20221104224653.1223044-25-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15300 From: Rahul T R cdns mhdp bridge is present in j721s2 soc. Add the dependency for the same Signed-off-by: Rahul T R Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb | 2 +- meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb index 2f694202..b066a676 100644 --- a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb @@ -10,7 +10,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "j721e" +COMPATIBLE_MACHINE = "j721e|j721s2" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc index 3da41581..38289491 100644 --- a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc +++ b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc @@ -22,6 +22,7 @@ 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:j721e = " cadence-mhdp-fw" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cadence-mhdp-fw" # Add run-time dependency for Video Decoding firmware to the rootfs RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7 = " vxd-dec-fw" From patchwork Fri Nov 4 22:46:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14931 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 4B296C6370C for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web09.935.1667602019238748090 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 0218640D93 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kIdgaRMkKVdP for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id EC40D40D90 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 980C1163694 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 25/50] conf: machine: am64xx-evm: Switch to SR2.0 HS-FS build by default Date: Fri, 4 Nov 2022 22:46:27 +0000 Message-Id: <20221104224653.1223044-26-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15288 From: Andrew Davis AM64x devices will only be available as SR2.0 HS-FS. Set this as the default type provided by the SDK. To allow SR2.0 HS-SE to continue to boot, like we did with GP, we add an extra machine to build SR2.0 HS-SE SYSFW. To use on SR2.0 HS-SE boards simply switch out the SYSFW image: $ cd /mnt/sd-card/boot $ mv tiboot3-am64x_sr2-hs-evm.bin tiboot3.bin Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../conf/machine/am64xx-evm-k3r5-hs-se.conf | 14 ------------- .../machine/am64xx-evm-k3r5-sr2-hs-fs.conf | 14 +++++++++++++ .../machine/am64xx-evm-k3r5-sr2-hs-se.conf | 20 +++++++++++++++++++ meta-ti-bsp/conf/machine/am64xx-evm.conf | 8 +++++++- meta-ti-bsp/conf/machine/include/am64xx.inc | 6 +++--- .../conf/multiconfig/k3r5-sr2-hs-fs.conf | 3 +++ .../{k3r5-hs-se.conf => k3r5-sr2-hs-se.conf} | 2 +- 7 files changed, 48 insertions(+), 19 deletions(-) delete mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5-hs-se.conf create mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf create mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf create mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf rename meta-ti-bsp/conf/multiconfig/{k3r5-hs-se.conf => k3r5-sr2-hs-se.conf} (55%) diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-hs-se.conf deleted file mode 100644 index 7e737b12..00000000 --- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-hs-se.conf +++ /dev/null @@ -1,14 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS-SE EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx HS-SE EVM (R5F core) - -# Booting HS-SE requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-hs-se" - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf new file mode 100644 index 00000000..42ddbb4c --- /dev/null +++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM64xx SR2.0 HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-FS EVM (R5F core) + +# Booting SR2.0 HS-FS requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":k3r5-sr2-hs-fs" + +SYSFW_SOC = "am64x_sr2" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf new file mode 100644 index 00000000..a1c2b3e6 --- /dev/null +++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@NAME: AM64xx SR2.0 HS-SE EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-SE EVM (R5F core) + +# Booting SR2.0 HS-SE requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":k3r5-sr2-hs-se" + +SYSFW_SOC = "am64x_sr2" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" +SYSFW_TIBOOT3_SYMLINK = "" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-sr2-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-sr2-hs-se.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm.conf b/meta-ti-bsp/conf/machine/am64xx-evm.conf index 6e1c87ec..67f1be5b 100644 --- a/meta-ti-bsp/conf/machine/am64xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am64xx-evm.conf @@ -6,8 +6,14 @@ require conf/machine/include/am64xx.inc UBOOT_MACHINE = "am64x_evm_a53_defconfig" -# Since default tiboot3.bin on AM64x is for HS-SE, add a version for GP +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP BBMULTICONFIG += "k3r5-gp" IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE +BBMULTICONFIG += "k3r5-sr2-hs-se" +IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 00ee31b8..4d26732c 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -14,9 +14,9 @@ KERNEL_DEVICETREE = " \ ti/k3-am642-evm-nand.dtbo \ " -BBMULTICONFIG = "k3r5-hs-se" -do_image_wic[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5-hs-se:ti-sci-fw:do_deploy" +BBMULTICONFIG = "k3r5-sr2-hs-fs" +do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" TFA_BOARD = "lite" OPTEEMACHINE = "k3-am64x" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf new file mode 100644 index 00000000..98972326 --- /dev/null +++ b/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf @@ -0,0 +1,3 @@ +require k3r5-sr2.conf + +MACHINE:append = "-hs-fs" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf similarity index 55% rename from meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf rename to meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf index 7e3d7dae..8b98fc0a 100644 --- a/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf +++ b/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf @@ -1,3 +1,3 @@ -require k3r5.conf +require k3r5-sr2.conf MACHINE:append = "-hs-se" From patchwork Fri Nov 4 22:46:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14925 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 41CB4C6370B for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.804.1667602019268478099 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 0AED240D90 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6VzBDGvkWcTn for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 0050940D8E for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 9A1CD163695 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 26/50] conf: machine: am64xx: Move multi-config targets into base SoC include Date: Fri, 4 Nov 2022 22:46:28 +0000 Message-Id: <20221104224653.1223044-27-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15290 From: Andrew Davis The supported device types depends on the SoC, not on any specific board or EVM. Any board can be populated with any of the 3 supported AM64x types. Move these into the AM64x common include. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/am64xx-evm.conf | 12 ------------ meta-ti-bsp/conf/machine/include/am64xx.inc | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am64xx-evm.conf b/meta-ti-bsp/conf/machine/am64xx-evm.conf index 67f1be5b..c6ba2a87 100644 --- a/meta-ti-bsp/conf/machine/am64xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am64xx-evm.conf @@ -5,15 +5,3 @@ require conf/machine/include/am64xx.inc UBOOT_MACHINE = "am64x_evm_a53_defconfig" - -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP -BBMULTICONFIG += "k3r5-gp" -IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" -do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" - -# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE -BBMULTICONFIG += "k3r5-sr2-hs-se" -IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" -do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 4d26732c..055f6036 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -14,10 +14,23 @@ KERNEL_DEVICETREE = " \ ti/k3-am642-evm-nand.dtbo \ " +# Default tiboot3.bin on AM64x is for SR2.0 HS-FS BBMULTICONFIG = "k3r5-sr2-hs-fs" do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP +BBMULTICONFIG += "k3r5-gp" +IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE +BBMULTICONFIG += "k3r5-sr2-hs-se" +IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" + TFA_BOARD = "lite" OPTEEMACHINE = "k3-am64x" OPTEEOUTPUTMACHINE = "k3" From patchwork Fri Nov 4 22:46:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14917 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 19BECC3E8A8 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.807.1667602019758244670 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id DE29D40D85 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jeAS2LEep3Xy for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id D27B440D80 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id A51B7163696 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 27/50] linux-ti-mainline: unbreak devtool Date: Fri, 4 Nov 2022 22:46:29 +0000 Message-Id: <20221104224653.1223044-28-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15301 From: Denys Dmytriyenko devtool has a long-standing bug where it cannot handle references to ${WORKDIR} due to externalsrc: https://bugzilla.yoctoproject.org/show_bug.cgi?id=12677 linux-ti-mainline clones additional ti-upstream-tools repo alongside the kernel sources into ${WORKDIR}, which exposes this devtool bug. Work around the issue by moving ti-upstream-tools inside the kernel source tree, i.e. inside ${S} Reported-by: Radoslav Pesek Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb index 0fe54cda..6c1b1825 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit kernel -DEFCONFIG_BUILDER = "${WORKDIR}/ti-upstream-tools/config/defconfig_builder.sh" +DEFCONFIG_BUILDER = "${S}/ti-upstream-tools/config/defconfig_builder.sh" require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/kernel-rdepends.inc require recipes-kernel/linux/ti-kernel.inc @@ -32,7 +32,7 @@ KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.g KERNEL_GIT_PROTOCOL = "https" SRC_URI += " \ ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH};name=linux \ - git://git.ti.com/git/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=ti-upstream-tools \ + git://git.ti.com/git/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=git/ti-upstream-tools \ file://defconfig \ " @@ -43,7 +43,7 @@ KERNEL_DEVICETREE = "" kernel_do_compile:append() { oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} - oe_runmake -C ${WORKDIR}/ti-upstream-tools LINUX=${S} DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} + oe_runmake -C ${S}/ti-upstream-tools LINUX=${S} DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} } do_install:append() { From patchwork Fri Nov 4 22:46:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14928 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 43EFCC63707 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web12.846.1667602019295926095 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 1E1A940D95 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hu6OJea3YPsa for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 0E70A40D8E for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id AFCD21636A2 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 28/50] ti-rtos-firmware: j721e-hs-evm: add secure firmware images Date: Fri, 4 Nov 2022 22:46:30 +0000 Message-Id: <20221104224653.1223044-29-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15289 From: Manorit Chawdhry Adds support for secure firmware images in J721E HS EVM. Signed-off-by: Manorit Chawdhry Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../ti-rtos-bin/ti-rtos-firmware.bb | 80 ++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) 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 072a7c3c..d8f00ccd 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 @@ -14,6 +14,7 @@ inherit update-alternatives PLAT_SFX = "" PLAT_SFX:j7 = "j721e" +PLAT_SFX:j721e-hs-evm = "j721e" PLAT_SFX:j7200-evm = "j7200" PLAT_SFX:j7200-hs-evm = "j7200" PLAT_SFX:j721s2-evm = "j721s2" @@ -31,7 +32,7 @@ PV = "${CORESDK_RTOS_VERSION}" CLEANBROKEN = "1" PR = "${INC_PR}.0" -# Secure Build +# Secure Build DEPENDS += "openssl-native" TI_SECURE_DEV_PKG ?= "" @@ -55,6 +56,28 @@ do_install:prepend:j721e-hs-evm() { mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ ) + ( + cd ${RTOS_IPC_FW_DIR}; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu2_0_release_strip.xer5f \ + ipc_echo_test_mcu2_0_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu2_1_release_strip.xer5f \ + ipc_echo_test_mcu2_1_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu3_0_release_strip.xer5f \ + ipc_echo_test_mcu3_0_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu3_1_release_strip.xer5f \ + ipc_echo_test_mcu3_1_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c66xdsp_1_release_strip.xe66 \ + ipc_echo_test_c66xdsp_1_release_strip.xe66.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c66xdsp_2_release_strip.xe66 \ + ipc_echo_test_c66xdsp_2_release_strip.xe66.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_1_release_strip.xe71 \ + ipc_echo_test_c7x_1_release_strip.xe71.signed; \ + ) + ( + cd ${RTOS_ETH_FW_DIR}; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh app_remoteswitchcfg_server_strip.xer5f \ + app_remoteswitchcfg_server_strip.xer5f.signed; + ) } # J7 HS support @@ -115,6 +138,18 @@ do_install:j7() { install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f ${LEGACY_ETH_FW_DIR} } +do_install:append:j721e-hs-evm() { + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_0_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_1_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c66xdsp_1_release_strip.xe66.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c66xdsp_2_release_strip.xe66.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71.signed ${LEGACY_IPC_FW_DIR} + # ETH firmware + install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f.signed ${LEGACY_ETH_FW_DIR} +} + do_install:j7200-evm() { install -d ${LEGACY_IPC_FW_DIR} install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} @@ -221,6 +256,25 @@ ALTERNATIVE:${PN}:am62xx = "\ am62-main-r5f0_0-fw \ " +ALTERNATIVE:${PN}:j721e-hs-evm = "\ + j7-mcu-r5f0_0-fw \ + j7-mcu-r5f0_1-fw \ + j7-main-r5f0_0-fw \ + j7-main-r5f0_1-fw \ + j7-main-r5f1_0-fw \ + j7-main-r5f1_1-fw \ + j7-c66_0-fw \ + j7-c66_1-fw \ + j7-c71_0-fw\ + j7-main-r5f0_0-fw-sec \ + j7-main-r5f0_1-fw-sec \ + j7-main-r5f1_0-fw-sec \ + j7-main-r5f1_1-fw-sec \ + j7-c66_0-fw-sec \ + j7-c66_1-fw-sec \ + j7-c71_0-fw-sec \ + " + ALTERNATIVE:${PN}:j7 = "\ j7-mcu-r5f0_0-fw \ j7-mcu-r5f0_1-fw \ @@ -293,6 +347,14 @@ TARGET_C66_0:j7 = "j7-c66_0-fw" TARGET_C66_1:j7 = "j7-c66_1-fw" TARGET_C7X_0:j7 = "j7-c71_0-fw" +TARGET_MAIN_R5FSS0_0_SIGNED:j721e-hs-evm = "j7-main-r5f0_0-fw-sec" +TARGET_MAIN_R5FSS0_1_SIGNED:j721e-hs-evm = "j7-main-r5f0_1-fw-sec" +TARGET_MAIN_R5FSS1_0_SIGNED:j721e-hs-evm = "j7-main-r5f1_0-fw-sec" +TARGET_MAIN_R5FSS1_1_SIGNED:j721e-hs-evm = "j7-main-r5f1_1-fw-sec" +TARGET_C66_0_SIGNED:j721e-hs-evm = "j7-c66_0-fw-sec" +TARGET_C66_1_SIGNED:j721e-hs-evm = "j7-c66_1-fw-sec" +TARGET_C7X_0_SIGNED:j721e-hs-evm = "j7-c71_0-fw-sec" + TARGET_MCU_R5FSS0_0:j7200-evm = "j7200-mcu-r5f0_0-fw" TARGET_MCU_R5FSS0_1:j7200-evm = "j7200-mcu-r5f0_1-fw" TARGET_MAIN_R5FSS0_0:j7200-evm = "j7200-main-r5f0_0-fw" @@ -343,6 +405,14 @@ ALTERNATIVE_LINK_NAME[j7-c66_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_C ALTERNATIVE_LINK_NAME[j7-c66_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_C66_1}" ALTERNATIVE_LINK_NAME[j7-c71_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_C7X_0}" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j7-main-r5f1_0-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j7-main-r5f1_1-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j7-c66_0-fw-sec] = "${base_libdir}/firmware/${TARGET_C66_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j7-c66_1-fw-sec] = "${base_libdir}/firmware/${TARGET_C66_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j7-c71_0-fw-sec] = "${base_libdir}/firmware/${TARGET_C7X_0_SIGNED}" + ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" @@ -381,6 +451,14 @@ ALTERNATIVE_TARGET[j7-c66_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_e ALTERNATIVE_TARGET[j7-c66_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_2_release_strip.xe66" ALTERNATIVE_TARGET[j7-c71_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71" +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f.signed" +ALTERNATIVE_TARGET[j7-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j7-main-r5f1_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j7-main-r5f1_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j7-c66_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_1_release_strip.xe66.signed" +ALTERNATIVE_TARGET[j7-c66_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_2_release_strip.xe66.signed" +ALTERNATIVE_TARGET[j7-c71_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71.signed" + ALTERNATIVE_TARGET[j7200-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" ALTERNATIVE_TARGET[j7200-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f" From patchwork Fri Nov 4 22:46:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14915 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 0FF72C4708E for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.830.1667602019818703526 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id EF98140D9F for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QnSXEuWQtEWQ for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id DE7D440D9A for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id B1B391636A3 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 29/50] ti-rtos-firmware: j7200-hs-evm: add secure firmware images Date: Fri, 4 Nov 2022 22:46:31 +0000 Message-Id: <20221104224653.1223044-30-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15306 From: Manorit Chawdhry Adds support for secure firmware images in J7200 HS EVM. Signed-off-by: Manorit Chawdhry Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../ti-rtos-bin/ti-rtos-firmware.bb | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) 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 d8f00ccd..ea4737b9 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 @@ -87,6 +87,18 @@ do_install:prepend:j7200-hs-evm() { mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ ) + ( + cd ${RTOS_IPC_FW_DIR}; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu2_0_release_strip.xer5f \ + ipc_echo_test_mcu2_0_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu2_1_release_strip.xer5f \ + ipc_echo_test_mcu2_1_release_strip.xer5f.signed; \ + ) + ( + cd ${RTOS_ETH_FW_DIR}; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh app_remoteswitchcfg_server_strip.xer5f \ + app_remoteswitchcfg_server_strip.xer5f.signed; + ) } # J7 HS support @@ -167,11 +179,16 @@ do_install:j7200-hs-evm() { install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} + # Signed Firmwares + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} # DM Firmware install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} # ETH firmware install -d ${LEGACY_ETH_FW_DIR} install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f ${LEGACY_ETH_FW_DIR} + # ETH Signed firmware + install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f.signed ${LEGACY_ETH_FW_DIR} } do_install:j721s2-evm() { @@ -299,6 +316,8 @@ ALTERNATIVE:${PN}:j7200-hs-evm = "\ j7200-mcu-r5f0_1-fw \ j7200-main-r5f0_0-fw \ j7200-main-r5f0_1-fw \ + j7200-main-r5f0_0-fw-sec \ + j7200-main-r5f0_1-fw-sec \ " ALTERNATIVE_${PN}:j721s2-evm = "\ @@ -365,6 +384,9 @@ TARGET_MCU_R5FSS0_1:j7200-hs-evm = "j7200-mcu-r5f0_1-fw" TARGET_MAIN_R5FSS0_0:j7200-hs-evm = "j7200-main-r5f0_0-fw" TARGET_MAIN_R5FSS0_1:j7200-hs-evm = "j7200-main-r5f0_1-fw" +TARGET_MAIN_R5FSS0_0_SIGNED:j7200-hs-evm = "j7200-main-r5f0_0-fw-sec" +TARGET_MAIN_R5FSS0_1_SIGNED:j7200-hs-evm = "j7200-main-r5f0_1-fw-sec" + TARGET_MCU_R5FSS0_0:j721s2-evm = "j721s2-mcu-r5f0_0-fw" TARGET_MCU_R5FSS0_1:j721s2-evm = "j721s2-mcu-r5f0_1-fw" TARGET_MAIN_R5FSS0_0:j721s2-evm = "j721s2-main-r5f0_0-fw" @@ -418,6 +440,9 @@ ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${ ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" ALTERNATIVE_LINK_NAME[j7200-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1}" +ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j7200-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1_SIGNED}" + ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" ALTERNATIVE_LINK_NAME[j721s2-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" @@ -464,6 +489,9 @@ ALTERNATIVE_TARGET[j7200-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/pdk-i ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f" ALTERNATIVE_TARGET[j7200-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f" +ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f.signed" +ALTERNATIVE_TARGET[j7200-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f.signed" + ALTERNATIVE_TARGET[j721s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" ALTERNATIVE_TARGET[j721s2-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" ALTERNATIVE_TARGET[j721s2-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_0_release_strip.xer5f" From patchwork Fri Nov 4 22:46:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14919 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 19A8AC47090 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web08.828.1667602019807711546 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id F029540DA2 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CV06mFH4Sqwm for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id E024040D9E for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id B39AB1636A4 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 30/50] ti-rtos-firmware: j721s2-hs-evm: add secure firmware images Date: Fri, 4 Nov 2022 22:46:32 +0000 Message-Id: <20221104224653.1223044-31-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15302 From: Manorit Chawdhry Adds support for secure firmware images in J721S2 HS EVM. Signed-off-by: Manorit Chawdhry Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../ti-rtos-bin/ti-rtos-firmware.bb | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) 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 ea4737b9..219b86dc 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 @@ -108,6 +108,21 @@ do_install:prepend:j721s2-hs-evm() { mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ ) + ( + cd ${RTOS_IPC_FW_DIR}; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu2_0_release_strip.xer5f \ + ipc_echo_test_mcu2_0_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu2_1_release_strip.xer5f \ + ipc_echo_test_mcu2_1_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu3_0_release_strip.xer5f \ + ipc_echo_test_mcu3_0_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu3_1_release_strip.xer5f \ + ipc_echo_test_mcu3_1_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_1_release_strip.xe71 \ + ipc_echo_test_c7x_1_release_strip.xe71.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_2_release_strip.xe71 \ + ipc_echo_test_c7x_2_release_strip.xe71.signed; \ + ) } # Update the am64xx ipc binaries to be consistent with other platforms @@ -216,6 +231,13 @@ do_install:j721s2-hs-evm() { install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71 ${LEGACY_IPC_FW_DIR} install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_2_release_strip.xe71 ${LEGACY_IPC_FW_DIR} + # Signed firmware + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_0_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_1_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_2_release_strip.xe71.signed ${LEGACY_IPC_FW_DIR} # DM Firmware install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} # ETH firmware @@ -340,6 +362,12 @@ ALTERNATIVE:${PN}:j721s2-hs-evm = "\ j721s2-main-r5f1_1-fw \ j721s2-c71_0-fw \ j721s2-c71_1-fw \ + j721s2-main-r5f0_0-fw-sec \ + j721s2-main-r5f0_1-fw-sec \ + j721s2-main-r5f1_0-fw-sec \ + j721s2-main-r5f1_1-fw-sec \ + j721s2-c71_0-fw-sec \ + j721s2-c71_1-fw-sec \ " # Set up link names for the firmwares @@ -405,6 +433,13 @@ TARGET_MAIN_R5FSS1_1:j721s2-hs-evm = "j721s2-main-r5f1_1-fw" TARGET_C7X_0:j721s2-hs-evm = "j721s2-c71_0-fw" TARGET_C7X_1:j721s2-hs-evm = "j721s2-c71_1-fw" +TARGET_MAIN_R5FSS0_0_SIGNED:j721s2-hs-evm = "j721s2-main-r5f0_0-fw-sec" +TARGET_MAIN_R5FSS0_1_SIGNED:j721s2-hs-evm = "j721s2-main-r5f0_1-fw-sec" +TARGET_MAIN_R5FSS1_0_SIGNED:j721s2-hs-evm = "j721s2-main-r5f1_0-fw-sec" +TARGET_MAIN_R5FSS1_1_SIGNED:j721s2-hs-evm = "j721s2-main-r5f1_1-fw-sec" +TARGET_C7X_0_SIGNED:j721s2-hs-evm = "j721s2-c71_0-fw-sec" +TARGET_C7X_1_SIGNED:j721s2-hs-evm = "j721s2-c71_1-fw-sec" + ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" @@ -452,6 +487,13 @@ ALTERNATIVE_LINK_NAME[j721s2-main-r5f1_1-fw] = "${nonarch_base_libdir}/firmware/ ALTERNATIVE_LINK_NAME[j721s2-c71_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_C7X_0}" ALTERNATIVE_LINK_NAME[j721s2-c71_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_C7X_1}" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f1_0-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f1_1-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j721s2-c71_0-fw-sec] = "${base_libdir}/firmware/${TARGET_C7X_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j721s2-c71_1-fw-sec] = "${base_libdir}/firmware/${TARGET_C7X_1_SIGNED}" + # Create the firmware alternatives ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_0_release_strip.xer5f" @@ -501,6 +543,13 @@ ALTERNATIVE_TARGET[j721s2-main-r5f1_1-fw] = "${nonarch_base_libdir}/firmware/pdk ALTERNATIVE_TARGET[j721s2-c71_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71" ALTERNATIVE_TARGET[j721s2-c71_1-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_2_release_strip.xe71" +ALTERNATIVE_TARGET[j721s2-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_0_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j721s2-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j721s2-main-r5f1_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j721s2-main-r5f1_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j721s2-c71_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71.signed" +ALTERNATIVE_TARGET[j721s2-c71_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_2_release_strip.xe71.signed" + ALTERNATIVE_PRIORITY = "10" # make sure that lib/firmware, and all its contents are part of the package From patchwork Fri Nov 4 22:46:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14933 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 41C82C6370A for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.827.1667602019315402966 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 1F9E040D98 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ef3DUOkbipzU for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 1541040D92 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id BE3F71636A5 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 31/50] ipc: ti-rpmsg-char: Update library to 0.5.1 Date: Fri, 4 Nov 2022 22:46:33 +0000 Message-Id: <20221104224653.1223044-32-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15291 From: Praneeth Bajjuri Update the ti-rpmsg-char library to 0.5.1 version that enables the support for R5F on am62x SoCs. Signed-off-by: Praneeth Bajjuri Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc b/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc index c6645f3f..d21dcbf3 100644 --- a/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc +++ b/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc @@ -7,10 +7,10 @@ PROTOCOL = "https" BRANCH = "master" SRC_URI = "git://git.ti.com/git/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};" -# Initial 0.4.1 release -SRCREV = "355d2b0bcde5eb5c895a270d1835102d2bc39fbd" +# Initial 0.5.1 release +SRCREV = "adb964ee72f99545e2ad55c50cfd14015a7d837e" -PV = "0.4.1+git${SRCPV}" +PV = "0.5.1+git${SRCPV}" S = "${WORKDIR}/git" From patchwork Fri Nov 4 22:46:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14896 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 AD4A3C4332F for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web09.942.1667602023676676266 for ; Fri, 04 Nov 2022 15:47:03 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 25A1540D7F for ; Fri, 4 Nov 2022 22:47:03 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wPC9kqCGwkem for ; Fri, 4 Nov 2022 22:47:03 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id E733240D80 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id C8FFB1636A6 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 32/50] ti-img-rogue-driver: Fix git SRC_URI Date: Fri, 4 Nov 2022 22:46:34 +0000 Message-Id: <20221104224653.1223044-33-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15322 From: Ryan Eatmon We missed a spot when updating all of the git access for git.ti.com to use HTTPS. Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../libgles/ti-img-rogue-umlibs_1.15.6133109.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb index 1fb04dab..5d6e45b8 100644 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb @@ -14,7 +14,7 @@ PR = "r2" BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize" -SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" SRCREV = "fba0c770b712640ab3761dbe8369d43f89f616ed" TARGET_PRODUCT:j721e = "j721e_linux" From patchwork Fri Nov 4 22:46:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14918 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 0F0C0C3A5A1 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web09.938.1667602019864253516 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 0760540DA4 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WME14_H7gos7 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id E7F1040D99 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id D40EC1636A7 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 33/50] machine: Add j784s4-evm configuration. Date: Fri, 4 Nov 2022 22:46:35 +0000 Message-Id: <20221104224653.1223044-34-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15304 From: Ryan Eatmon Adding support for j784s4-evm: - Add configurations. - Add firmware. - Add u-boot. - Add gpu support. Signed-off-by: Ryan Eatmon Signed-off-by: Hari Nagalla Signed-off-by: Randolph Sapp Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf | 11 +++ meta-ti-bsp/conf/machine/j784s4-evm.conf | 24 ++++++ .../cadence-mhdp-fw/cadence-mhdp-fw_git.bb | 2 +- .../cnm-wave-fw/cnm-wave-fw_git.bb | 3 +- .../ti-img-rogue-driver_1.15.6133109.bb | 6 +- .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 + .../ti-img-rogue-umlibs_1.15.6133109.bb | 5 +- .../recipes-kernel/linux/kernel-rdepends.inc | 2 + .../ti-rtos-bin/ti-rtos-firmware.bb | 75 +++++++++++++++++++ 9 files changed, 123 insertions(+), 6 deletions(-) create mode 100644 meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/j784s4-evm.conf diff --git a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf new file mode 100644 index 00000000..04feebc6 --- /dev/null +++ b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: J784S4 EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J784S4 EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j784s4" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +UBOOT_MACHINE = "j784s4_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf new file mode 100644 index 00000000..a8ad25f6 --- /dev/null +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf @@ -0,0 +1,24 @@ +#@TYPE: Machine +#@NAME: J784S4 EVM +#@DESCRIPTION: Machine configuration for the TI J784S4 EVM + +require conf/machine/include/j7.inc + +MACHINE_FEATURES += "gpu" + +SERIAL_CONSOLES = "115200;ttyS10" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +TFA_K3_USART = "0x8" +OPTEE_K3_USART = "0x8" + +KERNEL_DEVICETREE = " \ + ti/k3-j784s4-evm.dtb \ +" + +UBOOT_MACHINE = "j784s4_evm_a72_defconfig" + +do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" + +TFA_BOARD = "j784s4" + diff --git a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb index b066a676..5ae0cb7c 100644 --- a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb @@ -10,7 +10,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "j721e|j721s2" +COMPATIBLE_MACHINE = "j721e|j721s2|j784s4" PACKAGE_ARCH = "${MACHINE_ARCH}" 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 12d21335..72dcca00 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 @@ -13,7 +13,7 @@ PR = "${INC_PR}.1" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "j721s2" +COMPATIBLE_MACHINE = "j721s2|j784s4" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -22,6 +22,7 @@ TARGET_WAVE521C = "wave521c_codec_fw.bin" SOURCE_WAVE521C = "wave521c_codec_fw.bin" SOURCE_WAVE521C:j721s2 = "wave521c_j721s2_codec_fw.bin" +SOURCE_WAVE521C:j784s4 = "wave521c_j721s2_codec_fw.bin" ALTERNATIVE_LINK_NAME[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/${TARGET_WAVE521C}" ALTERNATIVE_TARGET[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/cnm/${TARGET_WAVE521C}" diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb index 95aa3299..00bc719a 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb @@ -11,7 +11,7 @@ MACHINE_KERNEL_PR:append = "b" PR = "${MACHINE_KERNEL_PR}" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j721e|j721s2|am62xx" +COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx" DEPENDS = "virtual/kernel" @@ -27,13 +27,15 @@ SRC_URI = " \ S = "${WORKDIR}/git" -SRCREV = "6d3d62a15ceb85b719c35f34c6c9e35f556b406b" +SRCREV = "ea2ac3fda4ac442b639bc3a0b73e9c4feac2081a" TARGET_PRODUCT:j721e = "j721e_linux" TARGET_PRODUCT:j721s2 = "j721s2_linux" +TARGET_PRODUCT:j784s4 = "j784s4_linux" TARGET_PRODUCT:am62xx = "am62_linux" TARGET_BVNC:j721e = "22.104.208.318" TARGET_BVNC:j721s2 = "36.53.104.796" +TARGET_BVNC:j784s4 = "36.53.104.796" TARGET_BVNC:am62xx = "33.15.11.3" PVR_BUILD = "release" PVR_WS = "wayland" diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 2772ee22..ba74fd8c 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -35,6 +35,7 @@ SYSFW_PREFIX:j7200-evm-k3r5 = "fs" SYSFW_PREFIX:j7200-hs-evm-k3r5 = "fs" SYSFW_PREFIX:j721s2-evm-k3r5 = "fs" SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "fs" +SYSFW_PREFIX:j784s4-evm-k3r5 = "fs" SYSFW_PREFIX:am62xx-evm-k3r5 = "fs" SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs" diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb index 5d6e45b8..2abec024 100644 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb @@ -8,17 +8,18 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "gpu" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j721e|j721s2|am62xx" +COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx" PR = "r2" BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize" SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" -SRCREV = "fba0c770b712640ab3761dbe8369d43f89f616ed" +SRCREV = "4207c0ea429ec751b1ff5f831a84ceeb76ad578d" TARGET_PRODUCT:j721e = "j721e_linux" TARGET_PRODUCT:j721s2 = "j721s2_linux" +TARGET_PRODUCT:j784s4 = "j784s4_linux" TARGET_PRODUCT:am62xx = "am62_linux" PVR_BUILD ?= "release" PVR_WS = "wayland" diff --git a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc index 38289491..43cd31fe 100644 --- a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc +++ b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc @@ -23,12 +23,14 @@ 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:j721e = " cadence-mhdp-fw" RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cadence-mhdp-fw" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cadence-mhdp-fw" # Add run-time dependency for Video Decoding firmware to the rootfs RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7 = " vxd-dec-fw" # Add run-time dependency for Chips&Media Wave521 firmware to the rootfs RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cnm-wave-fw" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cnm-wave-fw" # Add run-time dependency for TIFS Low Power Module stub RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62xx = " tifs-lpm-stub" 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 219b86dc..0447bafe 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 @@ -19,6 +19,7 @@ PLAT_SFX:j7200-evm = "j7200" PLAT_SFX:j7200-hs-evm = "j7200" PLAT_SFX:j721s2-evm = "j721s2" PLAT_SFX:j721s2-hs-evm = "j721s2" +PLAT_SFX:j784s4-evm = "j784s4" PLAT_SFX:am65xx = "am65xx" PLAT_SFX:am64xx = "am64xx" PLAT_SFX:am62xx = "am62xx" @@ -245,6 +246,26 @@ do_install:j721s2-hs-evm() { # install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f ${LEGACY_ETH_FW_DIR} } +do_install:j784s4-evm() { + install -d ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu4_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu4_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71 ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_2_release_strip.xe71 ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_3_release_strip.xe71 ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_4_release_strip.xe71 ${LEGACY_IPC_FW_DIR} + # DM Firmware + install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} + # ETH firmware + install -d ${LEGACY_ETH_FW_DIR} + install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f ${LEGACY_ETH_FW_DIR} +} + do_install:am65xx() { install -d ${LEGACY_IPC_FW_DIR} install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} @@ -370,6 +391,21 @@ ALTERNATIVE:${PN}:j721s2-hs-evm = "\ j721s2-c71_1-fw-sec \ " +ALTERNATIVE:${PN}:j784s4-evm = "\ + j784s4-mcu-r5f0_0-fw \ + j784s4-mcu-r5f0_1-fw \ + j784s4-main-r5f0_0-fw \ + j784s4-main-r5f0_1-fw \ + j784s4-main-r5f1_0-fw \ + j784s4-main-r5f1_1-fw \ + j784s4-main-r5f2_0-fw \ + j784s4-main-r5f2_1-fw \ + j784s4-c71_0-fw \ + j784s4-c71_1-fw \ + j784s4-c71_2-fw \ + j784s4-c71_3-fw \ + " + # Set up link names for the firmwares TARGET_MCU_R5FSS0_0:am65xx = "am65x-mcu-r5f0_0-fw" @@ -440,6 +476,19 @@ TARGET_MAIN_R5FSS1_1_SIGNED:j721s2-hs-evm = "j721s2-main-r5f1_1-fw-sec" TARGET_C7X_0_SIGNED:j721s2-hs-evm = "j721s2-c71_0-fw-sec" TARGET_C7X_1_SIGNED:j721s2-hs-evm = "j721s2-c71_1-fw-sec" +TARGET_MCU_R5FSS0_0:j784s4-evm = "j784s4-mcu-r5f0_0-fw" +TARGET_MCU_R5FSS0_1:j784s4-evm = "j784s4-mcu-r5f0_1-fw" +TARGET_MAIN_R5FSS0_0:j784s4-evm = "j784s4-main-r5f0_0-fw" +TARGET_MAIN_R5FSS0_1:j784s4-evm = "j784s4-main-r5f0_1-fw" +TARGET_MAIN_R5FSS1_0:j784s4-evm = "j784s4-main-r5f1_0-fw" +TARGET_MAIN_R5FSS1_1:j784s4-evm = "j784s4-main-r5f1_1-fw" +TARGET_MAIN_R5FSS2_0:j784s4-evm = "j784s4-main-r5f2_0-fw" +TARGET_MAIN_R5FSS2_1:j784s4-evm = "j784s4-main-r5f2_1-fw" +TARGET_C7X_0:j784s4-evm = "j784s4-c71_0-fw" +TARGET_C7X_1:j784s4-evm = "j784s4-c71_1-fw" +TARGET_C7X_2:j784s4-evm = "j784s4-c71_2-fw" +TARGET_C7X_3:j784s4-evm = "j784s4-c71_3-fw" + ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" @@ -494,6 +543,19 @@ ALTERNATIVE_LINK_NAME[j721s2-main-r5f1_1-fw-sec] = "${base_libdir}/firmware/${TA ALTERNATIVE_LINK_NAME[j721s2-c71_0-fw-sec] = "${base_libdir}/firmware/${TARGET_C7X_0_SIGNED}" ALTERNATIVE_LINK_NAME[j721s2-c71_1-fw-sec] = "${base_libdir}/firmware/${TARGET_C7X_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" +ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f1_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_0}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f2_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS2_0}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f2_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS2_1}" +ALTERNATIVE_LINK_NAME[j784s4-c71_0-fw] = "${base_libdir}/firmware/${TARGET_C7X_0}" +ALTERNATIVE_LINK_NAME[j784s4-c71_1-fw] = "${base_libdir}/firmware/${TARGET_C7X_1}" +ALTERNATIVE_LINK_NAME[j784s4-c71_2-fw] = "${base_libdir}/firmware/${TARGET_C7X_2}" +ALTERNATIVE_LINK_NAME[j784s4-c71_3-fw] = "${base_libdir}/firmware/${TARGET_C7X_3}" + # Create the firmware alternatives ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_0_release_strip.xer5f" @@ -550,6 +612,19 @@ ALTERNATIVE_TARGET[j721s2-main-r5f1_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc ALTERNATIVE_TARGET[j721s2-c71_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71.signed" ALTERNATIVE_TARGET[j721s2-c71_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_2_release_strip.xe71.signed" +ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_0_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-main-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-main-r5f1_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-main-r5f2_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu4_0_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-main-r5f2_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu4_1_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-c71_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71" +ALTERNATIVE_TARGET[j784s4-c71_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_2_release_strip.xe71" +ALTERNATIVE_TARGET[j784s4-c71_2-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_3_release_strip.xe71" +ALTERNATIVE_TARGET[j784s4-c71_3-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_4_release_strip.xe71" + ALTERNATIVE_PRIORITY = "10" # make sure that lib/firmware, and all its contents are part of the package From patchwork Fri Nov 4 22:46:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14924 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 38DD9C63706 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web12.847.1667602019374965541 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 2644140D92 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IsgFO_gBF5lO for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 1949340D94 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id D68841636A8 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 34/50] trusted-firmware-a: Update to latest upstream master Date: Fri, 4 Nov 2022 22:46:36 +0000 Message-Id: <20221104224653.1223044-35-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15292 From: Andrew Davis Notable changes include support for J784s4. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../trusted-firmware-a/trusted-firmware-a_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 41516e06..3ccad86b 100644 --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -1,5 +1,5 @@ PV:k3 = "2.7" -SRCREV_tfa:k3 = "35f4c7295bafeb32c8bcbdfb6a3f2e74a57e732b" +SRCREV_tfa:k3 = "1309c6c805190bd376c0561597653f3f8ecd0f58" SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" COMPATIBLE_MACHINE:k3 = "k3" TFA_BUILD_TARGET:k3 = "all" From patchwork Fri Nov 4 22:46:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14916 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 199F3C3A5A7 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.808.1667602019869127690 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 075E540D9E for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gR0KmAgIWSrC for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id F1BBC40DA3 for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id E18C81636A9 for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 35/50] ti-img-rogue-*: Bump the graphics recipes Date: Fri, 4 Nov 2022 22:46:37 +0000 Message-Id: <20221104224653.1223044-36-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15303 From: Randolph Sapp Bump the graphics recipes source revision and remove the old BVNC switch. The BVNC is now baked into the platform Makefile that is selected with PVR_BUILD_DIR / TARGET_PRODUCT. Signed-off-by: Randolph Sapp Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb | 8 ++------ .../libgles/ti-img-rogue-umlibs_1.15.6133109.bb | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb index 00bc719a..fd595dea 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb @@ -27,20 +27,16 @@ SRC_URI = " \ S = "${WORKDIR}/git" -SRCREV = "ea2ac3fda4ac442b639bc3a0b73e9c4feac2081a" +SRCREV = "a353b9524399d927af8e824f92902065947b2fbe" TARGET_PRODUCT:j721e = "j721e_linux" TARGET_PRODUCT:j721s2 = "j721s2_linux" TARGET_PRODUCT:j784s4 = "j784s4_linux" TARGET_PRODUCT:am62xx = "am62_linux" -TARGET_BVNC:j721e = "22.104.208.318" -TARGET_BVNC:j721s2 = "36.53.104.796" -TARGET_BVNC:j784s4 = "36.53.104.796" -TARGET_BVNC:am62xx = "33.15.11.3" PVR_BUILD = "release" PVR_WS = "wayland" -EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" RGX_BVNC=${TARGET_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}' +EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}' do_install() { make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb index 2abec024..a665c614 100644 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb @@ -15,7 +15,7 @@ PR = "r2" BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize" SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" -SRCREV = "4207c0ea429ec751b1ff5f831a84ceeb76ad578d" +SRCREV = "5977e82b96028f783d39c7219f016c1faf8dc5f5" TARGET_PRODUCT:j721e = "j721e_linux" TARGET_PRODUCT:j721s2 = "j721s2_linux" From patchwork Fri Nov 4 22:46:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14922 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 2F104C636F8 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web09.936.1667602019395937280 for ; Fri, 04 Nov 2022 15:46:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 2C20540D94 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 44Z8nITnWj8S for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 23A4B40D8E for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id EC4281636AA for ; Fri, 4 Nov 2022 18:46:51 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 36/50] ti-img-rogue-driver: drop local patch as upstream is now fixed Date: Fri, 4 Nov 2022 22:46:38 +0000 Message-Id: <20221104224653.1223044-37-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15295 From: Denys Dmytriyenko Signed-off-by: Denys Dmytriyenko --- ...nit.c-cast-boolean-value-to-IMG_BOOL.patch | 34 ------------------- .../ti-img-rogue-driver_1.15.6133109.bb | 1 - 2 files changed, 35 deletions(-) delete mode 100644 meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch deleted file mode 100644 index 8d909279..00000000 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cc95fb4b1635bd1018d74b668430cda67731148f Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Sat, 30 Apr 2022 18:37:46 +0000 -Subject: [PATCH] rgxinit.c: cast boolean value to IMG_BOOL - -Fixes this error with GCC 11: - -| .../services/server/devices/rogue/rgxinit.c:1345:36: error: implicit conversion from 'enum ' to 'IMG_BOOL' {aka 'enum tag_img_bool'} [-Werror=enum-conversion] -| 1345 | bEnableAPM = false; -| | ^ - -Upstream-Status: Pending - -Signed-off-by: Denys Dmytriyenko ---- - services/server/devices/rogue/rgxinit.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/services/server/devices/rogue/rgxinit.c b/services/server/devices/rogue/rgxinit.c -index ca7a1b9..fc94b73 100644 ---- a/services/server/devices/rogue/rgxinit.c -+++ b/services/server/devices/rogue/rgxinit.c -@@ -1342,7 +1342,7 @@ PVRSRV_ERROR RGXInitDevPart2(PVRSRV_DEVICE_NODE *psDeviceNode, - if (bEnableAPM && (!PVRSRV_VZ_MODE_IS(NATIVE))) - { - PVR_DPF((PVR_DBG_WARNING, "%s: Active Power Management disabled in virtualization mode", __func__)); -- bEnableAPM = false; -+ bEnableAPM = (IMG_BOOL)false; - } - - #if defined(RGX_NUM_OS_SUPPORTED) && (RGX_NUM_OS_SUPPORTED > 1) && defined(SUPPORT_AUTOVZ) --- -2.25.1 - diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb index fd595dea..c9cb3f6b 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb @@ -22,7 +22,6 @@ BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize" SRC_URI = " \ git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH} \ file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \ - file://0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch \ " S = "${WORKDIR}/git" From patchwork Fri Nov 4 22:46:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14898 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 B1F49C43217 for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web12.855.1667602024714751872 for ; Fri, 04 Nov 2022 15:47:04 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 2EB4840D7C for ; Fri, 4 Nov 2022 22:47:04 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ejGDj0jqbLR1 for ; Fri, 4 Nov 2022 22:47:04 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 00DD540D9A for ; Fri, 4 Nov 2022 22:46:56 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 02E191636AB for ; Fri, 4 Nov 2022 18:46:52 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 37/50] j721s2 and j784s4: Correct serial console device Date: Fri, 4 Nov 2022 22:46:39 +0000 Message-Id: <20221104224653.1223044-38-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15323 From: Ryan Eatmon Serial console in J721S2/J784S4 EVM config was set to ttyS10. It should be ttyS2. This caused sysv based systems (eg, tiny) to apparently hang because of no login prompt. This didn't show up as a problem on systemd systems (eg, default) because systemd will automatically setup a serial tty with the console option passed in on the kernel command line (using console=...), which U-Boot correctly passes in as ttyS2 for J721S2/J784S4. Signed-off-by: Jonathan Humphreys Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/j721s2-evm.conf | 2 +- meta-ti-bsp/conf/machine/j784s4-evm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index 77fc3e66..46d5dbf6 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf @@ -4,7 +4,7 @@ require conf/machine/include/j721s2.inc -SERIAL_CONSOLES = "115200;ttyS10" +SERIAL_CONSOLES = "115200;ttyS2" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" OPTEE_K3_USART = "0x8" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf index a8ad25f6..278b393c 100644 --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf @@ -6,7 +6,7 @@ require conf/machine/include/j7.inc MACHINE_FEATURES += "gpu" -SERIAL_CONSOLES = "115200;ttyS10" +SERIAL_CONSOLES = "115200;ttyS2" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" OPTEE_K3_USART = "0x8" From patchwork Fri Nov 4 22:46:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14910 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 02C70C4708A for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.831.1667602019911137694 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 1A9D840DA3 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UYXiBiW8DmvS for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 109D140D99 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 047CC1636AD for ; Fri, 4 Nov 2022 18:46:52 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 38/50] optee-os: Update SRCREV for OP-TEE TRNG in J784S4 Date: Fri, 4 Nov 2022 22:46:40 +0000 Message-Id: <20221104224653.1223044-39-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15307 From: Jayesh Choudhary Update the SRCREV to the commit when sa3ul support was added in upstream OP-TEE for J784S4 platform to access rng. Signed-off-by: Jayesh Choudhary Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend index 3c4383ba..ee6ee458 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend @@ -1,5 +1,5 @@ PV:ti-soc = "3.18.0+git${SRCPV}" -SRCREV:ti-soc = "8e155bae3a5eb9d1a3ed9260bd7281a7a35f5086" +SRCREV:ti-soc = "6bf4a81a8f5388e6cb6b1d7e8ebe57c5089c0954" EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" From patchwork Fri Nov 4 22:46:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14913 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 0FE71C4708D for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web12.850.1667602019914662810 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 2345440D99 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EyBwLKOqLRRG for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 1986740DA0 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 0F7D71636AE for ; Fri, 4 Nov 2022 18:46:52 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 39/50] conf: machine: j784s4: Add OP-TEE flavour Date: Fri, 4 Nov 2022 22:46:41 +0000 Message-Id: <20221104224653.1223044-40-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15305 From: Jayesh Choudhary Add the new OP-TEE flavour for J784S4 instead of default k3-j721e. The TI-SCI ID for MCU domain sa2ul/sa3ul are not the same for J721E and J784S4. So a new flavour is added in upstream OP-TEE. Signed-off-by: Jayesh Choudhary Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/j784s4-evm.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf index 278b393c..96acca13 100644 --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf @@ -9,6 +9,7 @@ MACHINE_FEATURES += "gpu" SERIAL_CONSOLES = "115200;ttyS2" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" +OPTEEMACHINE = "k3-j784s4" OPTEE_K3_USART = "0x8" KERNEL_DEVICETREE = " \ From patchwork Fri Nov 4 22:46:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14914 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 03256C4708B for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.809.1667602020165885252 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 3510640DA7 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lGJx7Lyyfcnx for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 2AA0C40DA0 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 1A2CF1636B0 for ; Fri, 4 Nov 2022 18:46:52 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 40/50] conf: machine: j721s2: Add OP-TEE flavour Date: Fri, 4 Nov 2022 22:46:42 +0000 Message-Id: <20221104224653.1223044-41-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15308 From: Jayesh Choudhary Change the OP-TEE flavour from default k3-j721e to k3-j784s4 as sa3ul support for j784s4 is upstreamed in OP-TEE and we can use the same settings in j721s2 to access TRNG. Signed-off-by: Jayesh Choudhary Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/j721s2-evm.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index 46d5dbf6..37353df4 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf @@ -7,6 +7,7 @@ require conf/machine/include/j721s2.inc SERIAL_CONSOLES = "115200;ttyS2" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" +OPTEEMACHINE = "k3-j784s4" OPTEE_K3_USART = "0x8" KERNEL_DEVICETREE = " \ From patchwork Fri Nov 4 22:46:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14909 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 025DBC3A5A3 for ; Fri, 4 Nov 2022 22:47:09 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.832.1667602020216604430 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 35B2C40DA9 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4mNBYb6W0u0o for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 2B6F140DA1 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 24F671636B2 for ; Fri, 4 Nov 2022 18:46:52 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 41/50] optee-os: Enable TRNG driver as OP-TEE support is added Date: Fri, 4 Nov 2022 22:46:43 +0000 Message-Id: <20221104224653.1223044-42-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15309 From: Jayesh Choudhary OP-TEE upstream now has support for sa3ul for j721s2 platform. Re-enable the trng driver which was disabled earlier. Signed-off-by: Jayesh Choudhary Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend index ee6ee458..9cb3f503 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend @@ -4,7 +4,6 @@ SRCREV:ti-soc = "6bf4a81a8f5388e6cb6b1d7e8ebe57c5089c0954" EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" EXTRA_OEMAKE:append:am62xx = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1" -EXTRA_OEMAKE:append:j721s2 = " CFG_WITH_SOFTWARE_PRNG=y" do_compile:prepend:ti-soc() { export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} From patchwork Fri Nov 4 22:46:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14911 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 EB3D2C3A59F for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web08.829.1667602020283232420 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 3B84940DA0 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m1ixH_NMaX5a for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 2EE1740DA5 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 2FADA1636B4 for ; Fri, 4 Nov 2022 18:46:52 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 42/50] cnm-wave-fw: update firmware name to wave521c_k3_codec_fw.bin Date: Fri, 4 Nov 2022 22:46:44 +0000 Message-Id: <20221104224653.1223044-43-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15310 From: Ryan Eatmon update firmware name to wave521c_k3_codec_fw.bin to align with linux-firmware main branch. the following patch is part of ti-linux-firmware thru mainline sync. commit 48407ffd ("cnm: update chips&media wave521c firmware.") Signed-off-by: Praneeth Bajjuri Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb | 4 +--- 1 file changed, 1 insertion(+), 3 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 72dcca00..0e8ed897 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 @@ -20,9 +20,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" S = "${WORKDIR}/git" TARGET_WAVE521C = "wave521c_codec_fw.bin" -SOURCE_WAVE521C = "wave521c_codec_fw.bin" -SOURCE_WAVE521C:j721s2 = "wave521c_j721s2_codec_fw.bin" -SOURCE_WAVE521C:j784s4 = "wave521c_j721s2_codec_fw.bin" +SOURCE_WAVE521C = "wave521c_k3_codec_fw.bin" ALTERNATIVE_LINK_NAME[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/${TARGET_WAVE521C}" ALTERNATIVE_TARGET[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/cnm/${TARGET_WAVE521C}" From patchwork Fri Nov 4 22:46:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14906 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 E3AB3C47088 for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.833.1667602020322523875 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 4578D40DA5 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qdXzFjEHOAEf for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 3C21040DA1 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 3A6AC1636B5 for ; Fri, 4 Nov 2022 18:46:52 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 43/50] ti-linux-fw: update to the latest Date: Fri, 4 Nov 2022 22:46:45 +0000 Message-Id: <20221104224653.1223044-44-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15311 From: Denys Dmytriyenko This matches current version in Dunfell. Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 5d9e1979..0b2e8bd6 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 @@ -20,12 +20,12 @@ IMG_DEC_FW_VERSION = "1.0" CNM_WAVE521_FW_VERSION = "1.0.00" TIFS_LPM_STUB_FW_VERSION = "08.03.02" -TI_LINUX_FW_SRCREV ?= "5f34a3a9bd5a9c93974ffec41da81b916f794efc" +TI_LINUX_FW_SRCREV ?= "7875237b357ecf27300658e65e9927cef7e299ed" SRCREV = "${TI_LINUX_FW_SRCREV}" BRANCH ?= "ti-linux-firmware" -K3_IMAGE_GEN_SRCREV ?= "91a75b17c616a5cc41b3345905dccba5c29aca66" +K3_IMAGE_GEN_SRCREV ?= "a9a43d5effcd17b4f3364cc7e6d483abd7f56e0f" SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}" SRCREV_FORMAT = "imggen" From patchwork Fri Nov 4 22:46:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14912 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 E3B00C47089 for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.834.1667602020375412737 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id B2D3A40D81 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rhjk3Rak9IzN for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id A674140D86 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 452E61636B6 for ; Fri, 4 Nov 2022 18:46:52 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 44/50] u-boot-ti-staging: update to the latest Date: Fri, 4 Nov 2022 22:46:46 +0000 Message-Id: <20221104224653.1223044-45-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15312 From: Denys Dmytriyenko This matches current version in Dunfell. Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb index bac87cf4..1640d042 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb @@ -6,4 +6,4 @@ PR = "r33" BRANCH = "ti-u-boot-2021.01" -SRCREV = "1c29865c3106a1e6c8e2036601ff61a8bf70590b" +SRCREV = "78a217ca9ea687ee5c3e7dd3a339a1f7d136e93d" From patchwork Fri Nov 4 22:46:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14908 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 DAD8CC3A59E for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web08.830.1667602020444446658 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id B3F0140DAA for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VXoywcHrZP3w for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id A80FA40D8A for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 500001636B7 for ; Fri, 4 Nov 2022 18:46:52 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 45/50] linux-ti-staging: update to the latest Date: Fri, 4 Nov 2022 22:46:47 +0000 Message-Id: <20221104224653.1223044-46-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15313 From: Denys Dmytriyenko This matches current version in Dunfell. Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 4 ++-- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb index 14775d15..e872b86e 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb @@ -6,5 +6,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:" BRANCH = "ti-rt-linux-5.10.y" -SRCREV = "614438c4da01dd40a99d7c4165f3c86f82f000a3" -PV = "5.10.120+git${SRCPV}" +SRCREV = "fe20c3f42e9028a31cb79439c40d3e18d2207342" +PV = "5.10.145+git${SRCPV}" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb index 84224c5c..fdb34a84 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb @@ -25,8 +25,8 @@ S = "${WORKDIR}/git" BRANCH = "ti-linux-5.10.y" -SRCREV = "553874e9bc2cd24265c7b56692e1eb29d5f46b17" -PV = "5.10.120+git${SRCPV}" +SRCREV = "8b51d20b6e6e1b9277b59b7aaed8a97eff43097f" +PV = "5.10.145+git${SRCPV}" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild MACHINE_KERNEL_PR:append = "b" From patchwork Fri Nov 4 22:46:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14905 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 D3E43C07E9D for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.835.1667602020477946850 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id BE7A340D86 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3ukalhuNTsJW for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id B329340DA1 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 518FB1636B8 for ; Fri, 4 Nov 2022 18:46:52 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 46/50] ti-k3-secdev: include ti-paths.inc Date: Fri, 4 Nov 2022 22:46:48 +0000 Message-Id: <20221104224653.1223044-47-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15314 From: Denys Dmytriyenko Include ti-paths.inc so TI_K3_SECDEV_INSTALL_DIR_RECIPE gets defined and artifacts are installed in the correct location. Cc: Andrew Davis Signed-off-by: Denys Dmytriyenko --- meta-ti-extras/recipes-ti/secdev/ti-k3-secdev_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-ti-extras/recipes-ti/secdev/ti-k3-secdev_git.bb b/meta-ti-extras/recipes-ti/secdev/ti-k3-secdev_git.bb index 7a5dd573..3763c339 100644 --- a/meta-ti-extras/recipes-ti/secdev/ti-k3-secdev_git.bb +++ b/meta-ti-extras/recipes-ti/secdev/ti-k3-secdev_git.bb @@ -4,6 +4,8 @@ SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://manifest/k3-secdev-0.2-manifest.html;md5=f632a78870cc64550078d7b3cbac0892" +require recipes-ti/includes/ti-paths.inc + # Native host tool only COMPATIBLE_MACHINE = "null" COMPATIBLE_MACHINE:class-native = "(.*)" From patchwork Fri Nov 4 22:46:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14907 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 D4231C46467 for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web09.939.1667602020512655924 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id BEFAD40D87 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4M5PogWg3-JA for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id B546440DAB for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 5CAE51636B9 for ; Fri, 4 Nov 2022 18:46:52 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 47/50] ti-sci-fw: use getVar() to check if TI_SECURE_DEV_PKG_K3 is defined Date: Fri, 4 Nov 2022 22:46:49 +0000 Message-Id: <20221104224653.1223044-48-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15315 From: Denys Dmytriyenko Otherwise undefined variable is returned literally as ${TI_SECURE_DEV_PKG_K3} and the condition won't work. Cc: Andrew Davis Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index ba74fd8c..e89a6855 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -20,7 +20,7 @@ COMPATIBLE_MACHINE:aarch64 = "null" PACKAGE_ARCH = "${MACHINE_ARCH}" -TI_SECURE_DEV_PKG = "${@ '${TI_SECURE_DEV_PKG_K3}' or '${TI_K3_SECDEV_INSTALL_DIR}' }" +TI_SECURE_DEV_PKG = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or '${TI_K3_SECDEV_INSTALL_DIR}' }" export TI_SECURE_DEV_PKG SYSFW_SOC ?= "unknown" From patchwork Fri Nov 4 22:46:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14904 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 CEA19C4167E for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web12.851.1667602020564784718 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id DA48940DA6 for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4OM1WMUNHB4O for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id D0B3340D8A for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 675D91636BA for ; Fri, 4 Nov 2022 18:46:52 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 48/50] ti-img-rogue-driver: Bump the source revision Date: Fri, 4 Nov 2022 22:46:50 +0000 Message-Id: <20221104224653.1223044-49-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15316 From: Randolph Sapp Bump the source revision for the rogue pvr kernel module. Source changelog: - A hack was added to increase stability on J7 platforms while we are looking into a proper fix for cache coherency issues in this module Signed-off-by: Randolph Sapp Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb index c9cb3f6b..b4d19195 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb @@ -26,7 +26,7 @@ SRC_URI = " \ S = "${WORKDIR}/git" -SRCREV = "a353b9524399d927af8e824f92902065947b2fbe" +SRCREV = "c901804e8221d477983a6f7224a9cdc6e832f050" TARGET_PRODUCT:j721e = "j721e_linux" TARGET_PRODUCT:j721s2 = "j721s2_linux" From patchwork Fri Nov 4 22:46:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14903 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 C743AC41535 for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web08.831.1667602020605161633 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id E062640D8A for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ktLvGap5s8fh for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id D72EB40DA1 for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 723E2163677 for ; Fri, 4 Nov 2022 18:46:52 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 49/50] optee-os: Upgrade to upstream 3.19.0 Date: Fri, 4 Nov 2022 22:46:51 +0000 Message-Id: <20221104224653.1223044-50-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15317 From: Praneeth Bajjuri Update to the latest upstream master which is 3.19.0. Signed-off-by: Praneeth Bajjuri Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend index 9cb3f503..6913851b 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend @@ -1,5 +1,5 @@ -PV:ti-soc = "3.18.0+git${SRCPV}" -SRCREV:ti-soc = "6bf4a81a8f5388e6cb6b1d7e8ebe57c5089c0954" +PV:ti-soc = "3.19.0+git${SRCPV}" +SRCREV:ti-soc = "afacf356f9593a7f83cae9f96026824ec242ff52" EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" From patchwork Fri Nov 4 22:46:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14902 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 BF428C433FE for ; Fri, 4 Nov 2022 22:47:08 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web08.832.1667602020641868297 for ; Fri, 04 Nov 2022 15:47:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id E9FA640D8C for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VzrWqIe08iYe for ; Fri, 4 Nov 2022 22:46:58 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id D612C40D8D for ; Fri, 4 Nov 2022 22:46:57 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 7D4521636BB for ; Fri, 4 Nov 2022 18:46:52 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 50/50] cmem-mod: Remove CMEM kernel module Date: Fri, 4 Nov 2022 22:46:52 +0000 Message-Id: <20221104224653.1223044-51-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104224653.1223044-1-denis@denix.org> References: <20221104224653.1223044-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 22:47:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15319 From: Andrew Davis CMEM has been deprecated for removal for some time now. All users should have migrated to the Linux upstream DMA-BUF Heaps framework. Remove CMEM. We only remove the kernel module part in this patch to prevent builds from breaking in the meta-arago layer due to dependencies on the CMEM library. These packages should either be updated or disabled. After that we will remove the library. Signed-off-by: Andrew Davis Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-bsp/cmem/cmem-mod_git.bb | 18 ---- meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb | 2 - meta-ti-bsp/recipes-kernel/linux/cmem.inc | 96 ------------------- .../recipes-kernel/linux/files/cmem.dtsi | 38 -------- .../linux/files/dra7xx/cmem-am571x.dtsi | 29 ------ .../dra7xx/cmem-am5729-beagleboneai.dtsi | 40 -------- .../linux/files/dra7xx/cmem-am572idk.dtsi | 40 -------- .../linux/files/dra7xx/cmem-am574x.dtsi | 40 -------- .../linux/files/dra7xx/cmem-dra71x.dtsi | 29 ------ .../linux/files/dra7xx/cmem-dra72x.dtsi | 29 ------ .../linux/files/dra7xx/cmem-dra76x.dtsi | 29 ------ .../linux/files/dra7xx/cmem.dtsi | 40 -------- .../linux/linux-ti-staging_5.10.bb | 1 - 13 files changed, 431 deletions(-) delete mode 100644 meta-ti-bsp/recipes-bsp/cmem/cmem-mod_git.bb delete mode 100644 meta-ti-bsp/recipes-kernel/linux/cmem.inc delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/cmem.dtsi delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am571x.dtsi delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am574x.dtsi delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra71x.dtsi delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra72x.dtsi delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi delete mode 100644 meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem.dtsi diff --git a/meta-ti-bsp/recipes-bsp/cmem/cmem-mod_git.bb b/meta-ti-bsp/recipes-bsp/cmem/cmem-mod_git.bb deleted file mode 100644 index ea2cc5f4..00000000 --- a/meta-ti-bsp/recipes-bsp/cmem/cmem-mod_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Kernel module for contiguous memory allocation from userspace" - -include cmem.inc - -# This package builds a kernel module, use kernel PR as base and append a local -MACHINE_KERNEL_PR:append = "a" -PR = "${MACHINE_KERNEL_PR}" - -inherit module - -EXTRA_OEMAKE += '-f lu.mak KERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" TOOLCHAIN_PREFIX="${TOOLCHAIN_PREFIX}" EXEC_DIR="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra"' -MAKE_TARGETS = "module" - -KERNEL_MODULE_AUTOLOAD += "cmemk" - -do_install:prepend() { - cp ${B}/src/cmem/module/Module.symvers ${B}/ || true -} diff --git a/meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb b/meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb index f69c22fb..2042b08a 100644 --- a/meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb +++ b/meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb @@ -2,8 +2,6 @@ DESCRIPTION = "The cmem component supports contiguous memory allocation from use include cmem.inc -RDEPENDS:${PN} = "cmem-mod" - PR = "r0" PACKAGES =+ "${PN}-test" diff --git a/meta-ti-bsp/recipes-kernel/linux/cmem.inc b/meta-ti-bsp/recipes-kernel/linux/cmem.inc deleted file mode 100644 index fd913f6c..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/cmem.inc +++ /dev/null @@ -1,96 +0,0 @@ -# Add concept of machine variants to split DTBs into subsets -# -# Use these for temporary overrides -CMEM_MACHINE = "${MACHINE}" -CMEM_MACHINE:am57xx-evm = "am571x am572x am572idk am5729-beagleboneai am574x" -CMEM_MACHINE:am57xx-hs-evm = "am571x am572x am572idk am5729-beagleboneai am574x" -CMEM_MACHINE:dra7xx-evm = "dra71x dra72x dra74x dra76x" -CMEM_MACHINE:dra7xx-hs-evm = "dra71x dra72x dra74x dra76x" - -# Set cmem.dtsi per machine or machine variant -CMEM_DTSI = "cmem.dtsi" -CMEM_DTSI_am571x = "cmem-am571x.dtsi" -CMEM_DTSI_am572idk = "cmem-am572idk.dtsi" -CMEM_DTSI_am5729-beagleboneai = "cmem-am5729-beagleboneai.dtsi" -CMEM_DTSI_am574x = "cmem-am574x.dtsi" -CMEM_DTSI_dra71x = "cmem-dra71x.dtsi" -CMEM_DTSI_dra72x = "cmem-dra72x.dtsi" -CMEM_DTSI_dra76x = "cmem-dra76x.dtsi" - -# Split device trees between variants -CMEM_DEVICETREE = "${KERNEL_DEVICETREE}" -CMEM_DEVICETREE_am571x = "am571x-idk.dtb am571x-idk-lcd-osd101t2045.dtb am571x-idk-lcd-osd101t2587.dtb" -CMEM_DEVICETREE_am572x = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revc.dtb" -CMEM_DEVICETREE_am572idk = "am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb" -CMEM_DEVICETREE_am5729-beagleboneai = "am5729-beagleboneai.dtb" -CMEM_DEVICETREE_am574x = "am574x-idk.dtb am574x-idk-lcd-osd101t2587.dtb" -CMEM_DEVICETREE_dra71x = "dra71-evm.dtb" -CMEM_DEVICETREE_dra72x = "dra72-evm.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \ - dra72-evm-revc.dtb dra72-evm-revc-lcd-osd101t2045.dtb dra72-evm-revc-lcd-osd101t2587.dtb" -CMEM_DEVICETREE_dra74x = "dra7-evm.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb" -CMEM_DEVICETREE_dra76x = "dra76-evm.dtb dra76-evm-tfp410.dtb" - -# Flag to enable CMEM injection -RESERVE_CMEM ?= "0" - -# Variables which influence setup_cmem -CMEM_VARS = "RESERVE_CMEM CMEM_MACHINE" -CMEM_VARS += "CMEM_DTSI ${@' '.join(map(lambda s: 'CMEM_DTSI_' + s, (d.getVar('CMEM_MACHINE') or '').split()))}" -CMEM_VARS += "CMEM_DEVICETREE ${@' '.join(map(lambda s: 'CMEM_DEVICETREE_' + s, (d.getVar('CMEM_MACHINE') or '').split()))}" - -# Add correct cmem.dtsi to SRC_URI for each variant for a given machine -python do_unpack() { - old_overrides = d.getVar('OVERRIDES', False) - - # Initialize with empty string to simplify logic to append to SRC_URI - cmem_dtsi = set(['']) - - for cmem_machine in (d.getVar('CMEM_MACHINE') or '').split(): - # Create copy of data for additional override - localdata = bb.data.createCopy(d) - localdata.setVar('OVERRIDES', '%s:%s' % (cmem_machine, old_overrides)) - bb.data.update_data(localdata) - - cmem_dtsi.add(localdata.getVar('CMEM_DTSI')) - - d.appendVar('SRC_URI', ' file://'.join(cmem_dtsi)) - bb.build.exec_func('base_do_unpack', d) -} - -python do_setup_cmem() { - import shutil - - old_overrides = d.getVar('OVERRIDES', False) - - if d.getVar('RESERVE_CMEM') is '1': - for cmem_machine in (d.getVar('CMEM_MACHINE') or '').split(): - # Create copy of data for additional override - localdata = bb.data.createCopy(d) - localdata.setVar('OVERRIDES', '%s:%s' % (cmem_machine, old_overrides)) - bb.data.update_data(localdata) - - # Get source directory and dtsi filename - src_dir = localdata.getVar('WORKDIR') - src_dtsi = localdata.getVar('CMEM_DTSI') - - # Get destination directory and destination dtsi filename which adds - # the MACHINE prefix. - dst_dir = os.path.join(localdata.getVar('S'), localdata.expand('arch/${ARCH}/boot/dts')) - dst_dtsi = localdata.expand('${MACHINE}-${CMEM_DTSI}') - - # Copy cmem.dtsi into source tree - if localdata.getVar('ARCH') is 'arm64': - shutil.copy(os.path.join(src_dir,src_dtsi), os.path.join(dst_dir,'ti',dst_dtsi)) - else: - shutil.copy(os.path.join(src_dir,src_dtsi), os.path.join(dst_dir,dst_dtsi)) - - # Inject dtsi into each dts in list - for dtb in (localdata.getVar('CMEM_DEVICETREE') or '').split(): - dts = dtb[:-4] + '.dts' - - with open(os.path.join(dst_dir,dts), 'a') as dts_file: - dts_file.write('\n#include "%s"\n' % dst_dtsi) -} - -do_patch[postfuncs] += "do_setup_cmem" -do_patch[vardeps] += "${CMEM_VARS}" diff --git a/meta-ti-bsp/recipes-kernel/linux/files/cmem.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/cmem.dtsi deleted file mode 100644 index 23119861..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/cmem.dtsi +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This is a placeholder for CMEM reserved memory declarations. This - * is simply an example and does not actually reserve any memory for - * CMEM. - * - * The commented sections below provide an example for how to provide - * a reserved memory region for CMEM to use as a buffer pool. - */ -/ { -/* - reserved-memory { - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x0a000000>; - no-map; - status = "okay"; - }; - }; -*/ - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "disabled"; -/* - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x0a000000>; - }; -*/ - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am571x.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am571x.dtsi deleted file mode 100644 index ebd61296..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am571x.dtsi +++ /dev/null @@ -1,29 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x0c000000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x0c000000>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi deleted file mode 100644 index e0511d08..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am5729-beagleboneai.dtsi +++ /dev/null @@ -1,40 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x18000000>; - no-map; - status = "okay"; - }; - - cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 { - reg = <0x0 0x40500000 0x0 0x100000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x18000000>; - }; - - cmem_block_1: cmem_block@1 { - reg = <1>; - memory-region = <&cmem_block_mem_1_ocmc3>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi deleted file mode 100644 index 6c39e22c..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am572idk.dtsi +++ /dev/null @@ -1,40 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x20000000>; - no-map; - status = "okay"; - }; - - cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 { - reg = <0x0 0x40500000 0x0 0x100000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x20000000>; - }; - - cmem_block_1: cmem_block@1 { - reg = <1>; - memory-region = <&cmem_block_mem_1_ocmc3>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am574x.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am574x.dtsi deleted file mode 100644 index 8fb3e871..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-am574x.dtsi +++ /dev/null @@ -1,40 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x18000000>; - no-map; - status = "okay"; - }; - - cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 { - reg = <0x0 0x40500000 0x0 0x100000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x18000000>; - }; - - cmem_block_1: cmem_block@1 { - reg = <1>; - memory-region = <&cmem_block_mem_1_ocmc3>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra71x.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra71x.dtsi deleted file mode 100644 index ebd61296..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra71x.dtsi +++ /dev/null @@ -1,29 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x0c000000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x0c000000>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra72x.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra72x.dtsi deleted file mode 100644 index ebd61296..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra72x.dtsi +++ /dev/null @@ -1,29 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x0c000000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x0c000000>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi deleted file mode 100644 index 9d207db5..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem-dra76x.dtsi +++ /dev/null @@ -1,29 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x18000000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x18000000>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem.dtsi b/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem.dtsi deleted file mode 100644 index c7781c48..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/files/dra7xx/cmem.dtsi +++ /dev/null @@ -1,40 +0,0 @@ -/ { - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - cmem_block_mem_0: cmem_block_mem@a0000000 { - reg = <0x0 0xa0000000 0x0 0x0c000000>; - no-map; - status = "okay"; - }; - - cmem_block_mem_1_ocmc3: cmem_block_mem@40500000 { - reg = <0x0 0x40500000 0x0 0x100000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; - - #pool-size-cells = <2>; - - status = "okay"; - - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x0 0x0c000000>; - }; - - cmem_block_1: cmem_block@1 { - reg = <1>; - memory-region = <&cmem_block_mem_1_ocmc3>; - }; - }; -}; diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb index fdb34a84..a0af03c5 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb @@ -7,7 +7,6 @@ inherit kernel DEFCONFIG_BUILDER = "${S}/ti_config_fragments/defconfig_builder.sh" require recipes-kernel/linux/setup-defconfig.inc -require recipes-kernel/linux/cmem.inc require recipes-kernel/linux/ti-uio.inc require recipes-kernel/linux/bundle-devicetree.inc require recipes-kernel/linux/kernel-rdepends.inc