| Message ID | 20250825063449.3639186-1-j-sahu@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,scarthgap/master] conf: machine: Include merged device trees in the list of generated dtbs | expand |
meta-ti / na / 20250825063449.3639186-1-j-sahu PRC Results: PASS ========================================================= check-yocto-patches: PASS ========================================================= Patches ---------------------------------------- All patches passed ========================================================= apply-yocto-patch: PASS ========================================================= scarthgap ===================== Summary: - Patch Series: [meta-ti][scarthgap/master][PATCH] conf: machine: Include merged device trees in the list of generated dtbs - Submitter: From: Telukula Jeevan Kumar Sahu <j-sahu@ti.com> - Date: Date: Mon, 25 Aug 2025 12:04:49 +0530 - Num Patches: 1 - Mailing List (public inbox) Commit SHA: 2b41b4713cd3e3abd2aa54d86790abd02e1d5b30 Applied to: - Repository: lcpd-prc-meta-ti - Base Branch: scarthgap-wip - Commit Author: Thorsten Lannynd <t-lannynd@ti.com> - Commit Subject: ti-bsp: recipes-multimedia: Add udev rules for VPU and JPEG encoder symlinks - Commit SHA: c2b58f991f2175f7b0bfa14a2bce042bfe4610c5 Patches ---------------------------------------- All patches applied master ===================== Summary: - Patch Series: [meta-ti][scarthgap/master][PATCH] conf: machine: Include merged device trees in the list of generated dtbs - Submitter: From: Telukula Jeevan Kumar Sahu <j-sahu@ti.com> - Date: Date: Mon, 25 Aug 2025 12:04:49 +0530 - Num Patches: 1 - Mailing List (public inbox) Commit SHA: 2b41b4713cd3e3abd2aa54d86790abd02e1d5b30 Applied to: - Repository: lcpd-prc-meta-ti - Base Branch: master-wip - Commit Author: Thorsten Lannynd <t-lannynd@ti.com> - Commit Subject: ti-bsp: recipes-multimedia: Add udev rules for VPU and JPEG encoder symlinks - Commit SHA: 6059a084f6c8ae0aa1d76abb922949c8bb6dbb09 Patches ---------------------------------------- All patches applied ========================================================= check-yocto-repo: PASS ========================================================= scarthgap ===================== PASS master ===================== PASS
On 8/25/2025 1:34 AM, Telukula Jeevan Kumar Sahu wrote: > Add support for dtbs that are generated by merging multiple .dtb and .dtbo > files in the /boot directory of the root filesystem.These merged device trees > are defined in ti-linux-kernel Makefile[1]. Include them using the > KERNEL_DEVICETREE_DTBMERGE variable. I'm pretty sure that this patch is unnecessary. The KERNEL_DEVICETREE_DTBMERGE variable was to support some older legacy platforms. All of the entries you are adding are already picked up by the prefix. What problem are you trying to solve with this patch? > [1]: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/tree/arch/arm64/boot/dts/ti/Makefile?h=ti-linux-6.12.y > > Signed-off-by: Telukula Jeevan Kumar Sahu <j-sahu@ti.com> > --- > meta-ti-bsp/conf/machine/am62axx-evm.conf | 4 ++++ > meta-ti-bsp/conf/machine/include/am64xx.inc | 4 ++++ > meta-ti-bsp/conf/machine/include/am65xx.inc | 8 ++++++++ > meta-ti-bsp/conf/machine/j7200-evm.conf | 4 ++++ > meta-ti-bsp/conf/machine/j721e-evm.conf | 4 ++++ > meta-ti-bsp/conf/machine/j721s2-evm.conf | 4 ++++ > 6 files changed, 28 insertions(+) > > diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf > index faeb34a9..a10d5751 100644 > --- a/meta-ti-bsp/conf/machine/am62axx-evm.conf > +++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf > @@ -11,6 +11,10 @@ KERNEL_DEVICETREE_PREFIX = " \ > ti/k3-v3link \ > " > > +KERNEL_DEVICETREE_DTBMERGE = " \ > + ti/k3-am62a7-sk-ub954-evm-ov2312.dtb \ > +" > + > KERNEL_DEVICETREE = " \ > ti/k3-am62a7-phyboard-lyra-rdk.dtb \ > ti/k3-am62a7-sk.dtb \ > diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc > index e79e6e61..33fc6240 100644 > --- a/meta-ti-bsp/conf/machine/include/am64xx.inc > +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc > @@ -5,6 +5,10 @@ SOC_FAMILY:append = ":am64xx" > > KERNEL_DEVICETREE_PREFIX = "ti/k3-am642" > > +KERNEL_DEVICETREE_DTBMERGE = " \ > + ti/k3-am642-evm-nand.dtb \ > +" > + > KERNEL_DEVICETREE = " \ > ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \ > ti/k3-am642-evm-icssg1-dualemac.dtbo \ > diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc > index 7255bb30..d70bb22d 100644 > --- a/meta-ti-bsp/conf/machine/include/am65xx.inc > +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc > @@ -10,6 +10,14 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" > > KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" > > +KERNEL_DEVICETREE_DTBMERGE = " \ > + ti/k3-am654-gp-evm.dtb \ > + ti/k3-am654-evm.dtb \ > + ti/k3-am654-idk.dtb \ > + ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtb \ > + ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtb \ > +" > + > KERNEL_DEVICETREE = " \ > ti/k3-am654-base-board-rocktech-rk101-panel.dtbo \ > ti/k3-am654-base-board.dtb \ > diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf > index adfc6376..f6d9ee39 100644 > --- a/meta-ti-bsp/conf/machine/j7200-evm.conf > +++ b/meta-ti-bsp/conf/machine/j7200-evm.conf > @@ -6,6 +6,10 @@ require conf/machine/include/j7200.inc > > KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200" > > +KERNEL_DEVICETREE_DTBMERGE = " \ > + ti/k3-j7200-evm.dtb \ > +" > + > KERNEL_DEVICETREE = " \ > ti/k3-j7200-common-proc-board.dtb \ > ti/k3-j7200-evm-quad-port-eth-exp.dtbo \ > diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf > index b0b2a5b6..e9327f56 100644 > --- a/meta-ti-bsp/conf/machine/j721e-evm.conf > +++ b/meta-ti-bsp/conf/machine/j721e-evm.conf > @@ -10,6 +10,10 @@ KERNEL_DEVICETREE_PREFIX = " \ > ti/k3-j7200-evm-mcspi-loopback \ > " > > +KERNEL_DEVICETREE_DTBMERGE = " \ > + ti/k3-j721e-evm.dtb \ > +" > + > KERNEL_DEVICETREE = " \ > ti/k3-j721e-beagleboneai64.dtb \ > ti/k3-j721e-common-proc-board-infotainment.dtbo \ > diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf > index 5cb28309..2d7e6ebe 100644 > --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf > +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf > @@ -15,6 +15,10 @@ KERNEL_DEVICETREE_PREFIX = " \ > ti/k3-v3link \ > " > > +KERNEL_DEVICETREE_DTBMERGE = " \ > + ti/k3-j721s2-evm.dtb \ > +" > + > KERNEL_DEVICETREE = " \ > ti/k3-am68-sk-base-board.dtb \ > ti/k3-j721s2-common-proc-board.dtb \
On Mon, Aug 25, 2025 at 06:59 PM, Ryan Eatmon wrote: > > > > On 8/25/2025 1:34 AM, Telukula Jeevan Kumar Sahu wrote: > > Add support for dtbs that are generated by merging multiple .dtb and .dtbo > > files in the /boot directory of the root filesystem.These merged device > trees > > are defined in ti-linux-kernel Makefile[1]. Include them using the > > KERNEL_DEVICETREE_DTBMERGE variable. > > > I'm pretty sure that this patch is unnecessary. The > KERNEL_DEVICETREE_DTBMERGE variable was to support some older legacy > platforms. All of the entries you are adding are already picked up by > the prefix. > > What problem are you trying to solve with this patch? The dtbs referenced in this patch are generated by merging multiple dtb/dtbo files, and these are currently missing from our Yocto builds. Although KERNEL_DEVICETREE_PREFIX selects dtbs via patterns, it does not build these merged DTBs. In this case yocto selects the explicit merged dtbs received from KERNEL_DEVICETREE_DTBMERGE variable that matches with the entries in the Makefile(example for k3-am654-idk-dtbs[1]), and adds to KERNEL_DEVICETREE using get_merge_dtbs_from_kernel function[2]. This same approach was used previously for older legacy platform[3]. Without adding the merged DTBs to KERNEL_DEVICETREE_DTBMERGE, Yocto does not generate them. [1]: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/tree/arch/arm64/boot/dts/ti/Makefile?h=ti-linux-6.12.y#n132 [2]: https://git.ti.com/cgit/arago-project/meta-ti/tree/meta-ti-bsp/classes/ti-devicetree-prefix.bbclass?h=scarthgap#n23 [3]: https://git.ti.com/cgit/arago-project/meta-ti/tree/meta-ti-bsp/conf/machine/am57xx-evm.conf?h=scarthgap#n23 > > > > > [1]: > https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/tree/arch/arm64/boot/dts/ti/Makefile?h=ti-linux-6.12.y > > > > Signed-off-by: Telukula Jeevan Kumar Sahu <j-sahu@ti.com> > > --- > > meta-ti-bsp/conf/machine/am62axx-evm.conf | 4 ++++ > > meta-ti-bsp/conf/machine/include/am64xx.inc | 4 ++++ > > meta-ti-bsp/conf/machine/include/am65xx.inc | 8 ++++++++ > > meta-ti-bsp/conf/machine/j7200-evm.conf | 4 ++++ > > meta-ti-bsp/conf/machine/j721e-evm.conf | 4 ++++ > > meta-ti-bsp/conf/machine/j721s2-evm.conf | 4 ++++ > > 6 files changed, 28 insertions(+) > > > > diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf > b/meta-ti-bsp/conf/machine/am62axx-evm.conf > > index faeb34a9..a10d5751 100644 > > --- a/meta-ti-bsp/conf/machine/am62axx-evm.conf > > +++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf > > @@ -11,6 +11,10 @@ KERNEL_DEVICETREE_PREFIX = " \ > > ti/k3-v3link \ > > " > > > > +KERNEL_DEVICETREE_DTBMERGE = " \ > > + ti/k3-am62a7-sk-ub954-evm-ov2312.dtb \ > > +" > > + > > KERNEL_DEVICETREE = " \ > > ti/k3-am62a7-phyboard-lyra-rdk.dtb \ > > ti/k3-am62a7-sk.dtb \ > > diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc > b/meta-ti-bsp/conf/machine/include/am64xx.inc > > index e79e6e61..33fc6240 100644 > > --- a/meta-ti-bsp/conf/machine/include/am64xx.inc > > +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc > > @@ -5,6 +5,10 @@ SOC_FAMILY:append = ":am64xx" > > > > KERNEL_DEVICETREE_PREFIX = "ti/k3-am642" > > > > +KERNEL_DEVICETREE_DTBMERGE = " \ > > + ti/k3-am642-evm-nand.dtb \ > > +" > > + > > KERNEL_DEVICETREE = " \ > > ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \ > > ti/k3-am642-evm-icssg1-dualemac.dtbo \ > > diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc > b/meta-ti-bsp/conf/machine/include/am65xx.inc > > index 7255bb30..d70bb22d 100644 > > --- a/meta-ti-bsp/conf/machine/include/am65xx.inc > > +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc > > @@ -10,6 +10,14 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= > "${BSP_SGX_DRIVER_PROVIDER}" > > > > KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" > > > > +KERNEL_DEVICETREE_DTBMERGE = " \ > > + ti/k3-am654-gp-evm.dtb \ > > + ti/k3-am654-evm.dtb \ > > + ti/k3-am654-idk.dtb \ > > + ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtb \ > > + ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtb \ > > +" > > + > > KERNEL_DEVICETREE = " \ > > ti/k3-am654-base-board-rocktech-rk101-panel.dtbo \ > > ti/k3-am654-base-board.dtb \ > > diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf > b/meta-ti-bsp/conf/machine/j7200-evm.conf > > index adfc6376..f6d9ee39 100644 > > --- a/meta-ti-bsp/conf/machine/j7200-evm.conf > > +++ b/meta-ti-bsp/conf/machine/j7200-evm.conf > > @@ -6,6 +6,10 @@ require conf/machine/include/j7200.inc > > > > KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200" > > > > +KERNEL_DEVICETREE_DTBMERGE = " \ > > + ti/k3-j7200-evm.dtb \ > > +" > > + > > KERNEL_DEVICETREE = " \ > > ti/k3-j7200-common-proc-board.dtb \ > > ti/k3-j7200-evm-quad-port-eth-exp.dtbo \ > > diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf > b/meta-ti-bsp/conf/machine/j721e-evm.conf > > index b0b2a5b6..e9327f56 100644 > > --- a/meta-ti-bsp/conf/machine/j721e-evm.conf > > +++ b/meta-ti-bsp/conf/machine/j721e-evm.conf > > @@ -10,6 +10,10 @@ KERNEL_DEVICETREE_PREFIX = " \ > > ti/k3-j7200-evm-mcspi-loopback \ > > " > > > > +KERNEL_DEVICETREE_DTBMERGE = " \ > > + ti/k3-j721e-evm.dtb \ > > +" > > + > > KERNEL_DEVICETREE = " \ > > ti/k3-j721e-beagleboneai64.dtb \ > > ti/k3-j721e-common-proc-board-infotainment.dtbo \ > > diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf > b/meta-ti-bsp/conf/machine/j721s2-evm.conf > > index 5cb28309..2d7e6ebe 100644 > > --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf > > +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf > > @@ -15,6 +15,10 @@ KERNEL_DEVICETREE_PREFIX = " \ > > ti/k3-v3link \ > > " > > > > +KERNEL_DEVICETREE_DTBMERGE = " \ > > + ti/k3-j721s2-evm.dtb \ > > +" > > + > > KERNEL_DEVICETREE = " \ > > ti/k3-am68-sk-base-board.dtb \ > > ti/k3-j721s2-common-proc-board.dtb \ > > -- > Ryan Eatmon reatmon@ti.com > ----------------------------------------- > Texas Instruments, Inc. - LCPD - MGTS >
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf index faeb34a9..a10d5751 100644 --- a/meta-ti-bsp/conf/machine/am62axx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf @@ -11,6 +11,10 @@ KERNEL_DEVICETREE_PREFIX = " \ ti/k3-v3link \ " +KERNEL_DEVICETREE_DTBMERGE = " \ + ti/k3-am62a7-sk-ub954-evm-ov2312.dtb \ +" + KERNEL_DEVICETREE = " \ ti/k3-am62a7-phyboard-lyra-rdk.dtb \ ti/k3-am62a7-sk.dtb \ diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index e79e6e61..33fc6240 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -5,6 +5,10 @@ SOC_FAMILY:append = ":am64xx" KERNEL_DEVICETREE_PREFIX = "ti/k3-am642" +KERNEL_DEVICETREE_DTBMERGE = " \ + ti/k3-am642-evm-nand.dtb \ +" + KERNEL_DEVICETREE = " \ ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \ ti/k3-am642-evm-icssg1-dualemac.dtbo \ diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 7255bb30..d70bb22d 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -10,6 +10,14 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" +KERNEL_DEVICETREE_DTBMERGE = " \ + ti/k3-am654-gp-evm.dtb \ + ti/k3-am654-evm.dtb \ + ti/k3-am654-idk.dtb \ + ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtb \ + ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtb \ +" + KERNEL_DEVICETREE = " \ ti/k3-am654-base-board-rocktech-rk101-panel.dtbo \ ti/k3-am654-base-board.dtb \ diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf index adfc6376..f6d9ee39 100644 --- a/meta-ti-bsp/conf/machine/j7200-evm.conf +++ b/meta-ti-bsp/conf/machine/j7200-evm.conf @@ -6,6 +6,10 @@ require conf/machine/include/j7200.inc KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200" +KERNEL_DEVICETREE_DTBMERGE = " \ + ti/k3-j7200-evm.dtb \ +" + KERNEL_DEVICETREE = " \ ti/k3-j7200-common-proc-board.dtb \ ti/k3-j7200-evm-quad-port-eth-exp.dtbo \ diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf index b0b2a5b6..e9327f56 100644 --- a/meta-ti-bsp/conf/machine/j721e-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-evm.conf @@ -10,6 +10,10 @@ KERNEL_DEVICETREE_PREFIX = " \ ti/k3-j7200-evm-mcspi-loopback \ " +KERNEL_DEVICETREE_DTBMERGE = " \ + ti/k3-j721e-evm.dtb \ +" + KERNEL_DEVICETREE = " \ ti/k3-j721e-beagleboneai64.dtb \ ti/k3-j721e-common-proc-board-infotainment.dtbo \ diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index 5cb28309..2d7e6ebe 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf @@ -15,6 +15,10 @@ KERNEL_DEVICETREE_PREFIX = " \ ti/k3-v3link \ " +KERNEL_DEVICETREE_DTBMERGE = " \ + ti/k3-j721s2-evm.dtb \ +" + KERNEL_DEVICETREE = " \ ti/k3-am68-sk-base-board.dtb \ ti/k3-j721s2-common-proc-board.dtb \
Add support for dtbs that are generated by merging multiple .dtb and .dtbo files in the /boot directory of the root filesystem.These merged device trees are defined in ti-linux-kernel Makefile[1]. Include them using the KERNEL_DEVICETREE_DTBMERGE variable. [1]: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/tree/arch/arm64/boot/dts/ti/Makefile?h=ti-linux-6.12.y Signed-off-by: Telukula Jeevan Kumar Sahu <j-sahu@ti.com> --- meta-ti-bsp/conf/machine/am62axx-evm.conf | 4 ++++ meta-ti-bsp/conf/machine/include/am64xx.inc | 4 ++++ meta-ti-bsp/conf/machine/include/am65xx.inc | 8 ++++++++ meta-ti-bsp/conf/machine/j7200-evm.conf | 4 ++++ meta-ti-bsp/conf/machine/j721e-evm.conf | 4 ++++ meta-ti-bsp/conf/machine/j721s2-evm.conf | 4 ++++ 6 files changed, 28 insertions(+)