From 27615406abc5caab4a0e582f8c766c277436ca83 Mon Sep 17 00:00:00 2001 From: Franz Schnyder Date: Thu, 16 Apr 2026 08:40:22 +0200 Subject: [PATCH] conf: machine: j784s4: Move ti-eth-fw-j784s4 to EVM conf The `ti-eth-fw-j784s4` firmware is added in the generic J784s4 SoC include, which is therefore used for all the J784s4-based machines. That firmware seems to be developed specifically for the EVM, as it takes control of pins used for the Ethernet board setup on the EVM. On non-EVM boards, like the Aquila-AM69, those signals are used for other functions, so enabling the firmware in the SoC include is too broad and breaks functionality. Move the machine-essential recommend from the SoC include to the EVM configuration. Signed-off-by: Franz Schnyder Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/include/j784s4.inc | 2 +- meta-ti-bsp/conf/machine/j784s4-evm.conf | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index 4dc3a71b..e0ce81b5 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -12,7 +12,7 @@ TFA_BOARD = "j784s4" OPTEEMACHINE = "k3-j784s4" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw-j784s4" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw" TI_CORE_INITRAMFS_KERNEL_MODULES = "kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs" TI_CORE_INITRAMFS_KERNEL_MODULES:bsp-ti-6_6 = "" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf index bf53b07c..a88f6f69 100644 --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf @@ -27,3 +27,5 @@ KERNEL_DEVICETREE = " \ " UBOOT_MACHINE = "j784s4_evm_a72_defconfig" + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw-j784s4"