Will send a v2 of this patch. Do not merge -----Original Message----- From: [email protected] <[email protected]> On Behalf Of Paresh Bhagat via lists.yoctoproject.org Sent: Tuesday, November 21, 2023 5:21 PM To: [email protected]; Bajjuri, Praneeth <[email protected]>; Eatmon, Ryan <[email protected]> Cc: Shilwant, Chirag <[email protected]>; Adivi, Sai Sree Kartheek <[email protected]>; Khasim, Syed Mohammed <[email protected]>; Gupta, Gyan <[email protected]> Subject: [EXTERNAL] [meta-ti] [kirkstone][PATCH] ti-extras: Add support for extra kernel/u-boot features for am62pxx
Add support for ti-extras for am62pxx to control the kernel and u-boot repos, branches, and srcrevs via the TI_EXTRAS variable in the local.conf file. Also add am62pxx as compatible machine in jailhouse recipe. So the am62pxx jailhouse build can be done by adding TI_EXTRAS=tie-jailhouse in local.conf. Signed-off-by: Paresh Bhagat <[email protected]> --- meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf | 1 + meta-ti-bsp/conf/machine/am62pxx-evm.conf | 1 + meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc | 2 +- meta-ti-bsp/recipes-kernel/linux/ti-extras.inc | 2 +- meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb | 6 +++++- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf index 33254bf2..36915381 100644 --- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI AM62Px EVM (R5F core) require conf/machine/include/k3r5.inc +require conf/machine/include/ti-extras.inc SYSFW_SOC = "am62px" SYSFW_CONFIG = "evm" diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm.conf b/meta-ti-bsp/conf/machine/am62pxx-evm.conf index 931de953..d7c9f589 100644 --- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI AM62PX EVM require conf/machine/include/am62pxx.inc +require conf/machine/include/ti-extras.inc KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am62p5 \ 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 e0a94ea6..d32c6529 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc @@ -1,7 +1,7 @@ # This will have priority over generic uboot path -COMPATIBLE_MACHINE = "am62xx" +COMPATIBLE_MACHINE = "am62xx|am62pxx" BRANCH = "ti-u-boot-2023.04" BRANCH:tie-jailhouse = "ti-u-boot-2023.04-jailhouse" diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc index 076a67db..0b22aca9 100644 --- a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc +++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc @@ -2,7 +2,7 @@ # Use different commit, repo and branch for TI extras build # This will have priority over generic rt path -COMPATIBLE_MACHINE = "am62xx" +COMPATIBLE_MACHINE = "am62xx|am62pxx" BRANCH = "ti-linux-6.1.y" BRANCH:tie-jailhouse = "ti-linux-6.1.y-jailhouse" diff --git a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb index a96a7831..ca829986 100644 --- a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb +++ b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ " -COMPATIBLE_MACHINE = "am62xx" +COMPATIBLE_MACHINE = "am62xx|am62pxx" TARGET_CC_ARCH += "${LDFLAGS}" @@ -55,18 +55,21 @@ JH_CELL_FILES:k3 ?= "k3-*.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:j7 ?= "inmate-k3-j721e-evm.dtb" JH_INMATE_DTB:j7200-evm ?= "inmate-k3-j7200-evm.dtb" 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:j7 ?= "k3-j721e-evm-linux-demo.cell" JH_LINUX_DEMO_CELL:j7200-evm ?= "k3-j7200-evm-linux-demo.cell" 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:j7 ?= "k3-j721e-evm.cell" JH_SYSCONFIG_CELL:j7200-evm ?= "k3-j7200-evm.cell" @@ -75,6 +78,7 @@ 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:am65xx ?= "console=ttyS1,115200n8" JH_CMDLINE:j7 ?= "console=ttyS3,115200n8" JH_CMDLINE:j7200-evm ?= "console=ttyS3,115200n8" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17329): https://lists.yoctoproject.org/g/meta-ti/message/17329 Mute This Topic: https://lists.yoctoproject.org/mt/102726759/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
