From patchwork Thu Mar 23 22:52:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 21635 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 0DDBAC77B60 for ; Thu, 23 Mar 2023 22:52:33 +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.88463.1679611943992775937 for ; Thu, 23 Mar 2023 15:52:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=u+Uib4TL; 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 32NMqMlH078620; Thu, 23 Mar 2023 17:52:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1679611942; bh=y+O5iNAfd+UKT5MZPqff35CRGLMV2Fyq+fngC6liUtM=; h=From:To:Subject:Date:In-Reply-To:References; b=u+Uib4TLATbzhRjmuHHVTowwf/otoKP7P34NgnAA242SVfdSyMAltsFkUeL2CZ9+G pa1qNXIyWgD2XlrDKb2iNxGfuFpnLYuWA7ZyN2AUeVgK3CT5xzVcjTWaFXbbu0Dl1k i6w7VhKy8qlTJLEj2Xzu4QFGTJptTKHokhD2hBqg= Received: from DLEE110.ent.ti.com (dlee110.ent.ti.com [157.170.170.21]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 32NMqM7G021572 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 23 Mar 2023 17:52:22 -0500 Received: from DLEE114.ent.ti.com (157.170.170.25) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 23 Mar 2023 17:52:22 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Thu, 23 Mar 2023 17:52:22 -0500 Received: from uda0214219 (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 32NMqM7e021976; Thu, 23 Mar 2023 17:52:22 -0500 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1pfTnC-0003TC-4i; Thu, 23 Mar 2023 17:52:22 -0500 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-ti][master/kirkstone][PATCH v5 1/3] linux-ti-*: Add filtering for which dtb/dtbo to include Date: Thu, 23 Mar 2023 17:52:19 -0500 Message-ID: <20230323225221.12918-2-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230323225221.12918-1-reatmon@ti.com> References: <20230323225221.12918-1-reatmon@ti.com> 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 ; Thu, 23 Mar 2023 22:52:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16242 We often carry more dtbs/dtbos in our kernel than we have upstreamed. The inclusion of all of the dtb/dtbo in the KERNEL_DEVICETREE has become problematic as we start testing the linux-next and 6.1 as part of our LTS migration. To address this issue we are adding in two step method for managing the KERNEL_DEVICETREE. Going forward we will only accept dtb/dtbo in KERNEL_DEVICETREE if it is available in upstream. This way we ensure that the variable is more accurate for whichever kernel you might be looking at. We have also added a new variable KERNEL_DEVICETREE_PREFIX which our kernel recipes will use to auto set KERNEL_DEVICETREE based on what files are in the kernel and not a fixed list in the conf files. Signed-off-by: Ryan Eatmon Signed-off-by: Andrew Davis --- v5: A couple of the platforms use a dtb merge function to create dtb file by merging some dtb and dtbo together. When the merge file is listed in KERNEL_DEVICETREE it is correctly made, but since there is no dts file, we cannot glob it. So add a new KERNEL_DEVICETREE_DTBMERGE variable to collect that information and get it into the device tree. v4: Rebase on top of recent dunfell sync. v2: Removed the new prefix include for the mainline and next kernels since the value of KERNEL_DEVICETREE should reflect what they have anyway. This will help us keep the DEVICETREE up to date. meta-ti-bsp/conf/machine/am57xx-evm.conf | 22 +++++++------ meta-ti-bsp/conf/machine/am62axx-evm.conf | 20 +++-------- meta-ti-bsp/conf/machine/am62xx-evm.conf | 10 ++---- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 9 ++--- meta-ti-bsp/conf/machine/beagle-x15.conf | 8 ++++- meta-ti-bsp/conf/machine/beaglebone.conf | 13 ++++++-- meta-ti-bsp/conf/machine/dra7xx-evm.conf | 14 ++++---- meta-ti-bsp/conf/machine/include/am64xx.inc | 5 ++- meta-ti-bsp/conf/machine/include/am65xx.inc | 12 ++----- meta-ti-bsp/conf/machine/include/ti33x.inc | 15 ++++++--- meta-ti-bsp/conf/machine/include/ti43x.inc | 10 ++++-- meta-ti-bsp/conf/machine/j7200-evm.conf | 4 +-- meta-ti-bsp/conf/machine/j721e-evm.conf | 29 +++------------- meta-ti-bsp/conf/machine/j721s2-evm.conf | 32 +++--------------- meta-ti-bsp/conf/machine/j784s4-evm.conf | 33 +++---------------- meta-ti-bsp/conf/machine/omapl138-lcdk.conf | 7 +++- .../linux/linux-ti-mainline_git.bb | 23 ------------- .../recipes-kernel/linux/linux-ti-next_git.bb | 15 --------- .../linux/linux-ti-staging_5.10.bb | 1 + .../linux/ti-kernel-devicetree-prefix.inc | 22 +++++++++++++ 20 files changed, 115 insertions(+), 189 deletions(-) create mode 100644 meta-ti-bsp/recipes-kernel/linux/ti-kernel-devicetree-prefix.inc diff --git a/meta-ti-bsp/conf/machine/am57xx-evm.conf b/meta-ti-bsp/conf/machine/am57xx-evm.conf index b3525a0b..9b12f383 100644 --- a/meta-ti-bsp/conf/machine/am57xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am57xx-evm.conf @@ -8,24 +8,26 @@ MACHINE_FEATURES += "touchscreen" SERIAL_CONSOLES = "115200;ttyS2" +KERNEL_DEVICETREE_PREFIX = " \ + am57 \ + ti/am57 \ + ti/lcd \ + ti/ov10635 \ +" + +KERNEL_DEVICETREE_DTBMERGE = " \ + am57xx-evm.dtb \ + am57xx-evm-reva3.dtb \ +" + KERNEL_DEVICETREE = " \ am57xx-beagle-x15.dtb \ am57xx-beagle-x15-revb1.dtb \ am57xx-beagle-x15-revc.dtb \ am5729-beagleboneai.dtb \ - ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am57xx-evm.dtb', d)} \ - ti/am57xx-evm-common.dtbo \ - ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am57xx-evm-reva3.dtb', d)} \ - ti/am57xx-evm-reva3.dtbo \ am571x-idk.dtb \ - ti/am571x-idk-touchscreen.dtbo \ am572x-idk.dtb \ am574x-idk.dtb \ - ti/am57xx-idk-osd-lcd-common.dtbo \ - ti/am572x-idk-touchscreen.dtbo \ - ti/lcd-osd101t2587.dtbo \ - ti/lcd-osd101t2045.dtbo \ - ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'ti/ov10635.dtbo', d)} \ " KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}" diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf index 2fd91bd7..691a074b 100644 --- a/meta-ti-bsp/conf/machine/am62axx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf @@ -4,23 +4,13 @@ require conf/machine/include/am62axx.inc +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am62a7 \ + ti/k3-j721e-fpdlink \ +" + KERNEL_DEVICETREE = " \ ti/k3-am62a7-sk.dtb \ - ti/k3-am62a7-fpdlink-ov2312-0-0.dtbo \ - ti/k3-am62a7-fpdlink-ov2312-0-1.dtbo \ - ti/k3-am62a7-fpdlink-ov2312-0-2.dtbo \ - ti/k3-am62a7-fpdlink-ov2312-0-3.dtbo \ - ti/k3-am62a7-fpdlink-sk-fusion.dtbo \ - ti/k3-am62a7-sk-csi2-imx219.dtbo \ - ti/k3-am62a7-sk-ethernet-dc01.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \ " UBOOT_MACHINE = "am62ax_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf index 8892a05f..d54213d4 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf @@ -4,16 +4,10 @@ require conf/machine/include/am62xx.inc +KERNEL_DEVICETREE_PREFIX = "ti/k3-am625" + KERNEL_DEVICETREE = " \ ti/k3-am625-sk.dtb \ - ti/k3-am625-skeleton.dtb \ - ti/k3-am625-sk-lpmdemo.dtb \ - ti/k3-am625-sk-csi2-ov5640.dtbo \ - ti/k3-am625-sk-csi2-tevi-ov5640.dtbo \ - ti/k3-am625-sk-ecap-capture.dtbo \ - ti/k3-am625-sk-hdmi-audio.dtbo \ - ti/k3-am625-sk-mcan.dtbo \ - ti/k3-am625-sk-oldi-panel.dtbo \ " UBOOT_MACHINE = "am62x_evm_a53_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf index cba05c4b..ba1a12a7 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf @@ -4,12 +4,13 @@ require conf/machine/include/am62xx-lp.inc +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am62x-lp \ + ti/k3-am625-sk \ +" + KERNEL_DEVICETREE = " \ ti/k3-am62x-lp-sk.dtb \ - ti/k3-am625-skeleton.dtb \ - ti/k3-am625-sk-lpmdemo.dtb \ - ti/k3-am625-sk-csi2-ov5640.dtbo \ - ti/k3-am62x-lp-sk-oldi-panel.dtbo \ " SPL_BINARY = "tispl.bin_HS" diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf index b4279ae4..8efd6e60 100644 --- a/meta-ti-bsp/conf/machine/beagle-x15.conf +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf @@ -4,7 +4,13 @@ require conf/machine/include/am57xx.inc -KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb" +KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15" + +KERNEL_DEVICETREE = " \ + am57xx-beagle-x15.dtb \ + am57xx-beagle-x15-revb1.dtb \ + am57xx-beagle-x15-revc.dtb \ +" MACHINE_GUI_CLASS = "bigscreen" diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf index 413a960d..2a8dc6d7 100644 --- a/meta-ti-bsp/conf/machine/beaglebone.conf +++ b/meta-ti-bsp/conf/machine/beaglebone.conf @@ -4,9 +4,16 @@ require conf/machine/include/ti33x.inc -KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblue.dtb \ - am335x-boneblack.dtb am335x-boneblack-wireless.dtb \ - am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb" +KERNEL_DEVICETREE_PREFIX = "am335x-bone" + +KERNEL_DEVICETREE = " \ + am335x-bone.dtb \ + am335x-boneblue.dtb \ + am335x-boneblack.dtb \ + am335x-boneblack-wireless.dtb \ + am335x-bonegreen.dtb \ + am335x-bonegreen-wireless.dtb \ +" MACHINE_GUI_CLASS = "bigscreen" MACHINE_FEATURES += "screen" diff --git a/meta-ti-bsp/conf/machine/dra7xx-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-evm.conf index 813e0e06..c47a1e80 100644 --- a/meta-ti-bsp/conf/machine/dra7xx-evm.conf +++ b/meta-ti-bsp/conf/machine/dra7xx-evm.conf @@ -8,20 +8,18 @@ MACHINE_FEATURES += "touchscreen" SERIAL_CONSOLES = "115200;ttyS0" +KERNEL_DEVICETREE_PREFIX = " \ + dra7 \ + ti/dra7 \ + ti/lcd \ +" + KERNEL_DEVICETREE = " \ dra7-evm.dtb \ - ti/dra7x-evm-osd-lcd-common.dtbo \ dra71-evm.dtb \ - ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'dra71-evm-nand.dtb', d)} \ - ti/dra71-evm-lcd-auo-g101evn01.0.dtbo \ dra72-evm.dtb \ dra72-evm-revc.dtb \ - ti/dra72-evm-touchscreen.dtbo \ - ti/dra74-evm-touchscreen.dtbo \ dra76-evm.dtb \ - ti/dra76-evm-tfp410.dtbo \ - ti/lcd-osd101t2045.dtbo \ - ti/lcd-osd101t2587.dtbo \ " UBOOT_MACHINE = "dra7xx_evm_config" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index a2e5d673..157bf5d5 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -4,12 +4,11 @@ SOC_FAMILY:append = ":am64xx" SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +KERNEL_DEVICETREE_PREFIX = "ti/k3-am642" + KERNEL_DEVICETREE = " \ ti/k3-am642-evm.dtb \ ti/k3-am642-sk.dtb \ - ti/k3-am642-evm-icssg1-dualemac.dtbo \ - ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \ - ti/k3-am642-evm-nand.dtbo \ " # Default tiboot3.bin on AM64x is for SR2.0 HS-FS diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 0ae00761..564d61b0 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -8,18 +8,10 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" PREFERRED_PROVIDER_virtual/gpudriver ?= "" +KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" + KERNEL_DEVICETREE = " \ ti/k3-am654-base-board.dtb \ - ti/k3-am654-base-board-sr1.dtbo \ - ti/k3-am654-gp.dtbo \ - ti/k3-am654-idk.dtbo \ - ti/k3-am654-idk-sr1.dtbo \ - ti/k3-am654-sr1.dtbo \ - ti/k3-am654-pcie-usb2.dtbo \ - ti/k3-am654-pcie-usb3.dtbo \ - ti/k3-am654-evm-tc358876.dtbo \ - ti/k3-am654-evm-oldi-lcd1evm.dtbo \ - ti/k3-am654-evm-ov5640.dtbo \ " # On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index 95499552..4f6d90bf 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -18,12 +18,19 @@ PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" KERNEL_IMAGETYPE = "zImage" +KERNEL_DEVICETREE_PREFIX = "am335x" + KERNEL_DEVICETREE = " \ - am335x-evm.dtb am335x-evmsk.dtb \ + 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-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 \ " diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index ec6d9c07..5b40925e 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -18,12 +18,16 @@ PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" KERNEL_IMAGETYPE = "zImage" +KERNEL_DEVICETREE_PREFIX = " \ + am437x \ + am43x \ +" + KERNEL_DEVICETREE = " \ am437x-gp-evm.dtb \ - ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am437x-gp-evm-hdmi.dtb', d)} \ - am437x-sk-evm.dtb am437x-idk-evm.dtb \ + am437x-sk-evm.dtb \ + am437x-idk-evm.dtb \ am43x-epos-evm.dtb \ - ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am43x-epos-evm-hdmi.dtb', d)} \ " 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/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf index c01b318b..b17b65b7 100644 --- a/meta-ti-bsp/conf/machine/j7200-evm.conf +++ b/meta-ti-bsp/conf/machine/j7200-evm.conf @@ -7,10 +7,10 @@ require conf/machine/include/j7200.inc SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200" + KERNEL_DEVICETREE = " \ ti/k3-j7200-common-proc-board.dtb \ - ti/k3-j7200-mcspi-loopback.dtbo \ - ti/k3-j7200-common-proc-board-uarts.dtbo \ " UBOOT_MACHINE = "j7200_evm_a72_config" diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf index 029b1fe7..f602a77b 100644 --- a/meta-ti-bsp/conf/machine/j721e-evm.conf +++ b/meta-ti-bsp/conf/machine/j721e-evm.conf @@ -7,33 +7,14 @@ require conf/machine/include/j721e.inc SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j721e \ + ti/k3-j7200-mcspi-loopback \ +" + KERNEL_DEVICETREE = " \ ti/k3-j721e-common-proc-board.dtb \ - ti/k3-j721e-common-proc-board-infotainment.dtbo \ - ti/k3-j721e-cpb-csi2-ov5640.dtbo \ - ti/k3-j721e-fpdlink-cpb-fusion.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \ ti/k3-j721e-sk.dtb \ - ti/k3-j721e-fpdlink-sk-fusion.dtbo \ - ti/k3-j721e-sk-csi2-ov5640.dtbo \ - ti/k3-j721e-sk-rpi-cam-imx219.dtbo \ - ti/k3-j721e-common-proc-board-uarts.dtbo \ - ti/k3-j7200-mcspi-loopback.dtbo \ " UBOOT_MACHINE = "j721e_evm_a72_config" diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index 5a32e1b3..1f54c7b1 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf @@ -9,35 +9,13 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" OPTEE_K3_USART = "0x8" +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j721s2 \ + ti/k3-j7200-mcspi-loopback \ +" + KERNEL_DEVICETREE = " \ - ti/k3-am68-sk-base-board.dtb \ - ti/k3-am68-sk-bb-csi2-ov5640.dtbo \ - ti/k3-am68-sk-bb-rpi-cam-imx219.dtbo \ - ti/k3-am68-sk-fpdlink-fusion.dtbo \ - ti/k3-am68-sk-rpi-hdr-ehrpwm.dtbo \ - ti/k3-am68-sk-som-ddr_mem_carveout.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \ ti/k3-j721s2-common-proc-board.dtb \ - ti/k3-j721s2-cpb-csi2-ov5640.dtbo \ - ti/k3-j721s2-fpdlink-cpb-fusion.dtbo \ - ti/k3-j721s2-gesi-exp-board.dtbo \ - ti/k3-j721s2-common-proc-board-uarts.dtbo \ - ti/k3-j7200-mcspi-loopback.dtbo \ " UBOOT_MACHINE = "j721s2_evm_a72_defconfig" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf index 84fd4996..53bb4e4f 100644 --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf @@ -9,36 +9,13 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" OPTEE_K3_USART = "0x8" -KERNEL_DEVICETREE = " \ - ti/k3-am69-sk.dtb \ - ti/k3-am69-sk-csi2-ov5640.dtbo \ - ti/k3-am69-sk-ddr-mem-carveout.dtbo \ - ti/k3-am69-sk-fpdlink-fusion.dtbo \ - ti/k3-am69-sk-rpi-hdr-ehrpwm.dtbo \ - ti/k3-am69-sk-rpi-cam-imx219.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \ - ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \ - ti/k3-j784s4-evm.dtb \ - ti/k3-j784s4-evm-csi2-ov5640.dtbo \ - ti/k3-j784s4-fpdlink-fusion.dtbo \ - ti/k3-j784s4-evm-uarts.dtbo \ - ti/k3-j7200-mcspi-loopback.dtbo \ +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-j784s4 \ + ti/k3-j7200-mcspi-loopback \ " +KERNEL_DEVICETREE = "" + UBOOT_MACHINE = "j784s4_evm_a72_defconfig" # Default tiboot3.bin on J784S4 is for GP diff --git a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf index b318f82d..a8b08964 100644 --- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf +++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf @@ -15,4 +15,9 @@ IMAGE_FSTYPES += "tar.xz" SERIAL_CONSOLES = "115200;ttyS2" -KERNEL_DEVICETREE = "da850-evm.dtb da850-lcdk.dtb" +KERNEL_DEVICETREE_PREFIX = "da850" + +KERNEL_DEVICETREE = " \ + da850-evm.dtb \ + da850-lcdk.dtb \ +" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb index 6c1b1825..be278d73 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb @@ -39,34 +39,11 @@ SRC_URI += " \ SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95" SRCREV_FORMAT = "linux" -KERNEL_DEVICETREE = "" - kernel_do_compile:append() { oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} oe_runmake -C ${S}/ti-upstream-tools LINUX=${S} DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} } -do_install:append() { - for dtbf in `find arch/${ARCH}/boot/dts/ \( -name '*.dtb' -or -name '*.dtbo' \)`; do - dtb="$dtbf" - dtb_ext=${dtb##*.} - dtb_base_name=`basename $dtb .$dtb_ext` - dtb_path=`get_real_dtb_path_in_kernel "$dtb"` - install -m 0644 $dtbf ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext - done -} - -do_deploy:append() { - for dtbf in `find arch/${ARCH}/boot/dts/ \( -name '*.dtb' -or -name '*.dtbo' \) -printf '%P\n'`; do - dtb="$dtbf" - dtb_ext=${dtb##*.} - dtb_base_name=`basename $dtb .$dtb_ext` - dtb_dir=`dirname $dtb` - install -d ${DEPLOYDIR} - install -m 0644 ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext ${DEPLOYDIR}/$dtb_base_name.$dtb_ext - done -} - do_shared_workdir:prepend() { cd ${B} echo >> Module.symvers 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 e2908951..b540e508 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 @@ -19,21 +19,6 @@ PV = "6.1.0-rc1+git${SRCPV}" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master" -def list_dtbs(dts_dir, dts_subdir): - import os - import fnmatch - matches = [] - - for root,dirnames,filenames in os.walk(os.path.join(dts_dir, dts_subdir)): - for filename in fnmatch.filter(filenames, '*.dtb'): - matches.append(os.path.join(dts_subdir, filename)) - for filename in fnmatch.filter(filenames, '*.dtbo'): - matches.append(os.path.join(dts_subdir, filename)) - return ' '.join(matches) - -DTS_SUBDIR = "" -DTS_SUBDIR:k3 = "ti" -KERNEL_DEVICETREE = "${@list_dtbs('${B}/arch/${ARCH}/boot/dts', '${DTS_SUBDIR}')}" DEFCONFIG_NAME = "multi_v7_defconfig" DEFCONFIG_NAME:k3 = "defconfig" KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb index cc67188a..53966b2d 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb @@ -9,6 +9,7 @@ DEFCONFIG_BUILDER = "${S}/ti_config_fragments/defconfig_builder.sh" require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/kernel-rdepends.inc 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" diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel-devicetree-prefix.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel-devicetree-prefix.inc new file mode 100644 index 00000000..1496a749 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel-devicetree-prefix.inc @@ -0,0 +1,22 @@ + +def get_dtbs_from_kernel(dts_dir, dts_prefix): + import os + import glob + matches = [] + + for prefix in dts_prefix.split(): + filenames = glob.glob(dts_dir + prefix + '*.dts') + filenames += glob.glob(dts_dir + prefix + '*.dtso') + for filename in filenames: + # Before v6.2 kernels DTB Overlays shared the same name as DTB files + # so we need to search the file to find the type + with open(filename) as f: + file_postfix = '.dtbo' if '/plugin/;' in f.read() else '.dtb' + filename = os.path.split(filename)[1] + filename = os.path.splitext(filename)[0] + file_postfix + filename = os.path.join(os.path.split(prefix)[0], filename) + matches.append(filename) + return ' '.join(matches) + +KERNEL_DEVICETREE = "${@get_dtbs_from_kernel('${S}/arch/${ARCH}/boot/dts/', '${KERNEL_DEVICETREE_PREFIX}')} ${KERNEL_DEVICETREE_DTBMERGE}" + From patchwork Thu Mar 23 22:52:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 21634 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 0ABD0C7619A for ; Thu, 23 Mar 2023 22:52:33 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web11.87863.1679611943892985557 for ; Thu, 23 Mar 2023 15:52:24 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=Fub+ef1K; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: reatmon@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 32NMqM3H000572; Thu, 23 Mar 2023 17:52:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1679611942; bh=PZYALzFTVZS+GxgW3OVR3vzoYq4EGR4JqvAAResC2VU=; h=From:To:Subject:Date:In-Reply-To:References; b=Fub+ef1KgtxAbJMS9U7Bhs4Z6qCwrSugy+mpqOT81OoqXzlrR1ReKG3ib7nnP3g/N k4rTVehOwDMDfAN8JBO1nB/adGp29RKee2k/mgb2hJ1ofOagreSPFXZdmB3Rjw+O4k gib0NLBndaQ359DLCZ4gYZXH9+mKKbaQ/ebuS4Ck= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 32NMqMI9099609 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 23 Mar 2023 17:52:22 -0500 Received: from DLEE107.ent.ti.com (157.170.170.37) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 23 Mar 2023 17:52:22 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE107.ent.ti.com (157.170.170.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Thu, 23 Mar 2023 17:52:22 -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 32NMqMYR053424; Thu, 23 Mar 2023 17:52:22 -0500 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1pfTnC-0003Tv-8Z; Thu, 23 Mar 2023 17:52:22 -0500 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-ti][master/kirkstone][PATCH v5 2/3] linux-ti-staging: Add 6.1 kernel in prep for LTS migration Date: Thu, 23 Mar 2023 17:52:20 -0500 Message-ID: <20230323225221.12918-3-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230323225221.12918-1-reatmon@ti.com> References: <20230323225221.12918-1-reatmon@ti.com> 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 ; Thu, 23 Mar 2023 22:52:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16243 We are preparing to migrate our kernel version to 6.1. As we are still working on the migration, mark the default preference low for this version. We will enable building with this kernel in a meta-arago brand in the near future. Once the migration is complete, we will remove the 5.10 kernel and make this the default. Signed-off-by: Ryan Eatmon Signed-off-by: Andrew Davis --- v3: Set DEFAULT_PREFERENCE for new rt and systest recipes. v2: Added rt and systest versions of the kernel. .../linux/linux-ti-staging-6.1/defconfig | 2 + .../linux/linux-ti-staging-6.1/k3/defconfig | 2 + .../linux-ti-staging-6.1/omapl138/defconfig | 1 + .../linux/linux-ti-staging-rt-6.1/defconfig | 2 + .../linux-ti-staging-rt-6.1/k3/defconfig | 2 + .../omapl138/defconfig | 1 + .../linux/linux-ti-staging-rt_6.1.bb | 12 ++++++ .../linux-ti-staging-systest-6.1/defconfig | 2 + .../linux-ti-staging-systest-6.1/k3/defconfig | 2 + .../omapl138/defconfig | 1 + .../linux/linux-ti-staging-systest_6.1.bb | 7 ++++ .../linux/linux-ti-staging_6.1.bb | 39 +++++++++++++++++++ 12 files changed, 73 insertions(+) create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/k3/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/omapl138/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/k3/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/omapl138/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/k3/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/omapl138/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.1.bb create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/defconfig new file mode 100644 index 00000000..24b53cf7 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/k3/defconfig new file mode 100644 index 00000000..ef1d3efd --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/k3/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=defconfig +config-fragment=kernel/configs/ti_arm64_prune.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/omapl138/defconfig new file mode 100644 index 00000000..099493af --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/omapl138/defconfig @@ -0,0 +1 @@ +use-kernel-config=davinci_all_defconfig diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/defconfig new file mode 100644 index 00000000..24b53cf7 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/k3/defconfig new file mode 100644 index 00000000..ef1d3efd --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/k3/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=defconfig +config-fragment=kernel/configs/ti_arm64_prune.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/omapl138/defconfig new file mode 100644 index 00000000..099493af --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/omapl138/defconfig @@ -0,0 +1 @@ +use-kernel-config=davinci_all_defconfig diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb new file mode 100644 index 00000000..8b978e09 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb @@ -0,0 +1,12 @@ +require linux-ti-staging_6.1.bb + +DEFAULT_PREFERENCE = "-1" + +# Look in the generic major.minor directory for files +# This will have priority over generic non-rt path +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" + +BRANCH = "ti-rt-linux-6.1.y" + +SRCREV = "b7d4fb88264d2b094035871fa676592eb8e83b25" +PV = "6.1+git${SRCPV}" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/defconfig new file mode 100644 index 00000000..24b53cf7 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/k3/defconfig new file mode 100644 index 00000000..ef1d3efd --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/k3/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=defconfig +config-fragment=kernel/configs/ti_arm64_prune.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/omapl138/defconfig new file mode 100644 index 00000000..099493af --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/omapl138/defconfig @@ -0,0 +1 @@ +use-kernel-config=davinci_all_defconfig diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.1.bb new file mode 100644 index 00000000..1c30d27c --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.1.bb @@ -0,0 +1,7 @@ +require linux-ti-staging_6.1.bb + +DEFAULT_PREFERENCE = "-1" + +# Look in the generic major.minor directory for files +# This will have priority over generic non-rt path +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb new file mode 100644 index 00000000..654951eb --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb @@ -0,0 +1,39 @@ +SECTION = "kernel" +SUMMARY = "Linux kernel for TI devices" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +inherit kernel + +DEFAULT_PREFERENCE = "-1" + +require recipes-kernel/linux/setup-defconfig.inc +require recipes-kernel/linux/kernel-rdepends.inc +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" + +# Look in the generic major.minor directory for files +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" + +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ + ${EXTRA_DTC_ARGS}" + +S = "${WORKDIR}/git" + +BRANCH = "ti-linux-6.1.y" + +SRCREV = "7b7231fbf048963b434d76a3cb866165365b14e0" +PV = "6.1+git${SRCPV}" + +# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild +MACHINE_KERNEL_PR:append = "b" +PR = "${MACHINE_KERNEL_PR}" + +KERNEL_GIT_URI = "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" +KERNEL_GIT_PROTOCOL = "https" +SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ + file://defconfig" + +FILES:${KERNEL_PACKAGE_NAME}-devicetree += "/${KERNEL_IMAGEDEST}/*.itb" From patchwork Thu Mar 23 22:52:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 21633 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 E3684C74A5B for ; Thu, 23 Mar 2023 22:52:32 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web10.88464.1679611945344551738 for ; Thu, 23 Mar 2023 15:52:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=e6L5jFaS; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: reatmon@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 32NMqM1F109402; Thu, 23 Mar 2023 17:52:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1679611942; bh=gCYHaebyxKHih8XbfEZijr78UvCOpU4sPw9gvPm/JJE=; h=From:To:Subject:Date:In-Reply-To:References; b=e6L5jFaSCxcz5hBxmQbVHEIza79B0ywDlNLUyfaKhxRzineO85a+UvfMRBlwSnoQP nX9PVWmI2sntXAa2VynUuGCbOdoNGJBWiM3GpjWOx1AKmCltAUfDePKvWOYYGbt1CF yGaPZ4xVvGPG0zrVlV3/t5K9E5nD0C/g462ezPU8= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 32NMqMwg044953 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 23 Mar 2023 17:52:22 -0500 Received: from DLEE113.ent.ti.com (157.170.170.24) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 23 Mar 2023 17:52:22 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Thu, 23 Mar 2023 17:52:22 -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 32NMqM4o053431; Thu, 23 Mar 2023 17:52:22 -0500 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1pfTnC-0003Uj-D4; Thu, 23 Mar 2023 17:52:22 -0500 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-ti][master/kirkstone][PATCH v5 3/3] u-boot-ti-staging: Add 2023.01 in prep for LTS migration Date: Thu, 23 Mar 2023 17:52:21 -0500 Message-ID: <20230323225221.12918-4-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230323225221.12918-1-reatmon@ti.com> References: <20230323225221.12918-1-reatmon@ti.com> 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 ; Thu, 23 Mar 2023 22:52:32 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16244 We are preparing to migrate our u-boot version to 2023.01. As we are still working on the migration, mark the default preference low for this version. We will enable building with this u-boot in a meta-arago brand in the near future. Once the migration is complete, we will remove the 2021.01 u-boot and make this the default. Signed-off-by: Ryan Eatmon Signed-off-by: Praneeth Bajjuri --- .../recipes-bsp/u-boot/u-boot-ti-staging_2023.01.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.01.bb diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.01.bb new file mode 100644 index 00000000..b3f56878 --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.01.bb @@ -0,0 +1,11 @@ +require u-boot-ti.inc + +LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" + +PR = "r0" + +BRANCH = "ti-u-boot-2023.01" + +SRCREV = "62e2ad1ceafbfdf2c44d3dc1b6efc81e768a96b9" + +DEFAULT_PREFERENCE = "-1"