From patchwork Mon Jan 30 08:52:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chirag Shilwant X-Patchwork-Id: 18801 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 EA198C54EAA for ; Mon, 30 Jan 2023 08:52:56 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web10.36613.1675068770020767552 for ; Mon, 30 Jan 2023 00:52:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=rmGSOMrp; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: c-shilwant@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 30U8qkgu039362; Mon, 30 Jan 2023 02:52:46 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1675068766; bh=Mk8SMkslTiYDG7yg+MvD/CIW/MEmYr8evC8p2rBjdLg=; h=From:To:CC:Subject:Date; b=rmGSOMrp1jgGbTmGCD4ntl+O9CoVAz0TRgdauMOyUnzi0S0OSKIp2GKNiTh71JrF5 IAdjIlI3E1WDXCWUNB3RceaUIfaGsRO/pOfc/vCuYFGUcaonG0wCoR823PmREnXyC4 mlE/KGhe9JyOfyItIo9TnQibhkIf/+xtCHtzBRe4= Received: from DFLE102.ent.ti.com (dfle102.ent.ti.com [10.64.6.23]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 30U8qkfL025962 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 30 Jan 2023 02:52:46 -0600 Received: from DFLE106.ent.ti.com (10.64.6.27) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Mon, 30 Jan 2023 02:52:46 -0600 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Mon, 30 Jan 2023 02:52:46 -0600 Received: from localhost (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 30U8qiJP021504; Mon, 30 Jan 2023 02:52:45 -0600 From: Chirag Shilwant To: Praneeth Bajjuri , Denys Dmytriyenko , Ryan Eatmon , CC: Sai Sree Kartheek Adivi , Paresh Bhagat , Gyan Gupta Subject: [meta-ti][dunfell][PATCH v3] machine: Add AM62x HS-SE evm configuration Date: Mon, 30 Jan 2023 14:22:41 +0530 Message-ID: <20230130085241.1495968-1-c-shilwant@ti.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 30 Jan 2023 08:52:56 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15696 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 --- ...-evm-k3r5.conf => am62xx-evm-k3r5-gp.conf} | 3 +++ conf/machine/am62xx-evm-k3r5-hs-se.conf | 21 +++++++++++++++++++ conf/machine/am62xx-evm.conf | 4 ++++ conf/machine/include/am62xx.inc | 11 ++++++++-- recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 3 ++- .../trusted-firmware-a_%.bbappend | 4 ++++ recipes-security/optee/optee-os_%.bbappend | 4 ++++ 7 files changed, 47 insertions(+), 3 deletions(-) rename conf/machine/{am62xx-evm-k3r5.conf => am62xx-evm-k3r5-gp.conf} (67%) create mode 100644 conf/machine/am62xx-evm-k3r5-hs-se.conf diff --git a/conf/machine/am62xx-evm-k3r5.conf b/conf/machine/am62xx-evm-k3r5-gp.conf similarity index 67% rename from conf/machine/am62xx-evm-k3r5.conf rename to conf/machine/am62xx-evm-k3r5-gp.conf index 724a8d4a..d9867bc7 100644 --- a/conf/machine/am62xx-evm-k3r5.conf +++ b/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/conf/machine/am62xx-evm-k3r5-hs-se.conf b/conf/machine/am62xx-evm-k3r5-hs-se.conf new file mode 100644 index 00000000..913e69fa --- /dev/null +++ b/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/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf index 3d9e3b90..b4904eca 100644 --- a/conf/machine/am62xx-evm.conf +++ b/conf/machine/am62xx-evm.conf @@ -19,3 +19,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/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc index 0231235f..912318e9 100644 --- a/conf/machine/include/am62xx.inc +++ b/conf/machine/include/am62xx.inc @@ -8,8 +8,15 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_SYSTEM_SUSPEND = "1" -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +BBMULTICONFIG = "k3r5-gp" +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 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" +do_image_tar[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" TFA_BOARD = "lite" OPTEEMACHINE = "k3-am62x" diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 0fb3a832..7896c366 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/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" diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index caf27328..41071676 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -31,6 +31,10 @@ do_compile_append_am64xx-evm() { tfa_sign_k3hs } +do_compile_append_am62xx-evm() { + tfa_sign_k3hs +} + do_compile_append_am62xx-lp-evm() { tfa_sign_k3hs } diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend index 83eb9c6a..91abbcee 100644 --- a/recipes-security/optee/optee-os_%.bbappend +++ b/recipes-security/optee/optee-os_%.bbappend @@ -72,6 +72,10 @@ do_compile_append_am64xx-evm() { optee_sign_k3hs } +do_compile_append_am62xx-evm() { + optee_sign_k3hs +} + do_compile_append_am62xx-lp-evm() { optee_sign_k3hs }