From patchwork Mon Mar 20 03:38:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 21253 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 E9741C761A6 for ; Mon, 20 Mar 2023 03:39:28 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.6323.1679283568127797935 for ; Sun, 19 Mar 2023 20:39:28 -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 3636240CB2 for ; Mon, 20 Mar 2023 03:39:27 +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 enffRkZrOhoK for ; Mon, 20 Mar 2023 03:39:27 +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 2A15D40CA8 for ; Mon, 20 Mar 2023 03:39:27 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 196CE1637CD for ; Sun, 19 Mar 2023 23:38:55 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master][PATCH 21/53] am62xx-lp-evm: Add AM62x LP HS-FS evm configuration Date: Mon, 20 Mar 2023 03:38:53 +0000 Message-Id: <20230320033925.1306823-22-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230320033925.1306823-1-denis@denix.org> References: <20230320033925.1306823-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 03:39:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16075 From: Chirag Shilwant Lets add the basic AM62x LP HS-FS configuration - Add machine conf for AM62x LP HS-FS. - The wic images will boot on AM62x LP HS-FS devices by default. - The sysfw image for HS-SE will be packaged in the wic image as tiboot3-am62x-hs-evm.bin. - Add ti-sci-firmware overrides. Signed-off-by: Chirag Shilwant Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf | 14 ++++++++++++++ .../conf/machine/am62xx-lp-evm-k3r5-hs-se.conf | 7 +++++++ meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 7 ++++++- meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 + 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf new file mode 100644 index 00000000..9026b67c --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM62xx LPSK HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx LP HS-FS EVM (R5F core) + +# Booting HS-FS requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":k3r5-hs-fs" + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf index 11e70342..c126de0f 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf @@ -11,4 +11,11 @@ SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" +SYSFW_TIBOOT3_SYMLINK = "" + UBOOT_MACHINE = "am62x_lpsk_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/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc index df113003..d37d4673 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc @@ -8,8 +8,13 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_SYSTEM_SUSPEND = "1" -# Default tiboot3.bin on AM62x LP is for HS-SE +# Default tiboot3.bin on AM62x LP is for HS-FS +BBMULTICONFIG = "k3r5-hs-fs" +do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on AM62x LP is for HS-FS, 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" 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 8004c227..75b9f8a6 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 @@ -42,6 +42,7 @@ SYSFW_PREFIX:am62xx-evm-k3r5-hs-se = "fs" SYSFW_PREFIX:am62xx-evm-k3r5-hs-fs = "fs" SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs" SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs" +SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-fs = "fs" SYSFW_PREFIX:am62axx-evm-k3r5 = "fs" SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"