* [meta-ti][master/kirkstone][RFC] ti-extras: Add support for extra kernel/u-boot features
@ 2023-06-11 19:54 Ryan Eatmon
2023-06-12 19:42 ` Denys Dmytriyenko
2023-06-13 10:51 ` [EXTERNAL] " Paresh Bhagat
0 siblings, 2 replies; 5+ messages in thread
From: Ryan Eatmon @ 2023-06-11 19:54 UTC (permalink / raw)
To: Praneeth Bajjuri, Denys Dmytriyenko, meta-ti
From: Paresh Bhagat <p-bhagat@ti.com>
There are some features that will either never be accepted into the
upstream kernel, or are not ready to be accepted. ti-extras allows for
controlling the kernel and u-boot repos, breanches, and srcrevs to gain
access to those features via the TI_EXTRAS variable in the local.conf
file.
Initial support for TI_EXTRAS=tie-jailhouse is being added by this
patch.
Signed-off-by: Paresh Bhagat <p-bhagat@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
RFC
This is a pass at reworking the logic for adding support for jailhouse
behind a more extensible TI_EXTRAS system. Please comment on it.
meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 1 +
meta-ti-bsp/conf/machine/am62xx-evm.conf | 1 +
| 5 +++++
| 11 +++++++++++
.../u-boot/u-boot-ti-staging_2023.04.bb | 2 ++
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 2 +-
.../recipes-kernel/linux/linux-ti-staging_6.1.bb | 7 ++++---
| 14 ++++++++++++++
.../recipes-ti/jailhouse/jailhouse_git.bb | 2 ++
9 files changed, 41 insertions(+), 4 deletions(-)
create mode 100644 meta-ti-bsp/conf/machine/include/ti-extras.inc
create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
create mode 100644 meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
index 9889ae38..548369ca 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
@@ -3,6 +3,7 @@
#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
require conf/machine/include/k3r5.inc
+require conf/machine/include/ti-extras.inc
SYSFW_SOC = "am62x"
SYSFW_CONFIG = "evm"
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
index c4357be3..082a1ae7 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -3,6 +3,7 @@
#@DESCRIPTION: Machine configuration for the TI AM62XX EVM
require conf/machine/include/am62xx.inc
+require conf/machine/include/ti-extras.inc
KERNEL_DEVICETREE_PREFIX = "ti/k3-am625"
--git a/meta-ti-bsp/conf/machine/include/ti-extras.inc b/meta-ti-bsp/conf/machine/include/ti-extras.inc
new file mode 100644
index 00000000..59eef952
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/ti-extras.inc
@@ -0,0 +1,5 @@
+# Add TI_EXTRAS to machine overrides so we get access to e.g. 'jailhouse'
+
+TI_EXTRAS ??= ""
+MACHINEOVERRIDES =. "${@['', '${TI_EXTRAS}:']['${TI_EXTRAS}' != '']}"
+
--git a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
new file mode 100644
index 00000000..e5e1cc10
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
@@ -0,0 +1,11 @@
+
+# This will have priority over generic uboot path
+
+BRANCH = "ti-u-boot-2023.04"
+BRANCH:tie-jailhouse = "ti-u-boot-2023.04-jailhouse"
+
+SRCREV = "010afc1fe7a1412f92363c8af69c848d76a53e42"
+SRCREV:tie-jailhouse = "79615e1c99b9aa73948f811f5f866cff2e34dc37"
+
+UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git"
+
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
index f4c5e88c..4bde0256 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
@@ -1,5 +1,7 @@
require u-boot-ti.inc
+include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
+
LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
PR = "r0"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
index f29b089e..f3285c23 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -16,7 +16,7 @@ LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
BRANCH ?= "master"
-UBOOT_GIT_URI = "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
+UBOOT_GIT_URI ?= "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
UBOOT_GIT_PROTOCOL = "https"
SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};branch=${BRANCH}"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
index 0b36575b..2b84b6b5 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
@@ -9,6 +9,7 @@ require recipes-kernel/linux/setup-defconfig.inc
require recipes-kernel/linux/kernel-rdepends.inc
require recipes-kernel/linux/ti-kernel.inc
include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
+include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
DEPENDS += "gmp-native libmpc-native"
@@ -20,16 +21,16 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
S = "${WORKDIR}/git"
-BRANCH = "ti-linux-6.1.y"
+BRANCH ?= "ti-linux-6.1.y"
-SRCREV = "7124dee9779a40c52c52331c3ba6ccc84f357380"
+SRCREV ?= "7124dee9779a40c52c52331c3ba6ccc84f357380"
PV = "6.1.26+git${SRCPV}"
# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
MACHINE_KERNEL_PR:append = "b"
PR = "${MACHINE_KERNEL_PR}"
-KERNEL_GIT_URI = "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
+KERNEL_GIT_URI ??= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
KERNEL_GIT_PROTOCOL = "https"
SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
file://defconfig"
--git a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
new file mode 100644
index 00000000..f9fdd57a
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
@@ -0,0 +1,14 @@
+
+# Use different commit, repo and branch for TI extras build
+# This will have priority over generic rt path
+
+COMPATIBLE_MACHINE = "am62xx-evm"
+
+BRANCH = "ti-linux-6.1.y"
+BRANCH:tie-jailhouse = "ti-linux-6.1.y-jailhouse"
+
+SRCREV = "30bcc25e7cb1b25667db88d61828728f0f0b5f4b"
+SRCREV:tie-jailhouse = "0ed0dec2462b805b0188fe080895adc437871549"
+
+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 05cc21b3..eb4a98f7 100644
--- a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
+++ b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = " \
file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
"
+COMPATIBLE_MACHINE = "am62xx-evm"
+
TARGET_CC_ARCH += "${LDFLAGS}"
PV = "0.12+git${SRCPV}"
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-ti][master/kirkstone][RFC] ti-extras: Add support for extra kernel/u-boot features
2023-06-11 19:54 [meta-ti][master/kirkstone][RFC] ti-extras: Add support for extra kernel/u-boot features Ryan Eatmon
@ 2023-06-12 19:42 ` Denys Dmytriyenko
2023-06-13 1:20 ` Ryan Eatmon
2023-06-13 10:51 ` [EXTERNAL] " Paresh Bhagat
1 sibling, 1 reply; 5+ messages in thread
From: Denys Dmytriyenko @ 2023-06-12 19:42 UTC (permalink / raw)
To: reatmon; +Cc: Praneeth Bajjuri, Denys Dmytriyenko, meta-ti
Thanks, Ryan, for taking a stab at it after our discussion on Friday - this
looks very promising!
I have few minor comments/questions:
1. Should COMPATIBLE_MACHINE be a bit broarder and include "am62xx" SoC family
and not just the EVM? Also, ti-extras only enabled for am62x for now?
2. Was there a specific reason to use a weak ??= in KERNEL_GIT_URI? Doesn't
seem to be needed for UBOOT_GIT_URI...
3. Naming - TI_EXTRAS vs TI_EXPERIMENTS? Should we check for the proper use
of "tie-*" namespace before making it a MACHINEOVERRIDES, any safeguards?
On Sun, Jun 11, 2023 at 02:54:44PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
> From: Paresh Bhagat <p-bhagat@ti.com>
>
> There are some features that will either never be accepted into the
> upstream kernel, or are not ready to be accepted. ti-extras allows for
> controlling the kernel and u-boot repos, breanches, and srcrevs to gain
> access to those features via the TI_EXTRAS variable in the local.conf
> file.
>
> Initial support for TI_EXTRAS=tie-jailhouse is being added by this
> patch.
>
> Signed-off-by: Paresh Bhagat <p-bhagat@ti.com>
> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> ---
>
> RFC
>
> This is a pass at reworking the logic for adding support for jailhouse
> behind a more extensible TI_EXTRAS system. Please comment on it.
>
>
>
>
> meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 1 +
> meta-ti-bsp/conf/machine/am62xx-evm.conf | 1 +
> meta-ti-bsp/conf/machine/include/ti-extras.inc | 5 +++++
> meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc | 11 +++++++++++
> .../u-boot/u-boot-ti-staging_2023.04.bb | 2 ++
> meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 2 +-
> .../recipes-kernel/linux/linux-ti-staging_6.1.bb | 7 ++++---
> meta-ti-bsp/recipes-kernel/linux/ti-extras.inc | 14 ++++++++++++++
> .../recipes-ti/jailhouse/jailhouse_git.bb | 2 ++
> 9 files changed, 41 insertions(+), 4 deletions(-)
> create mode 100644 meta-ti-bsp/conf/machine/include/ti-extras.inc
> create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
> create mode 100644 meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
>
> diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
> index 9889ae38..548369ca 100644
> --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
> @@ -3,6 +3,7 @@
> #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
>
> require conf/machine/include/k3r5.inc
> +require conf/machine/include/ti-extras.inc
>
> SYSFW_SOC = "am62x"
> SYSFW_CONFIG = "evm"
> diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
> index c4357be3..082a1ae7 100644
> --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
> +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
> @@ -3,6 +3,7 @@
> #@DESCRIPTION: Machine configuration for the TI AM62XX EVM
>
> require conf/machine/include/am62xx.inc
> +require conf/machine/include/ti-extras.inc
>
> KERNEL_DEVICETREE_PREFIX = "ti/k3-am625"
>
> diff --git a/meta-ti-bsp/conf/machine/include/ti-extras.inc b/meta-ti-bsp/conf/machine/include/ti-extras.inc
> new file mode 100644
> index 00000000..59eef952
> --- /dev/null
> +++ b/meta-ti-bsp/conf/machine/include/ti-extras.inc
> @@ -0,0 +1,5 @@
> +# Add TI_EXTRAS to machine overrides so we get access to e.g. 'jailhouse'
> +
> +TI_EXTRAS ??= ""
> +MACHINEOVERRIDES =. "${@['', '${TI_EXTRAS}:']['${TI_EXTRAS}' != '']}"
> +
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
> new file mode 100644
> index 00000000..e5e1cc10
> --- /dev/null
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
> @@ -0,0 +1,11 @@
> +
> +# This will have priority over generic uboot path
> +
> +BRANCH = "ti-u-boot-2023.04"
> +BRANCH:tie-jailhouse = "ti-u-boot-2023.04-jailhouse"
> +
> +SRCREV = "010afc1fe7a1412f92363c8af69c848d76a53e42"
> +SRCREV:tie-jailhouse = "79615e1c99b9aa73948f811f5f866cff2e34dc37"
> +
> +UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git"
> +
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
> index f4c5e88c..4bde0256 100644
> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
> @@ -1,5 +1,7 @@
> require u-boot-ti.inc
>
> +include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
> +
> LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
>
> PR = "r0"
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> index f29b089e..f3285c23 100644
> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> @@ -16,7 +16,7 @@ LICENSE = "GPL-2.0-or-later"
> LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
>
> BRANCH ?= "master"
> -UBOOT_GIT_URI = "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
> +UBOOT_GIT_URI ?= "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
> UBOOT_GIT_PROTOCOL = "https"
> SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};branch=${BRANCH}"
>
> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
> index 0b36575b..2b84b6b5 100644
> --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
> @@ -9,6 +9,7 @@ require recipes-kernel/linux/setup-defconfig.inc
> require recipes-kernel/linux/kernel-rdepends.inc
> require recipes-kernel/linux/ti-kernel.inc
> include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
> +include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
>
> DEPENDS += "gmp-native libmpc-native"
>
> @@ -20,16 +21,16 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
>
> S = "${WORKDIR}/git"
>
> -BRANCH = "ti-linux-6.1.y"
> +BRANCH ?= "ti-linux-6.1.y"
>
> -SRCREV = "7124dee9779a40c52c52331c3ba6ccc84f357380"
> +SRCREV ?= "7124dee9779a40c52c52331c3ba6ccc84f357380"
> PV = "6.1.26+git${SRCPV}"
>
> # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
> MACHINE_KERNEL_PR:append = "b"
> PR = "${MACHINE_KERNEL_PR}"
>
> -KERNEL_GIT_URI = "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
> +KERNEL_GIT_URI ??= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
> KERNEL_GIT_PROTOCOL = "https"
> SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
> file://defconfig"
> diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
> new file mode 100644
> index 00000000..f9fdd57a
> --- /dev/null
> +++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
> @@ -0,0 +1,14 @@
> +
> +# Use different commit, repo and branch for TI extras build
> +# This will have priority over generic rt path
> +
> +COMPATIBLE_MACHINE = "am62xx-evm"
> +
> +BRANCH = "ti-linux-6.1.y"
> +BRANCH:tie-jailhouse = "ti-linux-6.1.y-jailhouse"
> +
> +SRCREV = "30bcc25e7cb1b25667db88d61828728f0f0b5f4b"
> +SRCREV:tie-jailhouse = "0ed0dec2462b805b0188fe080895adc437871549"
> +
> +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 05cc21b3..eb4a98f7 100644
> --- a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
> +++ b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
> @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = " \
> file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
> "
>
> +COMPATIBLE_MACHINE = "am62xx-evm"
> +
> TARGET_CC_ARCH += "${LDFLAGS}"
>
> PV = "0.12+git${SRCPV}"
> --
> 2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-ti][master/kirkstone][RFC] ti-extras: Add support for extra kernel/u-boot features
2023-06-12 19:42 ` Denys Dmytriyenko
@ 2023-06-13 1:20 ` Ryan Eatmon
0 siblings, 0 replies; 5+ messages in thread
From: Ryan Eatmon @ 2023-06-13 1:20 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Praneeth Bajjuri, Denys Dmytriyenko, meta-ti
On 6/12/2023 2:42 PM, Denys Dmytriyenko wrote:
> Thanks, Ryan, for taking a stab at it after our discussion on Friday - this
> looks very promising!
>
> I have few minor comments/questions:
>
> 1. Should COMPATIBLE_MACHINE be a bit broarder and include "am62xx" SoC family
> and not just the EVM? Also, ti-extras only enabled for am62x for now?
Yes. It should be a little broader. And yes, as of right now it is
only enabled for am62x.
> 2. Was there a specific reason to use a weak ??= in KERNEL_GIT_URI? Doesn't
> seem to be needed for UBOOT_GIT_URI...
No. I was playing around with ??= and thought I had fixed them all. It
should be cleaned up as well.
> 3. Naming - TI_EXTRAS vs TI_EXPERIMENTS? Should we check for the proper use
> of "tie-*" namespace before making it a MACHINEOVERRIDES, any safeguards?
I'm not married to the TI_EXTRAS. That (and the include file names) can
easily be changed to experiments.
Can you give an example of checking for the tie- before adding it to M
MACHINEOVERRIDES? I'm always up for making things more bulletproof.
>
> On Sun, Jun 11, 2023 at 02:54:44PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote:
>> From: Paresh Bhagat <p-bhagat@ti.com>
>>
>> There are some features that will either never be accepted into the
>> upstream kernel, or are not ready to be accepted. ti-extras allows for
>> controlling the kernel and u-boot repos, breanches, and srcrevs to gain
>> access to those features via the TI_EXTRAS variable in the local.conf
>> file.
>>
>> Initial support for TI_EXTRAS=tie-jailhouse is being added by this
>> patch.
>>
>> Signed-off-by: Paresh Bhagat <p-bhagat@ti.com>
>> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
>> ---
>>
>> RFC
>>
>> This is a pass at reworking the logic for adding support for jailhouse
>> behind a more extensible TI_EXTRAS system. Please comment on it.
>>
>>
>>
>>
>> meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 1 +
>> meta-ti-bsp/conf/machine/am62xx-evm.conf | 1 +
>> meta-ti-bsp/conf/machine/include/ti-extras.inc | 5 +++++
>> meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc | 11 +++++++++++
>> .../u-boot/u-boot-ti-staging_2023.04.bb | 2 ++
>> meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 2 +-
>> .../recipes-kernel/linux/linux-ti-staging_6.1.bb | 7 ++++---
>> meta-ti-bsp/recipes-kernel/linux/ti-extras.inc | 14 ++++++++++++++
>> .../recipes-ti/jailhouse/jailhouse_git.bb | 2 ++
>> 9 files changed, 41 insertions(+), 4 deletions(-)
>> create mode 100644 meta-ti-bsp/conf/machine/include/ti-extras.inc
>> create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
>> create mode 100644 meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
>>
>> diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
>> index 9889ae38..548369ca 100644
>> --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
>> +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
>> @@ -3,6 +3,7 @@
>> #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
>>
>> require conf/machine/include/k3r5.inc
>> +require conf/machine/include/ti-extras.inc
>>
>> SYSFW_SOC = "am62x"
>> SYSFW_CONFIG = "evm"
>> diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
>> index c4357be3..082a1ae7 100644
>> --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
>> +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
>> @@ -3,6 +3,7 @@
>> #@DESCRIPTION: Machine configuration for the TI AM62XX EVM
>>
>> require conf/machine/include/am62xx.inc
>> +require conf/machine/include/ti-extras.inc
>>
>> KERNEL_DEVICETREE_PREFIX = "ti/k3-am625"
>>
>> diff --git a/meta-ti-bsp/conf/machine/include/ti-extras.inc b/meta-ti-bsp/conf/machine/include/ti-extras.inc
>> new file mode 100644
>> index 00000000..59eef952
>> --- /dev/null
>> +++ b/meta-ti-bsp/conf/machine/include/ti-extras.inc
>> @@ -0,0 +1,5 @@
>> +# Add TI_EXTRAS to machine overrides so we get access to e.g. 'jailhouse'
>> +
>> +TI_EXTRAS ??= ""
>> +MACHINEOVERRIDES =. "${@['', '${TI_EXTRAS}:']['${TI_EXTRAS}' != '']}"
>> +
>> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
>> new file mode 100644
>> index 00000000..e5e1cc10
>> --- /dev/null
>> +++ b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
>> @@ -0,0 +1,11 @@
>> +
>> +# This will have priority over generic uboot path
>> +
>> +BRANCH = "ti-u-boot-2023.04"
>> +BRANCH:tie-jailhouse = "ti-u-boot-2023.04-jailhouse"
>> +
>> +SRCREV = "010afc1fe7a1412f92363c8af69c848d76a53e42"
>> +SRCREV:tie-jailhouse = "79615e1c99b9aa73948f811f5f866cff2e34dc37"
>> +
>> +UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git"
>> +
>> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
>> index f4c5e88c..4bde0256 100644
>> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
>> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
>> @@ -1,5 +1,7 @@
>> require u-boot-ti.inc
>>
>> +include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
>> +
>> LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
>>
>> PR = "r0"
>> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
>> index f29b089e..f3285c23 100644
>> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
>> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
>> @@ -16,7 +16,7 @@ LICENSE = "GPL-2.0-or-later"
>> LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
>>
>> BRANCH ?= "master"
>> -UBOOT_GIT_URI = "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
>> +UBOOT_GIT_URI ?= "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
>> UBOOT_GIT_PROTOCOL = "https"
>> SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};branch=${BRANCH}"
>>
>> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
>> index 0b36575b..2b84b6b5 100644
>> --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
>> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
>> @@ -9,6 +9,7 @@ require recipes-kernel/linux/setup-defconfig.inc
>> require recipes-kernel/linux/kernel-rdepends.inc
>> require recipes-kernel/linux/ti-kernel.inc
>> include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
>> +include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
>>
>> DEPENDS += "gmp-native libmpc-native"
>>
>> @@ -20,16 +21,16 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
>>
>> S = "${WORKDIR}/git"
>>
>> -BRANCH = "ti-linux-6.1.y"
>> +BRANCH ?= "ti-linux-6.1.y"
>>
>> -SRCREV = "7124dee9779a40c52c52331c3ba6ccc84f357380"
>> +SRCREV ?= "7124dee9779a40c52c52331c3ba6ccc84f357380"
>> PV = "6.1.26+git${SRCPV}"
>>
>> # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
>> MACHINE_KERNEL_PR:append = "b"
>> PR = "${MACHINE_KERNEL_PR}"
>>
>> -KERNEL_GIT_URI = "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
>> +KERNEL_GIT_URI ??= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
>> KERNEL_GIT_PROTOCOL = "https"
>> SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
>> file://defconfig"
>> diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
>> new file mode 100644
>> index 00000000..f9fdd57a
>> --- /dev/null
>> +++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
>> @@ -0,0 +1,14 @@
>> +
>> +# Use different commit, repo and branch for TI extras build
>> +# This will have priority over generic rt path
>> +
>> +COMPATIBLE_MACHINE = "am62xx-evm"
>> +
>> +BRANCH = "ti-linux-6.1.y"
>> +BRANCH:tie-jailhouse = "ti-linux-6.1.y-jailhouse"
>> +
>> +SRCREV = "30bcc25e7cb1b25667db88d61828728f0f0b5f4b"
>> +SRCREV:tie-jailhouse = "0ed0dec2462b805b0188fe080895adc437871549"
>> +
>> +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 05cc21b3..eb4a98f7 100644
>> --- a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
>> +++ b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
>> @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = " \
>> file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
>> "
>>
>> +COMPATIBLE_MACHINE = "am62xx-evm"
>> +
>> TARGET_CC_ARCH += "${LDFLAGS}"
>>
>> PV = "0.12+git${SRCPV}"
>> --
>> 2.17.1
--
Ryan Eatmon reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [EXTERNAL] [meta-ti][master/kirkstone][RFC] ti-extras: Add support for extra kernel/u-boot features
2023-06-11 19:54 [meta-ti][master/kirkstone][RFC] ti-extras: Add support for extra kernel/u-boot features Ryan Eatmon
2023-06-12 19:42 ` Denys Dmytriyenko
@ 2023-06-13 10:51 ` Paresh Bhagat
1 sibling, 0 replies; 5+ messages in thread
From: Paresh Bhagat @ 2023-06-13 10:51 UTC (permalink / raw)
To: reatmon, Praneeth Bajjuri, Denys Dmytriyenko, meta-ti
Cc: g-gupta, khasim, Shilwant, Chirag, s-adivi
On 12/06/23 01:24, Ryan Eatmon via lists.yoctoproject.org wrote:
> From: Paresh Bhagat <p-bhagat@ti.com>
>
> There are some features that will either never be accepted into the
> upstream kernel, or are not ready to be accepted. ti-extras allows for
> controlling the kernel and u-boot repos, breanches, and srcrevs to gain
> access to those features via the TI_EXTRAS variable in the local.conf
> file.
>
> Initial support for TI_EXTRAS=tie-jailhouse is being added by this
> patch.
>
> Signed-off-by: Paresh Bhagat <p-bhagat@ti.com>
> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> ---
>
> RFC
>
> This is a pass at reworking the logic for adding support for jailhouse
> behind a more extensible TI_EXTRAS system. Please comment on it.
>
Acked-by: Paresh Bhagat <p-bhagat@ti.com>
>
>
> meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 1 +
> meta-ti-bsp/conf/machine/am62xx-evm.conf | 1 +
> meta-ti-bsp/conf/machine/include/ti-extras.inc | 5 +++++
> meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc | 11 +++++++++++
> .../u-boot/u-boot-ti-staging_2023.04.bb | 2 ++
> meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 2 +-
> .../recipes-kernel/linux/linux-ti-staging_6.1.bb | 7 ++++---
> meta-ti-bsp/recipes-kernel/linux/ti-extras.inc | 14 ++++++++++++++
> .../recipes-ti/jailhouse/jailhouse_git.bb | 2 ++
> 9 files changed, 41 insertions(+), 4 deletions(-)
> create mode 100644 meta-ti-bsp/conf/machine/include/ti-extras.inc
> create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
> create mode 100644 meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
>
> diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
> index 9889ae38..548369ca 100644
> --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
> @@ -3,6 +3,7 @@
> #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
>
> require conf/machine/include/k3r5.inc
> +require conf/machine/include/ti-extras.inc
>
> SYSFW_SOC = "am62x"
> SYSFW_CONFIG = "evm"
> diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
> index c4357be3..082a1ae7 100644
> --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
> +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
> @@ -3,6 +3,7 @@
> #@DESCRIPTION: Machine configuration for the TI AM62XX EVM
>
> require conf/machine/include/am62xx.inc
> +require conf/machine/include/ti-extras.inc
>
> KERNEL_DEVICETREE_PREFIX = "ti/k3-am625"
>
> diff --git a/meta-ti-bsp/conf/machine/include/ti-extras.inc b/meta-ti-bsp/conf/machine/include/ti-extras.inc
> new file mode 100644
> index 00000000..59eef952
> --- /dev/null
> +++ b/meta-ti-bsp/conf/machine/include/ti-extras.inc
> @@ -0,0 +1,5 @@
> +# Add TI_EXTRAS to machine overrides so we get access to e.g. 'jailhouse'
> +
> +TI_EXTRAS ??= ""
> +MACHINEOVERRIDES =. "${@['', '${TI_EXTRAS}:']['${TI_EXTRAS}' != '']}"
> +
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
> new file mode 100644
> index 00000000..e5e1cc10
> --- /dev/null
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
> @@ -0,0 +1,11 @@
> +
> +# This will have priority over generic uboot path
> +
> +BRANCH = "ti-u-boot-2023.04"
> +BRANCH:tie-jailhouse = "ti-u-boot-2023.04-jailhouse"
> +
> +SRCREV = "010afc1fe7a1412f92363c8af69c848d76a53e42"
> +SRCREV:tie-jailhouse = "79615e1c99b9aa73948f811f5f866cff2e34dc37"
> +
> +UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git"
> +
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
> index f4c5e88c..4bde0256 100644
> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
> @@ -1,5 +1,7 @@
> require u-boot-ti.inc
>
> +include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
> +
> LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
>
> PR = "r0"
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> index f29b089e..f3285c23 100644
> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> @@ -16,7 +16,7 @@ LICENSE = "GPL-2.0-or-later"
> LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
>
> BRANCH ?= "master"
> -UBOOT_GIT_URI = "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
> +UBOOT_GIT_URI ?= "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
> UBOOT_GIT_PROTOCOL = "https"
> SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};branch=${BRANCH}"
>
> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
> index 0b36575b..2b84b6b5 100644
> --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
> @@ -9,6 +9,7 @@ require recipes-kernel/linux/setup-defconfig.inc
> require recipes-kernel/linux/kernel-rdepends.inc
> require recipes-kernel/linux/ti-kernel.inc
> include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
> +include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
>
> DEPENDS += "gmp-native libmpc-native"
>
> @@ -20,16 +21,16 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
>
> S = "${WORKDIR}/git"
>
> -BRANCH = "ti-linux-6.1.y"
> +BRANCH ?= "ti-linux-6.1.y"
>
> -SRCREV = "7124dee9779a40c52c52331c3ba6ccc84f357380"
> +SRCREV ?= "7124dee9779a40c52c52331c3ba6ccc84f357380"
> PV = "6.1.26+git${SRCPV}"
>
> # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
> MACHINE_KERNEL_PR:append = "b"
> PR = "${MACHINE_KERNEL_PR}"
>
> -KERNEL_GIT_URI = "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
> +KERNEL_GIT_URI ??= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
> KERNEL_GIT_PROTOCOL = "https"
> SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
> file://defconfig"
> diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
> new file mode 100644
> index 00000000..f9fdd57a
> --- /dev/null
> +++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
> @@ -0,0 +1,14 @@
> +
> +# Use different commit, repo and branch for TI extras build
> +# This will have priority over generic rt path
> +
> +COMPATIBLE_MACHINE = "am62xx-evm"
> +
> +BRANCH = "ti-linux-6.1.y"
> +BRANCH:tie-jailhouse = "ti-linux-6.1.y-jailhouse"
> +
> +SRCREV = "30bcc25e7cb1b25667db88d61828728f0f0b5f4b"
> +SRCREV:tie-jailhouse = "0ed0dec2462b805b0188fe080895adc437871549"
> +
> +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 05cc21b3..eb4a98f7 100644
> --- a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
> +++ b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
> @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = " \
> file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
> "
>
> +COMPATIBLE_MACHINE = "am62xx-evm"
> +
> TARGET_CC_ARCH += "${LDFLAGS}"
>
> PV = "0.12+git${SRCPV}"
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#16707): https://lists.yoctoproject.org/g/meta-ti/message/16707
> Mute This Topic: https://lists.yoctoproject.org/mt/99469820/7067447
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/11872989/7067447/425310138/xyzzy [p-bhagat@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-ti][master/kirkstone][RFC] ti-extras: Add support for extra kernel/u-boot features
[not found] <1767B2E60E2714B2.4582@lists.yoctoproject.org>
@ 2023-06-12 3:24 ` Eatmon, Ryan
0 siblings, 0 replies; 5+ messages in thread
From: Eatmon, Ryan @ 2023-06-12 3:24 UTC (permalink / raw)
To: Eatmon, Ryan; +Cc: Bajjuri, Praneeth, Denys Dmytriyenko, meta-ti
One thing to bear mind. This patch will not build cleanly because the uboot version has moved on and the forked repo is not up to date with the latest changes that meta to requires.
Sent from my iPad
> On Jun 11, 2023, at 14:55, Ryan Eatmon via lists.yoctoproject.org <reatmon=ti.com@lists.yoctoproject.org> wrote:
>
> From: Paresh Bhagat <p-bhagat@ti.com>
>
> There are some features that will either never be accepted into the
> upstream kernel, or are not ready to be accepted. ti-extras allows for
> controlling the kernel and u-boot repos, breanches, and srcrevs to gain
> access to those features via the TI_EXTRAS variable in the local.conf
> file.
>
> Initial support for TI_EXTRAS=tie-jailhouse is being added by this
> patch.
>
> Signed-off-by: Paresh Bhagat <p-bhagat@ti.com>
> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> ---
>
> RFC
>
> This is a pass at reworking the logic for adding support for jailhouse
> behind a more extensible TI_EXTRAS system. Please comment on it.
>
>
>
>
> meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 1 +
> meta-ti-bsp/conf/machine/am62xx-evm.conf | 1 +
> meta-ti-bsp/conf/machine/include/ti-extras.inc | 5 +++++
> meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc | 11 +++++++++++
> .../u-boot/u-boot-ti-staging_2023.04.bb | 2 ++
> meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 2 +-
> .../recipes-kernel/linux/linux-ti-staging_6.1.bb | 7 ++++---
> meta-ti-bsp/recipes-kernel/linux/ti-extras.inc | 14 ++++++++++++++
> .../recipes-ti/jailhouse/jailhouse_git.bb | 2 ++
> 9 files changed, 41 insertions(+), 4 deletions(-)
> create mode 100644 meta-ti-bsp/conf/machine/include/ti-extras.inc
> create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
> create mode 100644 meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
>
> diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
> index 9889ae38..548369ca 100644
> --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
> +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
> @@ -3,6 +3,7 @@
> #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
>
> require conf/machine/include/k3r5.inc
> +require conf/machine/include/ti-extras.inc
>
> SYSFW_SOC = "am62x"
> SYSFW_CONFIG = "evm"
> diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
> index c4357be3..082a1ae7 100644
> --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
> +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
> @@ -3,6 +3,7 @@
> #@DESCRIPTION: Machine configuration for the TI AM62XX EVM
>
> require conf/machine/include/am62xx.inc
> +require conf/machine/include/ti-extras.inc
>
> KERNEL_DEVICETREE_PREFIX = "ti/k3-am625"
>
> diff --git a/meta-ti-bsp/conf/machine/include/ti-extras.inc b/meta-ti-bsp/conf/machine/include/ti-extras.inc
> new file mode 100644
> index 00000000..59eef952
> --- /dev/null
> +++ b/meta-ti-bsp/conf/machine/include/ti-extras.inc
> @@ -0,0 +1,5 @@
> +# Add TI_EXTRAS to machine overrides so we get access to e.g. 'jailhouse'
> +
> +TI_EXTRAS ??= ""
> +MACHINEOVERRIDES =. "${@['', '${TI_EXTRAS}:']['${TI_EXTRAS}' != '']}"
> +
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
> new file mode 100644
> index 00000000..e5e1cc10
> --- /dev/null
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
> @@ -0,0 +1,11 @@
> +
> +# This will have priority over generic uboot path
> +
> +BRANCH = "ti-u-boot-2023.04"
> +BRANCH:tie-jailhouse = "ti-u-boot-2023.04-jailhouse"
> +
> +SRCREV = "010afc1fe7a1412f92363c8af69c848d76a53e42"
> +SRCREV:tie-jailhouse = "79615e1c99b9aa73948f811f5f866cff2e34dc37"
> +
> +UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git"
> +
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
> index f4c5e88c..4bde0256 100644
> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
> @@ -1,5 +1,7 @@
> require u-boot-ti.inc
>
> +include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
> +
> LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
>
> PR = "r0"
> diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> index f29b089e..f3285c23 100644
> --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
> @@ -16,7 +16,7 @@ LICENSE = "GPL-2.0-or-later"
> LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
>
> BRANCH ?= "master"
> -UBOOT_GIT_URI = "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
> +UBOOT_GIT_URI ?= "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
> UBOOT_GIT_PROTOCOL = "https"
> SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};branch=${BRANCH}"
>
> diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
> index 0b36575b..2b84b6b5 100644
> --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
> +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
> @@ -9,6 +9,7 @@ require recipes-kernel/linux/setup-defconfig.inc
> require recipes-kernel/linux/kernel-rdepends.inc
> require recipes-kernel/linux/ti-kernel.inc
> include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
> +include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
>
> DEPENDS += "gmp-native libmpc-native"
>
> @@ -20,16 +21,16 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
>
> S = "${WORKDIR}/git"
>
> -BRANCH = "ti-linux-6.1.y"
> +BRANCH ?= "ti-linux-6.1.y"
>
> -SRCREV = "7124dee9779a40c52c52331c3ba6ccc84f357380"
> +SRCREV ?= "7124dee9779a40c52c52331c3ba6ccc84f357380"
> PV = "6.1.26+git${SRCPV}"
>
> # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
> MACHINE_KERNEL_PR:append = "b"
> PR = "${MACHINE_KERNEL_PR}"
>
> -KERNEL_GIT_URI = "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
> +KERNEL_GIT_URI ??= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
> KERNEL_GIT_PROTOCOL = "https"
> SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
> file://defconfig"
> diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
> new file mode 100644
> index 00000000..f9fdd57a
> --- /dev/null
> +++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
> @@ -0,0 +1,14 @@
> +
> +# Use different commit, repo and branch for TI extras build
> +# This will have priority over generic rt path
> +
> +COMPATIBLE_MACHINE = "am62xx-evm"
> +
> +BRANCH = "ti-linux-6.1.y"
> +BRANCH:tie-jailhouse = "ti-linux-6.1.y-jailhouse"
> +
> +SRCREV = "30bcc25e7cb1b25667db88d61828728f0f0b5f4b"
> +SRCREV:tie-jailhouse = "0ed0dec2462b805b0188fe080895adc437871549"
> +
> +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 05cc21b3..eb4a98f7 100644
> --- a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
> +++ b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
> @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = " \
> file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
> "
>
> +COMPATIBLE_MACHINE = "am62xx-evm"
> +
> TARGET_CC_ARCH += "${LDFLAGS}"
>
> PV = "0.12+git${SRCPV}"
> --
> 2.17.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#16707): https://lists.yoctoproject.org/g/meta-ti/message/16707
> Mute This Topic: https://lists.yoctoproject.org/mt/99469820/6551054
> Group Owner: meta-ti+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/10828724/6551054/1815494134/xyzzy [reatmon@ti.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-13 10:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-11 19:54 [meta-ti][master/kirkstone][RFC] ti-extras: Add support for extra kernel/u-boot features Ryan Eatmon
2023-06-12 19:42 ` Denys Dmytriyenko
2023-06-13 1:20 ` Ryan Eatmon
2023-06-13 10:51 ` [EXTERNAL] " Paresh Bhagat
[not found] <1767B2E60E2714B2.4582@lists.yoctoproject.org>
2023-06-12 3:24 ` Eatmon, Ryan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.