diff mbox series

[meta-arago,master,2/2] arago-core-bundle: Add K3 system firmware and expand device tree support

Message ID 20260323135442.2056179-2-j-sahu@ti.com
State New
Headers show
Series [meta-arago,master,1/2] tisdk-bundle: Improve quote handling and add K3 firmware directory support | expand

Commit Message

Telukula Jeevan Kumar Sahu March 23, 2026, 1:54 p.m. UTC 
Update DEPLOY_SPL_NAME, DEPLOY_IMAGES_NAME with wildcard patterns
to include all the boot partition files for all device variants.

Add the default boot ti-sysfw binaries in pre-built images using
SYSFW_BINARY for all devices generated using SYSFW_SOC and SYSFW_PREFIX.

Expand and update DTB_FILTER values to use correct device tree naming
patterns to include all the supported device trees in the pre-builts.

Signed-off-by: Telukula Jeevan Kumar Sahu <j-sahu@ti.com>
---
 .../recipes-core/images/arago-core-bundle.bb  |  8 ++--
 .../recipes-core/images/arago-core-bundle.inc | 42 +++++++++++++++++--
 2 files changed, 42 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/meta-arago-distro/recipes-core/images/arago-core-bundle.bb b/meta-arago-distro/recipes-core/images/arago-core-bundle.bb
index 5af8774c..cb4f22f0 100644
--- a/meta-arago-distro/recipes-core/images/arago-core-bundle.bb
+++ b/meta-arago-distro/recipes-core/images/arago-core-bundle.bb
@@ -8,14 +8,12 @@  DESCRIPTION = "This creates an installer including all the default images\
 require arago-core-bundle.inc
 
 DEPLOY_SPL_NAME:omapl138 = ""
-DEPLOY_SPL_NAME:k3 = "tispl.bin tiboot3.bin"
+DEPLOY_SPL_NAME:k3 = "tispl.bin tiboot3*.bin"
 
 DEPLOY_IMAGES_NAME:k3 = "trusted-firmware-a/bl31.bin optee/bl32.bin Image fitImage fitImage-its-${MACHINE}"
 DEPLOY_IMAGES_NAME:append:am62lxx = " trusted-firmware-a/bl1.bin"
-DEPLOY_IMAGES_NAME:append:am65xx = " sysfw.itb"
-DEPLOY_IMAGES_NAME:append:j721e = " sysfw.itb"
-DEPLOY_IMAGES_NAME:append:am65xx-evm = " sysfw-am65x_sr2-gp-evm.itb"
-DEPLOY_IMAGES_NAME:append:am65xx-hs-evm = " sysfw-am65x_sr2-hs-evm.itb"
+DEPLOY_IMAGES_NAME:append:am65xx = " sysfw.itb sysfw-*evm.itb"
+DEPLOY_IMAGES_NAME:append:j721e = " sysfw.itb sysfw-*evm.itb"
 DEPLOY_IMAGES_NAME:append:ti33x = " extlinux.conf"
 DEPLOY_IMAGES_NAME:append:ti43x = " extlinux.conf"
 
diff --git a/meta-arago-distro/recipes-core/images/arago-core-bundle.inc b/meta-arago-distro/recipes-core/images/arago-core-bundle.inc
index 63b73229..ae2c5b1b 100644
--- a/meta-arago-distro/recipes-core/images/arago-core-bundle.inc
+++ b/meta-arago-distro/recipes-core/images/arago-core-bundle.inc
@@ -21,10 +21,46 @@  DTB_FILTER:ti33x = "am335x"
 DTB_FILTER:am57xx = "am57xx"
 DTB_FILTER:ti43x = "am43"
 DTB_FILTER:omapl138 = "da850"
-DTB_FILTER:am65xx = "am65"
-DTB_FILTER:j721e = "j721e"
+DTB_FILTER:am65xx = "k3-am654"
+DTB_FILTER:j721e = "j721e\|fpdlink"
 DTB_FILTER:j7200 = "j7200"
-DTB_FILTER:j721s2 = "j721s2"
+DTB_FILTER:j721s2 = "j721s2\|am68\|fpdlink\|k3-v3link"
+DTB_FILTER:j784s4 = "j784s4\|am69\|fpdlink\|k3-v3link"
+DTB_FILTER:j722s = "j722s\|fpdlink\|k3-v3link"
+DTB_FILTER:am62xx-evm = "k3-am625"
+DTB_FILTER:am62lxx = "k3-am62l"
+DTB_FILTER:am62xx-lp-evm = "k3-am62-lp\|k3-am625-sk"
+DTB_FILTER:am62xxsip-evm = "k3-am625"
+DTB_FILTER:am64xx = "k3-am642"
+DTB_FILTER:am62pxx-evm = "k3-am62p5"
+DTB_FILTER:am62axx = "k3-am62a7\|k3-am62x-sk\|k3-fpdlink\|k3-v3link"
+DTB_FILTER:am62dxx = "k3-am62d2\|k3-am62a7-sk-edgeai\|k3-am62a7-sk-rpi-hdr-ehrpwm\|k3-am62x-sk\|k3-am62a7-sk-e3-max-opp"
+
+# K3 SoC system firmware configuration
+# Maps machine types to their firmware naming variants for prebuilt-images
+SYSFW_SOC ?= "*"
+SYSFW_SOC:j721e = "j721e"
+SYSFW_SOC:j7200 = "j7200"
+SYSFW_SOC:j721s2 = "j721s2"
+SYSFW_SOC:j784s4 = "j784s4"
+SYSFW_SOC:j722s = "j722s"
+SYSFW_SOC:am62axx = "am62ax"
+SYSFW_SOC:am62xx = "am62x"
+SYSFW_SOC:am62lxx = "am62lx"
+SYSFW_SOC:am64xx = "am64x_sr2 am64x-gp"
+SYSFW_SOC:am62pxx = "am62px"
+SYSFW_SOC:am65xx = "am65x_sr2"
+SYSFW_SOC:am62dxx = "am62ax"
+
+SYSFW_PREFIX ?= "fs"
+SYSFW_PREFIX:am64xx = "sci"
+SYSFW_PREFIX:am65xx = "sci"
+SYSFW_PREFIX:am62xx = "fs*"
+SYSFW_PREFIX:am62pxx = "fs*"
+SYSFW_PREFIX:am62axx = "fs*"
+SYSFW_PREFIX:am62dxx = "fs*"
+
+SYSFW_BINARY = "${@' '.join(['ti-' + d.getVar('SYSFW_PREFIX') + '-firmware-' + x + '*.bin' for x in d.getVar('SYSFW_SOC').split()])}"
 
 # List of target side images to build for the SDK
 TARGET_IMAGES = "arago-base-image arago-default-image arago-thinlinux-image arago-bootstrap-image"