From patchwork Mon Mar 20 11:24:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 21395 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 C5003C7EE2C for ; Mon, 20 Mar 2023 11:25:03 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.11359.1679311496755404438 for ; Mon, 20 Mar 2023 04:24:56 -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 1C07A40CA2 for ; Mon, 20 Mar 2023 11:24: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 D6rA6K2iSZBm for ; Mon, 20 Mar 2023 11:24: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 C6A7940301 for ; Mon, 20 Mar 2023 11:24:54 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id DC7821637D4 for ; Mon, 20 Mar 2023 07:24:20 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master][PATCH 16/53] machine: Add AM62x HS-SE evm configuration Date: Mon, 20 Mar 2023 11:24:15 +0000 Message-Id: <20230320112452.2813505-17-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230320112452.2813505-1-denis@denix.org> References: <20230320112452.2813505-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 ; Mon, 20 Mar 2023 11:25:03 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16173 From: Chirag Shilwant Lets add the basic AM62x HS-SE configuration. - Add machine conf for AM62x HS-SE. - The wic images will boot on AM62x GP devices by default. - To boot on AM62x HS-SE, simply switch out the SYSFW image: $ cd /mnt/sd-card/boot $ mv tiboot3-am62x-hs-evm.bin tiboot3.bin - Add ti-sci-firmware overrides. - Add support to sign ATF and OPTEE. Signed-off-by: Chirag Shilwant Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- ...-evm-k3r5.conf => am62xx-evm-k3r5-gp.conf} | 3 +++ .../conf/machine/am62xx-evm-k3r5-hs-se.conf | 21 +++++++++++++++++++ meta-ti-bsp/conf/machine/am62xx-evm.conf | 4 ++++ meta-ti-bsp/conf/machine/include/am62xx.inc | 8 +++++++ .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 ++- 5 files changed, 38 insertions(+), 1 deletion(-) rename meta-ti-bsp/conf/machine/{am62xx-evm-k3r5.conf => am62xx-evm-k3r5-gp.conf} (67%) create mode 100644 meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf similarity index 67% rename from meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf rename to meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf index 724a8d4a..d9867bc7 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf @@ -9,3 +9,6 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" UBOOT_MACHINE = "am62x_evm_r5_defconfig" + +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/am62xx-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf new file mode 100644 index 00000000..7bca513a --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf @@ -0,0 +1,21 @@ +#@TYPE: Machine +#@NAME: AM62xx HS-SE EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx 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 = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +SYSFW_TIBOOT3_SYMLINK = "" + +UBOOT_MACHINE = "am62x_evm_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf index 73859d5f..96355411 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf @@ -12,3 +12,7 @@ KERNEL_DEVICETREE = " \ " UBOOT_MACHINE = "am62x_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/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index 98df24b2..53e48610 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -8,6 +8,14 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +BBMULTICONFIG = "k3r5-gp" +do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on AM62x is for GP, add a version for HS-SE +BBMULTICONFIG += "k3r5-hs-se" +IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" + TFA_BOARD = "lite" TFA_K3_SYSTEM_SUSPEND = "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 77709689..798131d4 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,7 +37,8 @@ SYSFW_PREFIX:j721s2-evm-k3r5 = "fs" SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "fs" SYSFW_PREFIX:j784s4-evm-k3r5 = "fs" SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs" -SYSFW_PREFIX:am62xx-evm-k3r5 = "fs" +SYSFW_PREFIX:am62xx-evm-k3r5-gp = "fs" +SYSFW_PREFIX:am62xx-evm-k3r5-hs-se = "fs" SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs" SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs" SYSFW_PREFIX:am62axx-evm-k3r5 = "fs"