From patchwork Tue Oct 8 20:52:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 50073 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 E68A0CF0423 for ; Tue, 8 Oct 2024 20:52:24 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web11.6695.1728420741551746786 for ; Tue, 08 Oct 2024 13:52:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=rd0eRpuP; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: reatmon@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 498KqKQd050111; Tue, 8 Oct 2024 15:52:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1728420740; bh=H4EeSmtKRPh/FtiEi9I0GNq0jfpzFhRtWefr9DL798U=; h=From:To:Subject:Date; b=rd0eRpuPEzo7UtqyCaWkh+NHudQsN1QQjO4F9p3aFIbxnP7Mj2M7ZrlNJng+zBfym +7JG71wc/y5C2LHh6vLKJz1lEpM4PMI3ehnSlTct87t9MF2/sqwcau6u6qk8dhvUbL oGFyClQxAy1z/8xHmScYJmq2myTynTONNtmetYUk= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 498KqKq4016089 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 8 Oct 2024 15:52:20 -0500 Received: from DLEE100.ent.ti.com (157.170.170.30) 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.23; Tue, 8 Oct 2024 15:52:19 -0500 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DLEE100.ent.ti.com (157.170.170.30) 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; Tue, 8 Oct 2024 15:52:19 -0500 Received: from uda0214219 (uda0214219.dhcp.ti.com [128.247.81.222]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 498KqJpL074165; Tue, 8 Oct 2024 15:52:19 -0500 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1syHBr-00013r-RJ; Tue, 08 Oct 2024 15:52:19 -0500 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-ti][scarthgap][PATCH v2 1/4] linux-ti-staging: Add v6.12 recipe Date: Tue, 8 Oct 2024 15:52:16 -0500 Message-ID: <20241008205219.4037-1-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea 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 ; Tue, 08 Oct 2024 20:52:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/17996 Adding needed recipes for initial testing and development of the 6.12 kernel for the next LTS. Signed-off-by: Ryan Eatmon --- v2: Added --find-copies-harder option. .../linux/linux-ti-staging-6.12/defconfig | 2 ++ .../linux/linux-ti-staging-6.12/k3/defconfig | 2 ++ .../omapl138/defconfig | 0 .../linux/linux-ti-staging-6.12/ti33x/defconfig | 2 ++ .../linux/linux-ti-staging-6.12/ti43x/defconfig | 2 ++ .../linux/linux-ti-staging-rt-6.12/defconfig | 2 ++ .../linux/linux-ti-staging-rt-6.12/k3/defconfig | 2 ++ .../omapl138/defconfig | 1 + .../linux/linux-ti-staging-rt-6.12/ti33x/defconfig | 2 ++ .../linux/linux-ti-staging-rt-6.12/ti43x/defconfig | 2 ++ ...i-staging-rt_6.6.bb => linux-ti-staging-rt_6.12.bb} | 10 ++-------- .../linux/linux-ti-staging-systest-6.12/defconfig | 2 ++ .../linux/linux-ti-staging-systest-6.12/k3/defconfig | 2 ++ .../omapl138/defconfig | 0 .../linux/linux-ti-staging-systest_6.12.bb | 7 +++++++ ...inux-ti-staging_6.1.bb => linux-ti-staging_6.12.bb} | 10 ++++++---- meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc | 4 ++++ 17 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/k3/defconfig copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-6.1 => linux-ti-staging-6.12}/omapl138/defconfig (100%) create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti33x/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti43x/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-6.6 => linux-ti-staging-rt-6.12}/omapl138/defconfig (70%) create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti33x/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti43x/defconfig copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-rt_6.6.bb => linux-ti-staging-rt_6.12.bb} (55%) create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/k3/defconfig copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-6.1 => linux-ti-staging-systest-6.12}/omapl138/defconfig (100%) create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.12.bb copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging_6.1.bb => linux-ti-staging_6.12.bb} (87%) diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig new file mode 100644 index 00000000..9d579e41 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment= diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/k3/defconfig new file mode 100644 index 00000000..fd07b34e --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/k3/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=defconfig +config-fragment= 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.12/omapl138/defconfig similarity index 100% copy from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/omapl138/defconfig copy to meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/omapl138/defconfig diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti33x/defconfig new file mode 100644 index 00000000..9d579e41 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti33x/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment= diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti43x/defconfig new file mode 100644 index 00000000..9d579e41 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti43x/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment= diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig new file mode 100644 index 00000000..9d579e41 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment= diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig new file mode 100644 index 00000000..fd07b34e --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=defconfig +config-fragment= diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/omapl138/defconfig similarity index 70% copy from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/omapl138/defconfig copy to meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/omapl138/defconfig index 099493af..3d890b6e 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/omapl138/defconfig +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/omapl138/defconfig @@ -1 +1,2 @@ use-kernel-config=davinci_all_defconfig +config-fragment= diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti33x/defconfig new file mode 100644 index 00000000..9d579e41 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti33x/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment= diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti43x/defconfig new file mode 100644 index 00000000..9d579e41 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti43x/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment= diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb similarity index 55% copy from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb copy to meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb index c73a1880..9e5c4ee4 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb @@ -1,15 +1,9 @@ -require linux-ti-staging_6.6.bb +require linux-ti-staging_6.12.bb KERNEL_LOCALVERSION:append = "-rt" # Look in the generic major.minor directory for files # This will have priority over generic non-rt path -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:" - -BRANCH = "ti-rt-linux-6.6.y" - -SRCREV = "d05688f353d10af170286db56535443184202eab" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:" include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''} - -PV = "6.6.44+git" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/defconfig new file mode 100644 index 00000000..9d579e41 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment= diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/k3/defconfig new file mode 100644 index 00000000..fd07b34e --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/k3/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=defconfig +config-fragment= 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-systest-6.12/omapl138/defconfig similarity index 100% copy from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/omapl138/defconfig copy to meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.12/omapl138/defconfig diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.12.bb new file mode 100644 index 00000000..8ce23368 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.12.bb @@ -0,0 +1,7 @@ +require linux-ti-staging_6.12.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.12:" 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.12.bb similarity index 87% copy from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb copy to meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb index 840233fd..f6f8732b 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb @@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit ti-secdev inherit kernel +DEFAULT_PREFERENCE = "-1" + require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/ti-kernel.inc include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} @@ -14,17 +16,17 @@ include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ' DEPENDS += "gmp-native libmpc-native" # Look in the generic major.minor directory for files -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ ${EXTRA_DTC_ARGS}" S = "${WORKDIR}/git" -BRANCH ?= "ti-linux-6.1.y" +BRANCH ?= "ti-linux-6.12.y" -SRCREV ?= "da449d8c3cf600b0346a6696e1e3cc431422e765" -PV = "6.1.105+git" +SRCREV ?= "9852d85ec9d492ebef56dc5f229416c925758edc" +PV = "6.12-rc1+git" KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" KERNEL_GIT_PROTOCOL = "https" diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc index 4bcbc27e..09cfdb12 100644 --- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc +++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc @@ -20,6 +20,10 @@ KERNEL_PATCHES:bsp-mainline = " \ file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \ " +KERNEL_PATCHES:bsp-ti-6_12 = " \ + file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \ +" + KERNEL_PATCHES:bsp-ti-6_6 = " \ file://0001-vt-conmakehash-improve-reproducibility.patch \ " From patchwork Tue Oct 8 20:52:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 50072 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 0F448CF0428 for ; Tue, 8 Oct 2024 20:52:25 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web11.6696.1728420741612096476 for ; Tue, 08 Oct 2024 13:52:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=whPbqpC4; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: reatmon@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 498KqKkF050115; Tue, 8 Oct 2024 15:52:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1728420740; bh=8dN4MB/7/fXW2m8midAmT/hNIN6419zOZuxpkCoLPuE=; h=From:To:Subject:Date:In-Reply-To:References; b=whPbqpC4dX29hp/fsYS58K6aQhA6KmnR/yxtuA6cxsqaulHrM0wP6aAyU8OfwZNFl jPjwG6uF/YBPDH3ObAQdr5Qds6ew7MYQsNisTu5NFNVubZNe7qs5+A1AMtqK/1gNdU cJ7U591hgsSpZhSpIpZa+EfEAO9JSey++aWisNGQ= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTP id 498KqKDO061380; Tue, 8 Oct 2024 15:52:20 -0500 Received: from DLEE106.ent.ti.com (157.170.170.36) 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.23; Tue, 8 Oct 2024 15:52:19 -0500 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DLEE106.ent.ti.com (157.170.170.36) 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; Tue, 8 Oct 2024 15:52:20 -0500 Received: from uda0214219 (uda0214219.dhcp.ti.com [128.247.81.222]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 498KqKZ5068810; Tue, 8 Oct 2024 15:52:20 -0500 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1syHBr-00013t-V0; Tue, 08 Oct 2024 15:52:19 -0500 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-ti][scarthgap][PATCH v2 2/4] u-boot-ti-staging: Add v2024.10 recipe Date: Tue, 8 Oct 2024 15:52:17 -0500 Message-ID: <20241008205219.4037-2-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20241008205219.4037-1-reatmon@ti.com> References: <20241008205219.4037-1-reatmon@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea 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 ; Tue, 08 Oct 2024 20:52:25 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/17997 Adding needed recipe for initial testing and development of the 2024.10 version of u-boot for the next LTS. Signed-off-by: Ryan Eatmon --- v2: Added --find-copies-harder option. ...t-ti-staging_2023.04.bb => u-boot-ti-staging_2024.10.bb} | 6 ++++-- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) copy meta-ti-bsp/recipes-bsp/u-boot/{u-boot-ti-staging_2023.04.bb => u-boot-ti-staging_2024.10.bb} (52%) diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.10.bb similarity index 52% copy from meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb copy to meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.10.bb index b92a0a93..1ab94fcc 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.10.bb @@ -1,9 +1,11 @@ require u-boot-ti.inc +DEFAULT_PREFERENCE = "-1" + include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} PR = "r0" -BRANCH = "ti-u-boot-2023.04" +BRANCH = "ti-u-boot-2024.10" -SRCREV = "7044504f44002fe46b4598420852033d335d56c7" +SRCREV = "c97ada2dc66934ee00a7a03d9ed078bdfb7b4039" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index e1f1972e..97237d66 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -26,6 +26,9 @@ SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};branch=${BRANCH}" PV:append = "+git" +# u-boot builds a tool mkeficapsule and it needs this +DEPENDS += "gnutls-native" + # u-boot needs devtree compiler to parse dts files DEPENDS += "dtc-native bc-native flex-native bison-native python3-setuptools-native" From patchwork Tue Oct 8 20:52:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 50070 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 E5247CF0425 for ; Tue, 8 Oct 2024 20:52:24 +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.6643.1728420741771517362 for ; Tue, 08 Oct 2024 13:52:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=avZ2b+Kh; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: reatmon@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 498KqK77050119; Tue, 8 Oct 2024 15:52:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1728420740; bh=wBAgnonuYgZDbPKABPnXbTCDZ/8GFKB93ey9IDuWaPs=; h=From:To:Subject:Date:In-Reply-To:References; b=avZ2b+KhtG+HTDrwgYxFGUz48/XJwP2iGl1xaM18ZZUKxzwRXur2d30COcxAIbKas NkSomYaoTDO38DyHwcfYY/UT73XzUbZBwyadgkjr66m7RmGwqglSwwP4jOmXu9mwvf bJopARw85t22D9BfuPW0smS8qXFuV6d67PG2/xv8= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 498KqKVw100717 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 8 Oct 2024 15:52:20 -0500 Received: from DFLE105.ent.ti.com (10.64.6.26) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Tue, 8 Oct 2024 15:52:20 -0500 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DFLE105.ent.ti.com (10.64.6.26) 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; Tue, 8 Oct 2024 15:52:20 -0500 Received: from uda0214219 (uda0214219.dhcp.ti.com [128.247.81.222]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 498KqKPd068813; Tue, 8 Oct 2024 15:52:20 -0500 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1syHBs-00013z-2b; Tue, 08 Oct 2024 15:52:20 -0500 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-ti][scarthgap][PATCH v2 3/4] ti-bsp: Add ti-6_12 Date: Tue, 8 Oct 2024 15:52:18 -0500 Message-ID: <20241008205219.4037-3-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20241008205219.4037-1-reatmon@ti.com> References: <20241008205219.4037-1-reatmon@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea 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 ; Tue, 08 Oct 2024 20:52:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/17998 Add new BSP for the 6.12 kernel and u-boot 2024.10 versions. Signed-off-by: Ryan Eatmon --- v2: Fix copy/paste typo in new ti-6_12 section. meta-ti-bsp/conf/machine/include/ti-bsp.inc | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index 33611689..4cb2aab4 100644 --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc @@ -35,6 +35,19 @@ BSP_BOOTLOADER_VERSION:bsp-next = "%" # in next, usually present in TI staging or derivative like BB.org MACHINE_FEATURES:remove:bsp-next = "gpu" +# ========== +# ti-6_12 +# TI staging kernel 6.12, u-boot 2024.10 +# ========== +BSP_KERNEL_PROVIDER:bsp-ti-6_12 = "linux-ti-staging" +BSP_KERNEL_VERSION:bsp-ti-6_12 = "6.12%" +BSP_BOOTLOADER_PROVIDER:bsp-ti-6_12 = "u-boot-ti-staging" +BSP_BOOTLOADER_VERSION:bsp-ti-6_12 = "2024.10%" + +# GPU support requires out-of-tree SGX and Rogue drivers not available +# in 6.12 yet +MACHINE_FEATURES:remove:bsp-ti-6_12 = "gpu" + # ========== # ti-6_6 # TI staging kernel 6.6, u-boot 2024.04 @@ -42,7 +55,7 @@ MACHINE_FEATURES:remove:bsp-next = "gpu" BSP_KERNEL_PROVIDER:bsp-ti-6_6 = "linux-ti-staging" BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6%" BSP_BOOTLOADER_PROVIDER:bsp-ti-6_6 = "u-boot-ti-staging" -BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024%" +BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%" # Only Rogue is enabled so far, SGX falls back to SW rendering BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver" From patchwork Tue Oct 8 20:52:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Eatmon X-Patchwork-Id: 50071 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 E8154CF0427 for ; Tue, 8 Oct 2024 20:52:24 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web10.6641.1728420741432937548 for ; Tue, 08 Oct 2024 13:52:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=k3rZ03WM; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: reatmon@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 498KqKv8082892; Tue, 8 Oct 2024 15:52:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1728420740; bh=RfhYs7oTrK9tAYKghAKsTRAobyO/fZopS1LsvsOhKHE=; h=From:To:Subject:Date:In-Reply-To:References; b=k3rZ03WMiKLJN8H0vu+wDigvgebuQz2vbXU+exasORyXAPrlInRYCxjZYhIYx3N4V /lX3H2kLttwKrhI3i6G08LBP/JflVav/ebUTTY0/FMrPWwSXCU2jub2jB+Qni6xKTC G9tGNceJA9IfdwuKTQCxMFUU2PCOjH7a82oWwZlY= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 498KqK2H061233 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 8 Oct 2024 15:52:20 -0500 Received: from DLEE114.ent.ti.com (157.170.170.25) 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.23; Tue, 8 Oct 2024 15:52:20 -0500 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) 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.23 via Frontend Transport; Tue, 8 Oct 2024 15:52:19 -0500 Received: from uda0214219 (uda0214219.dhcp.ti.com [128.247.81.222]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 498KqKGN068819; Tue, 8 Oct 2024 15:52:20 -0500 Received: from reatmon by uda0214219 with local (Exim 4.90_1) (envelope-from ) id 1syHBs-000145-6h; Tue, 08 Oct 2024 15:52:20 -0500 From: Ryan Eatmon To: Praneeth Bajjuri , Denys Dmytriyenko , Subject: [meta-ti][scarthgap][PATCH v2 4/4] debugss-module-drv: Add patch for kernel 6.11 change Date: Tue, 8 Oct 2024 15:52:19 -0500 Message-ID: <20241008205219.4037-4-reatmon@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20241008205219.4037-1-reatmon@ti.com> References: <20241008205219.4037-1-reatmon@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea 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 ; Tue, 08 Oct 2024 20:52:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/17995 There was a change to the return value for a function pointer in the kernel v6.11. This patch adapts the module to the kernel change. Signed-off-by: Ryan Eatmon --- .../dsptop/debugss-module-drv_git.bb | 5 +- ...kernel-6.11-changed-return-value-for.patch | 58 +++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 meta-ti-extras/recipes-bsp/dsptop/files/0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch diff --git a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb index 81e544f7..74ceed9d 100644 --- a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb +++ b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb @@ -18,4 +18,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" include dsptop.inc -SRC_URI += "file://0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch" +SRC_URI += "\ + file://0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch \ + file://0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch \ +" diff --git a/meta-ti-extras/recipes-bsp/dsptop/files/0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch b/meta-ti-extras/recipes-bsp/dsptop/files/0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch new file mode 100644 index 00000000..4e9727a0 --- /dev/null +++ b/meta-ti-extras/recipes-bsp/dsptop/files/0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch @@ -0,0 +1,58 @@ +From aaddf1fa8b92db23ae2ebc83826c2bb5f5c87c35 Mon Sep 17 00:00:00 2001 +From: Ryan Eatmon +Date: Thu, 3 Oct 2024 14:25:18 -0500 +Subject: [PATCH] debugss_kmodule: kernel 6.11 changed return value for remove + slot + +In kernel version 6.11 the function footprint changed for the remove +slot to return a void instead of an int. [1] + +Add ifdef checking code to look for kernel version and pick the correct +return code. + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/include/linux/platform_device.h?id=0edb555a65d1ef047a9805051c36922b52a38a9d + +Upstream-Status: Inactive-Upstream [lastcommit: 2021-04-20] + +Signed-off-by: Ryan Eatmon +--- + debugss_kmodule.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/debugss_kmodule.c b/debugss_kmodule.c +index 9e084eb..4191be8 100644 +--- a/debugss_kmodule.c ++++ b/debugss_kmodule.c +@@ -27,6 +27,7 @@ + #include "debugss_kmodule.h" + + #include ++#include + + /* un-comment the line below to enable printing for kernel debug messages */ + //#define DEBUGSS_DRV_DEBUG +@@ -1132,7 +1133,11 @@ static int dra7xx_debugss_probe(struct platform_device *pdev) + return retval; + } + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)) + static int dra7xx_debugss_remove(struct platform_device *pdev) ++#else ++static void dra7xx_debugss_remove(struct platform_device *pdev) ++#endif + { + __D("%s:\n",__FUNCTION__); + +@@ -1145,7 +1150,9 @@ static int dra7xx_debugss_remove(struct platform_device *pdev) + /* Un-prepare debugSS clock */ + clk_disable_unprepare(sys_clk_in1); + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)) + return 0; ++#endif + } + + static const struct of_device_id dra7xx_debugss_of_match[] = { +-- +2.17.1 +