From patchwork Tue Jun 7 10:35:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jayesh Choudhary X-Patchwork-Id: 8966 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 88C5BCCA483 for ; Tue, 7 Jun 2022 10:35:40 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web09.10849.1654598133717853517 for ; Tue, 07 Jun 2022 03:35:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=A+VIfLF/; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: j-choudhary@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 257AZWhq014865 for ; Tue, 7 Jun 2022 05:35:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1654598132; bh=8A84hzr+be1xCk1gGRSV/jh/4X1twD0qW5Ek1jG/2YY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=A+VIfLF/8m12FYSGv54ebmdBdQWEZpHt7+JvEuBIuOGLd9IAzkQdtm9v0fspBAGeR bMZYjNmplsJ6lKlxuY0h+F42INXzHz7Gohp9eTocM2IIq6E1Mr5NzwDwAtASKZk/p4 4b6xQkgjcoMrEAUQx7tz5jsxeADqQ63I+DrHaAhU= Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 257AZWXg015426 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 7 Jun 2022 05:35:32 -0500 Received: from DFLE101.ent.ti.com (10.64.6.22) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Tue, 7 Jun 2022 05:35:32 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE101.ent.ti.com (10.64.6.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Tue, 7 Jun 2022 05:35:31 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 257AZVSJ033816; Tue, 7 Jun 2022 05:35:31 -0500 From: Jayesh Choudhary To: CC: , , , Subject: [meta-ti] [dunfell PATCH v2 1/5] conf: machine: Add j721s2 hs platform Date: Tue, 7 Jun 2022 16:05:25 +0530 Message-ID: <20220607103529.13068-2-j-choudhary@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220607103529.13068-1-j-choudhary@ti.com> References: <20220607103529.13068-1-j-choudhary@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Jun 2022 10:35:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14787 Machine conf for J721S2 HS platform. Used j7200 hs as reference. Signed-off-by: Jayesh Choudhary --- conf/machine/j721s2-hs-evm-k3r5.conf | 13 +++++++++++++ conf/machine/j721s2-hs-evm.conf | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 conf/machine/j721s2-hs-evm-k3r5.conf create mode 100644 conf/machine/j721s2-hs-evm.conf diff --git a/conf/machine/j721s2-hs-evm-k3r5.conf b/conf/machine/j721s2-hs-evm-k3r5.conf new file mode 100644 index 00000000..ac4df86e --- /dev/null +++ b/conf/machine/j721s2-hs-evm-k3r5.conf @@ -0,0 +1,13 @@ +#@TYPE: Machine +#@NAME: J721S2 HS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j721s2" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "j721s2_hs_evm_r5_defconfig" + +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j721s2-hs-evm.conf b/conf/machine/j721s2-hs-evm.conf new file mode 100644 index 00000000..43fb2ebc --- /dev/null +++ b/conf/machine/j721s2-hs-evm.conf @@ -0,0 +1,22 @@ +#@TYPE: Machine +#@NAME: J721S2 HS EVM +#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM + +require conf/machine/j721s2-evm.conf + +UBOOT_MACHINE = "j721s2_hs_evm_a72_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" +SPL_BINARYNAME = "tispl.bin" +UBOOT_BINARY = "u-boot.img_HS" +IMAGE_BOOT_FILES = "${UBOOT_BINARY}" + +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" From patchwork Tue Jun 7 10:35:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jayesh Choudhary X-Patchwork-Id: 8968 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 89800CCA484 for ; Tue, 7 Jun 2022 10:35:40 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web11.10676.1654598135014776643 for ; Tue, 07 Jun 2022 03:35:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=fJ7LBZOb; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: j-choudhary@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 257AZYjD014878 for ; Tue, 7 Jun 2022 05:35:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1654598134; bh=Kns9tb+WtMOGohmKrhp+yxnZlt4ul15O6rCTCw9CxwY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=fJ7LBZOb1KuakH8V6PH17Dpzanr3bft5gsC2TNJLlPynvf928NrQi6PV84yYB4mLR ZbjMay+ZOu8Hcpj0BBbHSjKP1pmIswJoDat7KIHgQ2mo9WaUrYq5WpjeV42o5a6a/2 4xyVkMmJf2U1ScZH+fJ+wrPiFqXULBspGOiQnCbU= Received: from DFLE106.ent.ti.com (dfle106.ent.ti.com [10.64.6.27]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 257AZYRV017328 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 7 Jun 2022 05:35:34 -0500 Received: from DFLE103.ent.ti.com (10.64.6.24) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Tue, 7 Jun 2022 05:35:33 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Tue, 7 Jun 2022 05:35:33 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 257AZW0H033832; Tue, 7 Jun 2022 05:35:33 -0500 From: Jayesh Choudhary To: CC: , , , Subject: [meta-ti] [dunfell PATCH v2 2/5] ti-rtos-firmware: Add j721s2 hs support Date: Tue, 7 Jun 2022 16:05:26 +0530 Message-ID: <20220607103529.13068-3-j-choudhary@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220607103529.13068-1-j-choudhary@ti.com> References: <20220607103529.13068-1-j-choudhary@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Jun 2022 10:35:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14788 Sign the DM firmware for j721s2 similar to j7200 hs. Duplicate all j721s2 entries for j721s2-hs as we cannot use same keyword for match between j721s2-evm and j721s2-hs-evm. Signed-off-by: Jayesh Choudhary --- recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb index 0f2ba9af..19ea93f1 100644 --- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb @@ -17,6 +17,7 @@ PLAT_SFX_j7 = "j721e" PLAT_SFX_j7200-evm = "j7200" PLAT_SFX_j7200-hs-evm = "j7200" PLAT_SFX_j721s2-evm = "j721s2" +PLAT_SFX_j721s2-hs-evm = "j721s2" PLAT_SFX_am65xx = "am65xx" PLAT_SFX_am64xx = "am64xx" PLAT_SFX_am62xx = "am62xx" @@ -67,6 +68,15 @@ do_install_prepend_j7200-hs-evm() { ) } +# J7 HS support +do_install_prepend_j721s2-hs-evm() { + export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} + ( cd ${RTOS_DM_FW_DIR}; \ + mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \ + ) +} + # Update the am64xx ipc binaries to be consistent with other platforms do_install_prepend_am64xx() { ( cd ${RTOS_IPC_FW_DIR}; \ @@ -147,6 +157,22 @@ do_install_j721s2-evm() { # install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f ${LEGACY_ETH_FW_DIR} } +do_install_j721s2-hs-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_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} + # 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} @@ -234,6 +260,17 @@ ALTERNATIVE_${PN}_j721s2-evm = "\ j721s2-c71_1-fw \ " +ALTERNATIVE_${PN}_j721s2-hs-evm = "\ + j721s2-mcu-r5f0_0-fw \ + j721s2-mcu-r5f0_1-fw \ + j721s2-main-r5f0_0-fw \ + j721s2-main-r5f0_1-fw \ + j721s2-main-r5f1_0-fw \ + j721s2-main-r5f1_1-fw \ + j721s2-c71_0-fw \ + j721s2-c71_1-fw \ + " + # Set up link names for the firmwares TARGET_MCU_R5FSS0_0_am65xx = "am65x-mcu-r5f0_0-fw" @@ -277,6 +314,15 @@ TARGET_MAIN_R5FSS1_1_j721s2-evm = "j721s2-main-r5f1_1-fw" TARGET_C7X_0_j721s2-evm = "j721s2-c71_0-fw" TARGET_C7X_1_j721s2-evm = "j721s2-c71_1-fw" +TARGET_MCU_R5FSS0_0_j721s2-hs-evm = "j721s2-mcu-r5f0_0-fw" +TARGET_MCU_R5FSS0_1_j721s2-hs-evm = "j721s2-mcu-r5f0_1-fw" +TARGET_MAIN_R5FSS0_0_j721s2-hs-evm = "j721s2-main-r5f0_0-fw" +TARGET_MAIN_R5FSS0_1_j721s2-hs-evm = "j721s2-main-r5f0_1-fw" +TARGET_MAIN_R5FSS1_0_j721s2-hs-evm = "j721s2-main-r5f1_0-fw" +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" + ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" From patchwork Tue Jun 7 10:35:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jayesh Choudhary X-Patchwork-Id: 8967 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 8BEB1C3F2D4 for ; Tue, 7 Jun 2022 10:35:40 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web12.10868.1654598137181162083 for ; Tue, 07 Jun 2022 03:35:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=HbEQAngf; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: j-choudhary@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 257AZavV123737 for ; Tue, 7 Jun 2022 05:35:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1654598136; bh=M4f3e3KaJNJrr3oswCVV2hkpqTI6dZ3vHVLAAhTApiQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=HbEQAngfjEkzzhvYj+TyyB8HxSTb3JdVZtGIh6O7OUTkutUvAXvwnvJpo/yGsJRGy l1A1dVBv7QSAMIdN20ZQhaU2fnL2ddkHs6HKHtKaeN4PKV3oyKLpYC9DcdPMMJtaTH KioGeGe8yWz3WDCWnaj8NN4+DpimDZsouk49TICQ= Received: from DLEE106.ent.ti.com (dlee106.ent.ti.com [157.170.170.36]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 257AZaFj097010 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 7 Jun 2022 05:35:36 -0500 Received: from DLEE110.ent.ti.com (157.170.170.21) by DLEE106.ent.ti.com (157.170.170.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Tue, 7 Jun 2022 05:35:35 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Tue, 7 Jun 2022 05:35:35 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 257AZY6x001591; Tue, 7 Jun 2022 05:35:34 -0500 From: Jayesh Choudhary To: CC: , , , Subject: [meta-ti] [dunfell PATCH v2 3/5] j721s2-hs: changes to support new hs platform Date: Tue, 7 Jun 2022 16:05:27 +0530 Message-ID: <20220607103529.13068-4-j-choudhary@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220607103529.13068-1-j-choudhary@ti.com> References: <20220607103529.13068-1-j-choudhary@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Jun 2022 10:35:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14789 Changes to support new j721s2-hs platform in: 1) ti-sci-fw_git: Update firmware prefix for j721s2-hs 2) atf: sign the image 3) u-boot: Add u-boot-spl image for combined boot image 4) optee: sign the image Signed-off-by: Jayesh Choudhary --- recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 18 ++++++++++++++++++ .../trusted-firmware-a_%.bbappend | 8 ++++++++ recipes-bsp/u-boot/u-boot-ti.inc | 6 ++++++ recipes-security/optee/optee-os_%.bbappend | 4 ++++ 4 files changed, 36 insertions(+) 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 099473b4..983d23e3 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -4,6 +4,7 @@ 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" @@ -30,6 +31,7 @@ SYSFW_PREFIX_j7-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" @@ -63,6 +65,7 @@ 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"" 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"" @@ -143,6 +146,21 @@ do_deploy_j721s2-evm-k3r5() { 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} diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 68bfa899..9f741e3a 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -42,3 +42,11 @@ do_compile_append_j7200-hs-evm() { ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \ ) } + +do_compile_append_j721s2-hs-evm() { + export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} + ( cd ${B}/${BUILD_DIR}/release/; \ + mv bl31.bin bl31.bin.unsigned; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \ + ) +} diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc index 903c61f0..e7c93335 100644 --- a/recipes-bsp/u-boot/u-boot-ti.inc +++ b/recipes-bsp/u-boot/u-boot-ti.inc @@ -60,6 +60,7 @@ 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" @@ -403,6 +404,11 @@ do_deploy_append_j721s2-evm-k3r5 () { 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 diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend index 4e01ea74..e128da89 100644 --- a/recipes-security/optee/optee-os_%.bbappend +++ b/recipes-security/optee/optee-os_%.bbappend @@ -75,6 +75,10 @@ do_compile_append_j7200-hs-evm() { optee_sign_k3hs } +do_compile_append_j721s2-hs-evm() { + optee_sign_k3hs +} + do_install_append_ti-soc() { install -m 644 ${B}/*.optee ${D}${nonarch_base_libdir}/firmware/ || true install -m 644 ${B}/bl32.bin ${D}${nonarch_base_libdir}/firmware/ || true From patchwork Tue Jun 7 10:35:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jayesh Choudhary X-Patchwork-Id: 8964 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 7B75ECCA47F for ; Tue, 7 Jun 2022 10:35:40 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web08.11100.1654598137543091075 for ; Tue, 07 Jun 2022 03:35:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=BdgoDBik; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: j-choudhary@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 257AZbmK128292 for ; Tue, 7 Jun 2022 05:35:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1654598137; bh=oaGE3l7vU3zBLoNKS1bJ4a88HvuzZdoqWYxqcVoj1K8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=BdgoDBikDmkntNCTlNm8X5RUej7qTbriLm8EQ3/Kx4qDE285iDRRafgo+duOU1Dty FvH5KtkyfTJ187/hU8jtS9MHAj7/ONreaWWsoZo2jTP8pbdLafr6oPvn2SBHOnYsRd ZkX49Y4OpjhhUVBSJUF0xyvE+ECAM4wHlwETbdWQ= Received: from DFLE105.ent.ti.com (dfle105.ent.ti.com [10.64.6.26]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 257AZa02017345 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 7 Jun 2022 05:35:36 -0500 Received: from DFLE110.ent.ti.com (10.64.6.31) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Tue, 7 Jun 2022 05:35:36 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Tue, 7 Jun 2022 05:35:36 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 257AZZvX033861; Tue, 7 Jun 2022 05:35:36 -0500 From: Jayesh Choudhary To: CC: , , , Subject: [meta-ti] [dunfell PATCH v2 4/5] ti-graphics: Add j721s2-hs-evm as a compatible machine Date: Tue, 7 Jun 2022 16:05:28 +0530 Message-ID: <20220607103529.13068-5-j-choudhary@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220607103529.13068-1-j-choudhary@ti.com> References: <20220607103529.13068-1-j-choudhary@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Jun 2022 10:35:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14790 Add HS platform to the list of compatible machines. Signed-off-by: Jayesh Choudhary --- .../powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb | 4 +++- recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb index 718c7845..3a20d809 100644 --- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb +++ b/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 = "j7-evm|j7-hs-evm|j721s2-evm|am62xx" +COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|j721s2-hs-evm|am62xx" DEPENDS = "virtual/kernel" @@ -31,10 +31,12 @@ SRCREV = "6d3d62a15ceb85b719c35f34c6c9e35f556b406b" TARGET_PRODUCT_j7-evm = "j721e_linux" TARGET_PRODUCT_j7-hs-evm = "j721e_linux" TARGET_PRODUCT_j721s2-evm = "j721s2_linux" +TARGET_PRODUCT_j721s2-hs-evm = "j721s2_linux" TARGET_PRODUCT_am62xx = "am62_linux" TARGET_BVNC_j7-evm = "22.104.208.318" TARGET_BVNC_j7-hs-evm = "22.104.208.318" TARGET_BVNC_j721s2-evm = "36.53.104.796" +TARGET_BVNC_j721s2-hs-evm = "36.53.104.796" TARGET_BVNC_am62xx = "33.15.11.3" PVR_BUILD = "release" PVR_WS = "wayland" diff --git a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb index 1bfb2b93..7921d17b 100644 --- a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb +++ b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb @@ -8,7 +8,7 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "gpu" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|am62xx" +COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|j721s2-hs-evm|am62xx" PR = "r2" @@ -20,6 +20,7 @@ SRCREV = "fba0c770b712640ab3761dbe8369d43f89f616ed" TARGET_PRODUCT_j7-evm = "j721e_linux" TARGET_PRODUCT_j7-hs-evm = "j721e_linux" TARGET_PRODUCT_j721s2-evm = "j721s2_linux" +TARGET_PRODUCT_j721s2-hs-evm = "j721s2_linux" TARGET_PRODUCT_am62xx = "am62_linux" PVR_BUILD ?= "release" PVR_WS = "wayland" From patchwork Tue Jun 7 10:35:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jayesh Choudhary X-Patchwork-Id: 8965 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 7DFF8CCA482 for ; Tue, 7 Jun 2022 10:35:40 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web12.10870.1654598138966655347 for ; Tue, 07 Jun 2022 03:35:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=PKbEkkO/; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: j-choudhary@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 257AZcgw128297 for ; Tue, 7 Jun 2022 05:35:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1654598138; bh=BhvT0fxlVH/CT6idSqQhNyoqPDP8ZmKc/OJ6/ai0/GM=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=PKbEkkO/uSsIEjKO6G0eC6bliDN1L4jkdOl3Bf+jw6IjmVrHjyH72V0KFJ3eIC27t HGeYdxpM1a7iWQc+MnMU8nTdb1dBsH+c0H6Mb3NXAcp0GXBaaMnkMoo19p+2Et+s6e JKfdlP1eaMOGDcZC9xQszPo/7T8ArOg/hTlsiSqw= Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 257AZcDY097026 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 7 Jun 2022 05:35:38 -0500 Received: from DFLE101.ent.ti.com (10.64.6.22) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Tue, 7 Jun 2022 05:35:38 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE101.ent.ti.com (10.64.6.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14 via Frontend Transport; Tue, 7 Jun 2022 05:35:37 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 257AZbd7001627; Tue, 7 Jun 2022 05:35:37 -0500 From: Jayesh Choudhary To: CC: , , , Subject: [meta-ti] [dunfell PATCH v2 5/5] cnm-wave-fw: add compatible for j721s2-hs-evm Date: Tue, 7 Jun 2022 16:05:29 +0530 Message-ID: <20220607103529.13068-6-j-choudhary@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220607103529.13068-1-j-choudhary@ti.com> References: <20220607103529.13068-1-j-choudhary@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Jun 2022 10:35:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14791 Add the HS platform to the compatible list in the recipe. Signed-off-by: Jayesh Choudhary --- recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb | 3 ++- recipes-kernel/linux/kernel-rdepends.inc | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb b/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb index 0c432de2..83619090 100644 --- a/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb +++ b/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb @@ -13,7 +13,7 @@ PR = "${INC_PR}.1" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "j721s2-evm" +COMPATIBLE_MACHINE = "j721s2-evm|j721s2-hs-evm" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -22,6 +22,7 @@ TARGET_WAVE521C = "wave521c_codec_fw.bin" SOURCE_WAVE521C = "wave521c_codec_fw.bin" SOURCE_WAVE521C_j721s2-evm = "wave521c_j721s2_codec_fw.bin" +SOURCE_WAVE521C_j721s2-hs-evm = "wave521c_j721s2_codec_fw.bin" ALTERNATIVE_LINK_NAME[wave521c_codec_fw.bin] = "${base_libdir}/firmware/${TARGET_WAVE521C}" ALTERNATIVE_TARGET[wave521c_codec_fw.bin] = "${base_libdir}/firmware/cnm/${TARGET_WAVE521C}" diff --git a/recipes-kernel/linux/kernel-rdepends.inc b/recipes-kernel/linux/kernel-rdepends.inc index 17aee4c2..2ebf4948 100644 --- a/recipes-kernel/linux/kernel-rdepends.inc +++ b/recipes-kernel/linux/kernel-rdepends.inc @@ -45,6 +45,7 @@ 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-evm = " cnm-wave-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721s2-hs-evm = " cnm-wave-fw" # Add run-time dependency for TIFS Low Power Module stub RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62xx-evm = " tifs-lpm-stub"