Skip to contentSkip to conversation

ti-extras: Add support for extra kernel/u-boot features

RFC In review Ryan Eatmon 3 participants 4 messages Jun 11, 2023 – Jun 13, 2023

lore
Share & tools
lore
#0 lore raw

RFC 1/1 ti-extras: Add support for extra kernel/u-boot features

From: Paresh Bhagat <[email protected]>

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.

---

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
meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +1 -0
index 9889ae38..548369ca 100644
@@ -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"
meta-ti-bsp/conf/machine/am62xx-evm.conf +1 -0
index c4357be3..082a1ae7 100644
@@ -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"
 
meta-ti-bsp/conf/machine/include/ti-extras.inc new file +5 -0
new file mode 100644
index 00000000..59eef952
@@ -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}' != '']}"
+
meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc new file +11 -0
new file mode 100644
index 00000000..e5e1cc10
@@ -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"
+
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb +2 -0
index f4c5e88c..4bde0256 100644
@@ -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"
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +1 -1
index f29b089e..f3285c23 100644
@@ -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}"
 
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +4 -3
index 0b36575b..2b84b6b5 100644
@@ -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"
meta-ti-bsp/recipes-kernel/linux/ti-extras.inc new file +14 -0
new file mode 100644
index 00000000..f9fdd57a
@@ -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"
+
meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb +2 -0
index 05cc21b3..eb4a98f7 100644
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = " \
     file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
 "
 
+COMPATIBLE_MACHINE = "am62xx-evm"
+
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 PV = "0.12+git${SRCPV}"
Signature · 1 line
2.17.1
#1 lore raw

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?

Quoted 181 lines · Ryan Eatmon via lists.yoctoproject.org

From: Paresh Bhagat <[email protected]>

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.

---

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
meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +1 -0
index 9889ae38..548369ca 100644
@@ -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"
meta-ti-bsp/conf/machine/am62xx-evm.conf +1 -0
index c4357be3..082a1ae7 100644
@@ -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"
 
meta-ti-bsp/conf/machine/include/ti-extras.inc new file +5 -0
new file mode 100644
index 00000000..59eef952
@@ -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}' != '']}"
+
meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc new file +11 -0
new file mode 100644
index 00000000..e5e1cc10
@@ -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"
+
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb +2 -0
index f4c5e88c..4bde0256 100644
@@ -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"
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +1 -1
index f29b089e..f3285c23 100644
@@ -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}"
 
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +4 -3
index 0b36575b..2b84b6b5 100644
@@ -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"
meta-ti-bsp/recipes-kernel/linux/ti-extras.inc new file +14 -0
new file mode 100644
index 00000000..f9fdd57a
@@ -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"
+
meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb +2 -0
index 05cc21b3..eb4a98f7 100644
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = " \
     file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
 "
 
+COMPATIBLE_MACHINE = "am62xx-evm"
+
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 PV = "0.12+git${SRCPV}"
Signature · 1 line
2.17.1
#2 lore raw
Quoted 7 lines · Denys Dmytriyenko

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.

Quoted 2 lines

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.

Quoted 2 lines

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.

Quoted 183 lines · Ryan Eatmon via lists.yoctoproject.org
Quoted 181 lines

From: Paresh Bhagat <[email protected]>

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.

---

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

meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +1 -0
index 9889ae38..548369ca 100644
@@ -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"
meta-ti-bsp/conf/machine/am62xx-evm.conf +1 -0
index c4357be3..082a1ae7 100644
@@ -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"
 
meta-ti-bsp/conf/machine/include/ti-extras.inc new file +5 -0
new file mode 100644
index 00000000..59eef952
@@ -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}' != '']}"
+
meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc new file +11 -0
new file mode 100644
index 00000000..e5e1cc10
@@ -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"
+
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb +2 -0
index f4c5e88c..4bde0256 100644
@@ -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"
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +1 -1
index f29b089e..f3285c23 100644
@@ -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}"
 
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +4 -3
index 0b36575b..2b84b6b5 100644
@@ -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"
meta-ti-bsp/recipes-kernel/linux/ti-extras.inc new file +14 -0
new file mode 100644
index 00000000..f9fdd57a
@@ -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"
+
meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb +2 -0
index 05cc21b3..eb4a98f7 100644
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = " \
      file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
  "
 
+COMPATIBLE_MACHINE = "am62xx-evm"
+
  TARGET_CC_ARCH += "${LDFLAGS}"
 
  PV = "0.12+git${SRCPV}"
Signature · 1 line
2.17.1
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
Acked-by on v1 1/1
#3 lore raw
In reply to Ryan Eatmon
Quoted 11 lines · Ryan Eatmon via lists.yoctoproject.org

From: Paresh Bhagat <[email protected]>

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.

Quoted 9 lines

---

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.

Quoted 167 lines

  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

meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +1 -0
index 9889ae38..548369ca 100644
@@ -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"
meta-ti-bsp/conf/machine/am62xx-evm.conf +1 -0
index c4357be3..082a1ae7 100644
@@ -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"
 
meta-ti-bsp/conf/machine/include/ti-extras.inc new file +5 -0
new file mode 100644
index 00000000..59eef952
@@ -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}' != '']}"
+
meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc new file +11 -0
new file mode 100644
index 00000000..e5e1cc10
@@ -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"
+
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb +2 -0
index f4c5e88c..4bde0256 100644
@@ -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"
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +1 -1
index f29b089e..f3285c23 100644
@@ -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}"
 
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +4 -3
index 0b36575b..2b84b6b5 100644
@@ -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"
meta-ti-bsp/recipes-kernel/linux/ti-extras.inc new file +14 -0
new file mode 100644
index 00000000..f9fdd57a
@@ -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"
+
meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb +2 -1
index 05cc21b3..eb4a98f7 100644
@@ -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: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/leave/11872989/7067447/425310138/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-