From patchwork Sat Mar 15 01:47:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 59047 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 8DB0FC282EC for ; Sat, 15 Mar 2025 01:47:25 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.2585.1742003241116851101 for ; Fri, 14 Mar 2025 18:47:21 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (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 40D1640023; Sat, 15 Mar 2025 01:47:20 +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 i83cVVtp7ArI; Sat, 15 Mar 2025 01:47:20 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 18A2B40021; Sat, 15 Mar 2025 01:47:18 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 6E8E1164371; Fri, 14 Mar 2025 21:47:17 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko , Paresh Bhagat Subject: [master/scarthgap][PATCH] jailhouse: revert changes for am62lxx Date: Fri, 14 Mar 2025 21:47:16 -0400 Message-Id: <20250315014716.2806394-1-denis@denix.org> X-Mailer: git-send-email 2.25.1 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 ; Sat, 15 Mar 2025 01:47:25 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18386 From: Denys Dmytriyenko This reverts commit 31b423275aa2bc685a1348218bda16894a35ad8b. This uses an unpublished/uncommitten change - more details: https://lists.yoctoproject.org/g/meta-ti/topic/111318869 Cc: Paresh Bhagat Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/am62lxx-evm.conf | 1 - meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc | 10 +++++----- meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc | 10 +++++----- meta-ti-bsp/recipes-kernel/linux/ti-extras.inc | 10 +++++----- meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb | 4 ---- meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc | 5 ++--- 6 files changed, 17 insertions(+), 23 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am62lxx-evm.conf b/meta-ti-bsp/conf/machine/am62lxx-evm.conf index 8d1e1fe2..fc348c9b 100644 --- a/meta-ti-bsp/conf/machine/am62lxx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62lxx-evm.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the TI AM62L EVM require conf/machine/include/am62lxx.inc -require conf/machine/include/ti-extras.inc IMAGE_FSTYPES += "ubifs ubi" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc index e334ada0..0252e2c3 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc @@ -1,12 +1,12 @@ # This will have priority over generic uboot path -COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx" +COMPATIBLE_MACHINE = "am62xx|am62pxx" -BRANCH = "ti-u-boot-2025.01" -BRANCH:tie-jailhouse = "ti-u-boot-2025.01-jailhouse" +BRANCH = "ti-u-boot-2024.04" +BRANCH:tie-jailhouse = "ti-u-boot-2024.04-jailhouse" -SRCREV = "e718bbcec3ebf663c021839753034a224be4cc53" -SRCREV:tie-jailhouse = "e718bbcec3ebf663c021839753034a224be4cc53" +SRCREV = "b3c10f333acccef49ebaf4abc575616ea7326d50" +SRCREV:tie-jailhouse = "b3c10f333acccef49ebaf4abc575616ea7326d50" UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git" diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc b/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc index dba9ef38..df10d594 100644 --- a/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc +++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc @@ -2,10 +2,10 @@ # Use different commit, repo and branch for TI extras build # This will have priority over generic rt path -COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx" +COMPATIBLE_MACHINE = "am62xx|am62pxx" -BRANCH = "ti-linux-6.12.y" -BRANCH:tie-jailhouse = "ti-linux-6.12.y-jailhouse" +BRANCH = "ti-rt-linux-6.6.y" +BRANCH:tie-jailhouse = "ti-rt-linux-6.6.y-jailhouse" -SRCREV = "c9e21a1ebd757f2b4487035382bbf65299cf8170" -SRCREV:tie-jailhouse = "229a48602ad1557612a4ffabec6a3cbcdd745f87" +SRCREV = "fb89cd4d622ce6cc1b7b254ae21298570d437a08" +SRCREV:tie-jailhouse = "ea592a872ebdb974f26f6f839596e0a79e9d408b" diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc index 4b7a9f20..880d5d87 100644 --- a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc +++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc @@ -2,13 +2,13 @@ # Use different commit, repo and branch for TI extras build # This will have priority over generic rt path -COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx" +COMPATIBLE_MACHINE = "am62xx|am62pxx" -BRANCH = "ti-linux-6.12.y" -BRANCH:tie-jailhouse = "ti-linux-6.12.y-jailhouse" +BRANCH = "ti-linux-6.6.y" +BRANCH:tie-jailhouse = "ti-linux-6.6.y-jailhouse" -SRCREV = "c9e21a1ebd757f2b4487035382bbf65299cf8170" -SRCREV:tie-jailhouse = "229a48602ad1557612a4ffabec6a3cbcdd745f87" +SRCREV = "e298dab666632b6f62ed61eac35813331341c3aa" +SRCREV:tie-jailhouse = "b45ba5ae4b724d4a09c0c7125ffb49e9d58c04f7" KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git" diff --git a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb index 0113a916..38281615 100644 --- a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb +++ b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb @@ -10,13 +10,11 @@ JH_CELL_FILES ?= "*.cell" JH_CELL_FILES:k3 ?= "k3-*.cell" JH_CELL_FILES:am62xx ?= "k3-am625-*.cell" JH_CELL_FILES:am62pxx ?= "k3-am62p5-*.cell" -JH_CELL_FILES:am62lxx ?= "k3-am62l*.cell" JH_INMATE_DTB ?= "" JH_INMATE_DTB:am62xx ?= "inmate-k3-am625-sk.dtb" JH_INMATE_DTB:am65xx ?= "inmate-k3-am654-idk.dtb" JH_INMATE_DTB:am62pxx ?= "inmate-k3-am62p5-sk.dtb" -JH_INMATE_DTB:am62lxx ?= "inmate-k3-am62l3-evm.dtb" JH_INMATE_DTB:j7 ?= "inmate-k3-j721e-evm.dtb" JH_INMATE_DTB:j7200-evm ?= "inmate-k3-j7200-evm.dtb" @@ -24,7 +22,6 @@ JH_LINUX_DEMO_CELL ?= "" JH_LINUX_DEMO_CELL:am62xx ?= "k3-am625-sk-linux-demo.cell" JH_LINUX_DEMO_CELL:am65xx ?= "k3-am654-idk-linux-demo.cell" JH_LINUX_DEMO_CELL:am62pxx ?= "k3-am62p5-sk-linux-demo.cell" -JH_LINUX_DEMO_CELL:am62lxx ?= "k3-am62l3-evm-linux-demo.cell" JH_LINUX_DEMO_CELL:j7 ?= "k3-j721e-evm-linux-demo.cell" JH_LINUX_DEMO_CELL:j7200-evm ?= "k3-j7200-evm-linux-demo.cell" @@ -34,7 +31,6 @@ JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}" JH_CMDLINE ?= "" JH_CMDLINE:am62xx ?= "console=ttyS3,115200n8 earlycon=ns16550a,mmio32,0x02810000" JH_CMDLINE:am62pxx ?= "console=ttyS1,115200n8" -JH_CMDLINE:am62lxx ?= "console=ttyS3,115200n8" JH_CMDLINE:am65xx ?= "console=ttyS1,115200n8" JH_CMDLINE:j7 ?= "console=ttyS3,115200n8" JH_CMDLINE:j7200-evm ?= "console=ttyS3,115200n8" diff --git a/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc b/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc index 62a97df6..2831e560 100644 --- a/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc +++ b/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc @@ -11,10 +11,10 @@ LIC_FILES_CHKSUM = " \ file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ " -COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx" +COMPATIBLE_MACHINE = "am62xx|am62pxx" TARGET_CC_ARCH += "${LDFLAGS}" PV = "0.12+git" -SRCREV = "dc77c05460bc3df8f2ddc9cc3a9990ca31cb9f9d" +SRCREV = "9b494ddf4bd8845a2c1063352d08a274ef61777b" BRANCH = "master" SRC_URI = " \ git://git.ti.com/git/jailhouse/ti-jailhouse.git;protocol=https;branch=${BRANCH} \ @@ -63,7 +63,6 @@ JH_SYSCONFIG_CELL ?= "" JH_SYSCONFIG_CELL:am62xx ?= "k3-am625-sk.cell" JH_SYSCONFIG_CELL:am65xx ?= "k3-am654-idk.cell" JH_SYSCONFIG_CELL:am62pxx ?= "k3-am62p5-sk.cell" -JH_SYSCONFIG_CELL:am62lxx ?= "k3-am62l3-evm.cell" JH_SYSCONFIG_CELL:j7 ?= "k3-j721e-evm.cell" JH_SYSCONFIG_CELL:j7200-evm ?= "k3-j7200-evm.cell"