From patchwork Mon Jul 24 20:45:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 27887 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96A95EB64DD for ; Mon, 24 Jul 2023 20:45:39 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web10.5528.1690231538703569280 for ; Mon, 24 Jul 2023 13:45:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=uP/kNlnb; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: reatmon@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 36OKjb1V066824; Mon, 24 Jul 2023 15:45:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1690231537; bh=M3F+lbkyjPNtFLTNojaNV5h9ANXUxPpyuCiBeKrCH54=; h=From:To:Subject:Date; b=uP/kNlnbC/Z0o7x4vWT2VtV+7GYSlTuvqpcdxqe/WFq1PKjraLm9ltelkjswTNN/R to6uwOh/G99PcX6uXTv/MVKz0ioHdttMOAanAu3qtlLniupQIFKckd4uZkKtR2AW1P q3EwWMafg9xSAUuEqWbNH6EoE4vVsUHJ/ocey/bw= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 36OKjbG2131058 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 24 Jul 2023 15:45:37 -0500 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 24 Jul 2023 15:45:36 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Mon, 24 Jul 2023 15:45:36 -0500 Received: from uda0214219 (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 36OKjaT5012989; Mon, 24 Jul 2023 15:45:36 -0500 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1qO2Qy-0002S1-KM; Mon, 24 Jul 2023 15:45:36 -0500 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-ti][master/kirkstone][PATCH] linux-ti-next,conf/machine: Add support for new vendored dts dir Date: Mon, 24 Jul 2023 15:45:36 -0500 Message-ID: <20230724204536.9382-1-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 24 Jul 2023 20:45:39 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16861 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 --- 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"