diff mbox series

[master/scarthgap] jailhouse: revert changes for am62lxx

Message ID 20250315014726.2806459-1-denis@denix.org
State Rejected
Delegated to: Ryan Eatmon
Headers show
Series [master/scarthgap] jailhouse: revert changes for am62lxx | expand

Commit Message

Denys Dmytriyenko March 15, 2025, 1:47 a.m. UTC
From: Denys Dmytriyenko <denys@konsulko.com>

This reverts commit 31b423275aa2bc685a1348218bda16894a35ad8b.

This uses an unpublished/uncommitten change - more details:
https://lists.yoctoproject.org/g/meta-ti/topic/111318869

Cc: Paresh Bhagat <p-bhagat@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 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(-)

Comments

Chirag Shilwant March 15, 2025, 1:50 p.m. UTC | #1
Hi Paresh & Denys,

On 15/03/25 07:17, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@konsulko.com>
>
> This reverts commit 31b423275aa2bc685a1348218bda16894a35ad8b.
>
> This uses an unpublished/uncommitten change - more details:
> https://lists.yoctoproject.org/g/meta-ti/topic/111318869



Instead of reverting the entire commit which enabled
Jailhouse support in AM62L, can't we just update
the SRCREV to point to a valid commit under ti-jailhouse?

Something that Jared tried to suggest at [0]


[0]: https://lists.yoctoproject.org/g/meta-ti/message/18333


--
Chirag



> Cc: Paresh Bhagat <p-bhagat@ti.com>
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
>   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(-)
Paresh Bhagat March 17, 2025, 6:09 a.m. UTC | #2
Hi Denys and Chirag,

On 15/03/25 19:20, Chirag Shilwant wrote:
> Hi Paresh & Denys,
>
> On 15/03/25 07:17, Denys Dmytriyenko wrote:
>> From: Denys Dmytriyenko <denys@konsulko.com>
>>
>> This reverts commit 31b423275aa2bc685a1348218bda16894a35ad8b.
>>
>> This uses an unpublished/uncommitten change - more details:
>> https://lists.yoctoproject.org/g/meta-ti/topic/111318869
>
>
>
> Instead of reverting the entire commit which enabled
> Jailhouse support in AM62L, can't we just update
> the SRCREV to point to a valid commit under ti-jailhouse?
>
> Something that Jared tried to suggest at [0]
>
>
> [0]: https://lists.yoctoproject.org/g/meta-ti/message/18333
>
>

Due to some last min changes, I had to force push which caused the 
commit to change. Additionally, the commits for Jailhouse branches in 
meta-ti are usually an older version since Jailhouse updates are done 
after a RC tag (in meta-tisdk). I can send a patch to correct the commit 
instead of reverting current changes.


Thanks

> -- 
> Chirag
>
>
>
>> Cc: Paresh Bhagat <p-bhagat@ti.com>
>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
>> ---
>>   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(-)
Ryan Eatmon March 17, 2025, 2:32 p.m. UTC | #3
On 3/17/2025 1:09 AM, Paresh Bhagat via lists.yoctoproject.org wrote:
> Hi Denys and Chirag,
> 
> On 15/03/25 19:20, Chirag Shilwant wrote:
>> Hi Paresh & Denys,
>>
>> On 15/03/25 07:17, Denys Dmytriyenko wrote:
>>> From: Denys Dmytriyenko <denys@konsulko.com>
>>>
>>> This reverts commit 31b423275aa2bc685a1348218bda16894a35ad8b.
>>>
>>> This uses an unpublished/uncommitten change - more details:
>>> https://lists.yoctoproject.org/g/meta-ti/topic/111318869
>>
>>
>>
>> Instead of reverting the entire commit which enabled
>> Jailhouse support in AM62L, can't we just update
>> the SRCREV to point to a valid commit under ti-jailhouse?
>>
>> Something that Jared tried to suggest at [0]
>>
>>
>> [0]: https://lists.yoctoproject.org/g/meta-ti/message/18333
>>
>>
> 
> Due to some last min changes, I had to force push which caused the 
> commit to change. Additionally, the commits for Jailhouse branches in 
> meta-ti are usually an older version since Jailhouse updates are done 
> after a RC tag (in meta-tisdk). I can send a patch to correct the commit 
> instead of reverting current changes.

It is generally almost always a bad idea to force push a "prod" branch 
for any repo.  We should get out of the habit of doing that.  Just 
commit new changes to fix whatever issue you are trying to fix.  You 
never know what all is pointing at a commit that will be torpedoed by a 
force push.


> 
> Thanks
> 
>> -- 
>> Chirag
>>
>>
>>
>>> Cc: Paresh Bhagat <p-bhagat@ti.com>
>>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
>>> ---
>>>   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(-)
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#18392): https://lists.yoctoproject.org/g/meta-ti/message/18392
> Mute This Topic: https://lists.yoctoproject.org/mt/111711058/6551054
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

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"