Re: [meta-ti][master/kirkstone][PATCH] linux-ti-next,conf/machine: Add support for new vendored dts dir

Tue, 25 Jul 2023 07:17:30 -0700
That's not true... It will test all matching DTs in the upstream kernel instead of just a fixed list. But in the end, it is testing DTs in the upstream kernel... 


On 7/24/2023 4:19 PM, Denys Dmytriyenko wrote:

This has a negative side-effect of linux-ti-next never testing *upstreamed*
DTs listed in KERNEL_DEVICETREE even on modern 64bit K3 platforms...


On Mon, Jul 24, 2023 at 03:45:36PM -0500, Ryan Eatmon via 
lists.yoctoproject.org wrote:

The latest kernel has made the change to add vendor subdirectories into
the arm 32bit dts directory.  This effectively breaks the
KERNEL_DEVICETREE settings in the machine configs for 32bit platforms,
so switch them over to using the PREFIX variable.  Also change the
linux-ti-next to use the PREFIX setting for KERNEL_DEVICETREE.

Signed-off-by: Ryan Eatmon <[email protected]>
---
  meta-ti-bsp/conf/machine/am57xx-evm.conf      | 11 ++---------
  meta-ti-bsp/conf/machine/dra7xx-evm.conf      |  9 ++-------
  meta-ti-bsp/conf/machine/include/ti33x.inc    | 19 +++++--------------
  meta-ti-bsp/conf/machine/include/ti43x.inc    |  9 +++------
  meta-ti-bsp/conf/machine/omapl138-lcdk.conf   | 10 +++++-----
  .../recipes-kernel/linux/linux-ti-next_git.bb |  1 +
  6 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/meta-ti-bsp/conf/machine/am57xx-evm.conf 
b/meta-ti-bsp/conf/machine/am57xx-evm.conf
index 26b7f78c..4c13e9c2 100644
--- a/meta-ti-bsp/conf/machine/am57xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am57xx-evm.conf
@@ -13,6 +13,7 @@ KERNEL_DEVICETREE_PREFIX = " \
      ti/am57 \
      ti/lcd \
      ti/ov10635 \
+    ti/omap/am57 \
  "

  
  KERNEL_DEVICETREE_DTBMERGE = " \

@@ -20,15 +21,7 @@ KERNEL_DEVICETREE_DTBMERGE = " \
      am57xx-evm-reva3.dtb \
  "

  
-KERNEL_DEVICETREE = " \

-    am57xx-beagle-x15.dtb \
-    am57xx-beagle-x15-revb1.dtb \
-    am57xx-beagle-x15-revc.dtb \
-    am5729-beagleboneai.dtb \
-    am571x-idk.dtb \
-    am572x-idk.dtb \
-    am574x-idk.dtb \
-"
+KERNEL_DEVICETREE = ""

  
  UBOOT_MACHINE = "am57xx_evm_config"
  
diff --git a/meta-ti-bsp/conf/machine/dra7xx-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-evm.conf

index c47a1e80..410b8048 100644
--- a/meta-ti-bsp/conf/machine/dra7xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/dra7xx-evm.conf
@@ -12,15 +12,10 @@ KERNEL_DEVICETREE_PREFIX = " \
      dra7 \
      ti/dra7 \
      ti/lcd \
+    ti/omap/dra7 \
  "

  
-KERNEL_DEVICETREE = " \

-    dra7-evm.dtb \
-    dra71-evm.dtb \
-    dra72-evm.dtb \
-    dra72-evm-revc.dtb \
-    dra76-evm.dtb \
-"
+KERNEL_DEVICETREE = ""

  
  UBOOT_MACHINE = "dra7xx_evm_config"
  
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc

index f7f126f4..b73ab97a 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -19,22 +19,13 @@ PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc"

  
  KERNEL_IMAGETYPE = "zImage"
  
-KERNEL_DEVICETREE_PREFIX = "am335x"

-
-KERNEL_DEVICETREE = " \
-    am335x-evm.dtb \
-    am335x-evmsk.dtb \
-    am335x-icev2.dtb \
-    am335x-pocketbeagle.dtb \
-    am335x-bone.dtb \
-    am335x-boneblue.dtb \
-    am335x-bonegreen.dtb \
-    am335x-bonegreen-wireless.dtb \
-    am335x-boneblack.dtb \
-    am335x-boneblack-wireless.dtb \
-    am335x-sancloud-bbe.dtb \
+KERNEL_DEVICETREE_PREFIX = " \
+    am335x \
+    ti/omap/am335x \
  "

  
+KERNEL_DEVICETREE = ""

+
  UBOOT_ARCH = "arm"
  UBOOT_MACHINE = "am335x_evm_config"

  
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc

index a6af56e3..5f794682 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -22,14 +22,11 @@ KERNEL_IMAGETYPE = "zImage"
  KERNEL_DEVICETREE_PREFIX = " \
      am437x \
      am43x \
+    ti/omap/am437x \
+    ti/omap/am43x \
  "

  
-KERNEL_DEVICETREE = " \

-    am437x-gp-evm.dtb \
-    am437x-sk-evm.dtb \
-    am437x-idk-evm.dtb \
-    am43x-epos-evm.dtb \
-"
+KERNEL_DEVICETREE = ""

  
  KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}"
  
diff --git a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf

index a8b08964..23b322ac 100644
--- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
+++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
@@ -15,9 +15,9 @@ IMAGE_FSTYPES += "tar.xz"

  
  SERIAL_CONSOLES = "115200;ttyS2"
  
-KERNEL_DEVICETREE_PREFIX = "da850"

-
-KERNEL_DEVICETREE = " \
-    da850-evm.dtb \
-    da850-lcdk.dtb \
+KERNEL_DEVICETREE_PREFIX = " \
+    da850 \
+    ti/davinci/da850 \
  "
+
+KERNEL_DEVICETREE = ""
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb 
b/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb
index 9138c7c5..8228f4ff 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
  inherit kernel

  
  require recipes-kernel/linux/ti-kernel.inc

+include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if 
d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}

  
  DEPENDS += "gmp-native libmpc-native"
  
--

2.17.1


--
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#16863): 
https://lists.yoctoproject.org/g/meta-ti/message/16863
Mute This Topic: https://lists.yoctoproject.org/mt/100337814/21656
Group Owner: [email protected]
Unsubscribe: 
https://lists.yoctoproject.org/g/meta-ti/leave/6695321/21656/1393940836/xyzzy 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-























					Reply via email to