From a0b3248c3e45a147b8184f32388a6e1d2536279a Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Wed, 12 Mar 2025 09:09:16 -0500 Subject: conf: machine: j721e: Add BSP support for new out of tree module The new out of tree module ti-vxe-vxd-driver is only for the 6.12 kernel and later. Since we support multiple BSPs we need to correctly wrap this addition behind some additional logic that can make sure to not include it for the 6.1 and 6.6 kernel builds where the module is still in the tree. Additionally, fix up the beaglebone-ai64 since it includes the j721e.inc file and will need to clear this variable for its BSPs as well. Signed-off-by: Ryan Eatmon --- meta-beagle/conf/machine/beaglebone-ai64.conf | 6 ++++++ meta-ti-bsp/conf/machine/include/j721e.inc | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/meta-beagle/conf/machine/beaglebone-ai64.conf b/meta-beagle/conf/machine/beaglebone-ai64.conf index ecd3a6e7..c7d72590 100644 --- a/meta-beagle/conf/machine/beaglebone-ai64.conf +++ b/meta-beagle/conf/machine/beaglebone-ai64.conf @@ -46,3 +46,9 @@ ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \ " MACHINE_GUI_CLASS = "bigscreen" + +# TI has moved a driver out of its kernel tree and into an out of tree module. +# We need to not include that for older kernels since the module is still in +# the kernel. +TI_VXE_VXD_DRIVER:bsp-bb_org-6_6 = "" +TI_VXE_VXD_DRIVER:bsp-bb_org-6_1 = "" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 6264d5c8..b5ba448e 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -36,4 +36,8 @@ TFA_BOARD = "generic" OPTEEMACHINE = "k3-j721e" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw ti-vxe-vxd-driver" +TI_VXE_VXD_DRIVER = "ti-vxe-vxd-driver" +TI_VXE_VXD_DRIVER:bsp-ti-6_6 = "" +TI_VXE_VXD_DRIVER:bsp-ti-6_1 = "" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw ${TI_VXE_VXD_DRIVER}" -- cgit v1.2.3-54-g00ecf