| Message ID | 20230727151216.23224-2-reatmon@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master/kirkstone,v2,1/2] ti-kernel-devicetree-prefix: Add search function for DTBMERGE | expand |
diff --git a/meta-ti-bsp/conf/machine/am57xx-evm.conf b/meta-ti-bsp/conf/machine/am57xx-evm.conf index 26b7f78c..43a6a833 100644 --- a/meta-ti-bsp/conf/machine/am57xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am57xx-evm.conf @@ -13,11 +13,14 @@ KERNEL_DEVICETREE_PREFIX = " \ ti/am57 \ ti/lcd \ ti/ov10635 \ + ti/omap/am57 \ " KERNEL_DEVICETREE_DTBMERGE = " \ am57xx-evm.dtb \ am57xx-evm-reva3.dtb \ + ti/omap/am57xx-evm.dtb \ + ti/omap/am57xx-evm-reva3.dtb \ " KERNEL_DEVICETREE = " \ diff --git a/meta-ti-bsp/conf/machine/dra7xx-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-evm.conf index c47a1e80..30884ae1 100644 --- a/meta-ti-bsp/conf/machine/dra7xx-evm.conf +++ b/meta-ti-bsp/conf/machine/dra7xx-evm.conf @@ -12,6 +12,7 @@ KERNEL_DEVICETREE_PREFIX = " \ dra7 \ ti/dra7 \ ti/lcd \ + ti/omap/dra7 \ " KERNEL_DEVICETREE = " \ diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index f7f126f4..bc61a773 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -19,7 +19,10 @@ PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE_PREFIX = "am335x" +KERNEL_DEVICETREE_PREFIX = " \ + am335x \ + ti/omap/am335x \ +" KERNEL_DEVICETREE = " \ am335x-evm.dtb \ diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index a6af56e3..ea5d1505 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -22,6 +22,8 @@ KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE_PREFIX = " \ am437x \ am43x \ + ti/omap/am437x \ + ti/omap/am43x \ " KERNEL_DEVICETREE = " \ diff --git a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf index a8b08964..fdbaffae 100644 --- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf +++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf @@ -15,7 +15,10 @@ IMAGE_FSTYPES += "tar.xz" SERIAL_CONSOLES = "115200;ttyS2" -KERNEL_DEVICETREE_PREFIX = "da850" +KERNEL_DEVICETREE_PREFIX = " \ + da850 \ + ti/davinci/da850 \ +" KERNEL_DEVICETREE = " \ da850-evm.dtb \ 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"
The latest kernel has made the change to add vendor subdirectories into the arch/arm/boot/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 <reatmon@ti.com> --- v2: Added previous KERNEL_DEVICETREE entries back in. meta-ti-bsp/conf/machine/am57xx-evm.conf | 3 +++ meta-ti-bsp/conf/machine/dra7xx-evm.conf | 1 + meta-ti-bsp/conf/machine/include/ti33x.inc | 5 ++++- meta-ti-bsp/conf/machine/include/ti43x.inc | 2 ++ meta-ti-bsp/conf/machine/omapl138-lcdk.conf | 5 ++++- meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb | 1 + 6 files changed, 15 insertions(+), 2 deletions(-)