Add all of the initial recipes/files needed for 6.18 development.
Signed-off-by: Ryan Eatmon <[email protected]>
---
v2: Add missing reproducibility patches.
...ild-path-from-generated-mach-types.h.patch | 90 +++++++++++++++++++
.../defconfig | 0
.../k3/defconfig | 0
.../omapl138/defconfig | 0
.../ti33x}/defconfig | 0
.../ti43x}/defconfig | 0
.../defconfig | 0
.../k3/defconfig | 0
.../omapl138/defconfig | 0
.../ti33x}/defconfig | 0
.../ti43x}/defconfig | 0
...-rt_6.6.bb => linux-ti-staging-rt_6.18.bb} | 10 +--
...aging_6.12.bb => linux-ti-staging_6.18.bb} | 16 ++--
13 files changed, 102 insertions(+), 14 deletions(-)
create mode 100644
meta-ti-bsp/recipes-kernel/linux/files/0001-arm-Remove-build-path-from-generated-mach-types.h.patch
copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-6.12 =>
linux-ti-staging-6.18}/defconfig (100%)
copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-6.12 =>
linux-ti-staging-6.18}/k3/defconfig (100%)
copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-6.12 =>
linux-ti-staging-6.18}/omapl138/defconfig (100%)
copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-6.12 =>
linux-ti-staging-6.18/ti33x}/defconfig (100%)
copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-6.12 =>
linux-ti-staging-6.18/ti43x}/defconfig (100%)
copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-rt-6.12 =>
linux-ti-staging-rt-6.18}/defconfig (100%)
copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-rt-6.12 =>
linux-ti-staging-rt-6.18}/k3/defconfig (100%)
copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-rt-6.12 =>
linux-ti-staging-rt-6.18}/omapl138/defconfig (100%)
copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-rt-6.12 =>
linux-ti-staging-rt-6.18/ti33x}/defconfig (100%)
copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-rt-6.12 =>
linux-ti-staging-rt-6.18/ti43x}/defconfig (100%)
copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging-rt_6.6.bb =>
linux-ti-staging-rt_6.18.bb} (55%)
copy meta-ti-bsp/recipes-kernel/linux/{linux-ti-staging_6.12.bb =>
linux-ti-staging_6.18.bb} (70%)
diff --git
a/meta-ti-bsp/recipes-kernel/linux/files/0001-arm-Remove-build-path-from-generated-mach-types.h.patch
b/meta-ti-bsp/recipes-kernel/linux/files/0001-arm-Remove-build-path-from-generated-mach-types.h.patch
new file mode 100644
index 00000000..9422692f
--- /dev/null
+++
b/meta-ti-bsp/recipes-kernel/linux/files/0001-arm-Remove-build-path-from-generated-mach-types.h.patch
@@ -0,0 +1,90 @@
+From mboxrd@z Thu Jan 1 00:00:00 1970
+Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141])
+ (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+ (No client certificate requested)
+ by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6C761CF7C0
+ for <[email protected]>; Wed, 2 Oct 2024 17:51:03 +0000
(UTC)
+Authentication-Results: smtp.subspace.kernel.org; arc=none
smtp.client-ip=198.47.19.141
+ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
+ t=1727891465; cv=none;
b=CEYYtmSJFo/Sgv/xDxI47tFv5EQYgI48gCmjgNCwoCG+YAxaTGv6w5t0LvkrZFVDbtI7ZlXtzmSmrUjH/knuKDDfcyE9kRmVwFTkvZuTRbeuzgYAvzQqGZx2MUP+19HrXiJhkzdaW2gqaUHm6jzKotnMAmuIf5MdymPExP2XEOA=
+ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
+ s=arc-20240116; t=1727891465; c=relaxed/simple;
+ bh=rz8JAFjsjsVowpA2nxzzCem6/hVUcRWem+15QWeBIZ8=;
+ h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type;
b=U//l6phLjcdtIQoiM3NTJtyWYEckbwlaAolhWAr5vBabPsLMC8r132cMmOCq2VeaXQYpJZi1PF9o9qa7ruMa2mDuPYYQEJxfQXLUcfvfuNBNSe3/YPt0ZnczRoKOVp/ZhK9eCbAyuqdKiV88VJX4HXf29Pk4U/pJUJiuIBz6z0c=
+ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass
(p=quarantine dis=none) header.from=ti.com; spf=pass smtp.mailfrom=ti.com;
dkim=pass (1024-bit key) header.d=ti.com [email protected] header.b=x9oOIcId;
arc=none smtp.client-ip=198.47.19.141
+Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine
dis=none) header.from=ti.com
+Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com
+Authentication-Results: smtp.subspace.kernel.org;
+ dkim=pass (1024-bit key) header.d=ti.com [email protected]
header.b="x9oOIcId"
+Received: from fllv0034.itg.ti.com ([10.64.40.246])
+ by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 492HonLf096412;
+ Wed, 2 Oct 2024 12:50:49 -0500
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com;
+ s=ti-com-17Q1; t=1727891449;
+ bh=D9PCum0HyoqSpwC0i4ipngZTLS2ludQXOcLTt/aASvw=;
+ h=From:To:Subject:Date;
+ b=x9oOIcIdQ4fKCK786eVp28izZrfEKKj+AFEJLw99X5XocNNHcf79PYgeIiaJSHqti
+ vyuEZgxqpc2ofiOvg8GGStvsJHvu9KDY6b/0cD4X6xgrxSob2RwVUMwwLFpqoGE7Ap
+ Rrv5bG+RIcs00EQ7NOloYHr81TExET3fQMA/NGQA=
+Received: from DFLE105.ent.ti.com (dfle105.ent.ti.com [10.64.6.26])
+ by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 492HonXu062400
+ (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL);
+ Wed, 2 Oct 2024 12:50:49 -0500
+Received: from DFLE110.ent.ti.com (10.64.6.31) 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; Wed, 2
+ Oct 2024 12:50:50 -0500
+Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DFLE110.ent.ti.com
+ (10.64.6.31) 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; Wed, 2 Oct 2024 12:50:49 -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 492Hon1W127998;
+ Wed, 2 Oct 2024 12:50:49 -0500
+Received: from reatmon by uda0214219 with local (Exim 4.90_1)
+ (envelope-from <[email protected]>)
+ id 1sw3Uv-0003yB-Am; Wed, 02 Oct 2024 12:50:49 -0500
+From: Ryan Eatmon <[email protected]>
+To: Russell King <[email protected]>, <[email protected]>,
+ Ryan
+ Eatmon <[email protected]>
+Subject: [PATCH] arm: Remove build path from generated mach-types.h
+Date: Wed, 2 Oct 2024 12:50:49 -0500
+Message-ID: <[email protected]>
+X-Mailer: git-send-email 2.17.1
+Precedence: bulk
+X-Mailing-List: [email protected]
+List-Id: <linux-kernel.vger.kernel.org>
+List-Subscribe: <mailto:[email protected]>
+List-Unsubscribe: <mailto:[email protected]>
+MIME-Version: 1.0
+Content-Type: text/plain
+X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea
+
+For reproducible builds, having any of the build paths in a generated
+file is problematic. Simple fix is to just remove the path. This is
+similar to the same code in arch/sh/tools/gen-mach-types.
+
+Upstream-Status: Submitted
[https://lore.kernel.org/linux-kernel/[email protected]/]
+
+Signed-off-by: Ryan Eatmon <[email protected]>
+---
+ arch/arm/tools/gen-mach-types | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/arch/arm/tools/gen-mach-types b/arch/arm/tools/gen-mach-types
+index cbe1c33bb871..9a2a5c0f1c45 100644
+--- a/arch/arm/tools/gen-mach-types
++++ b/arch/arm/tools/gen-mach-types
+@@ -24,8 +24,7 @@ NF == 3 {
+
+ END {
+ printf("/*\n");
+- printf(" * This was automagically generated from %s!\n", FILENAME);
+- printf(" * Do NOT edit\n");
++ printf(" * This was automagically generated, do NOT edit.\n");
+ printf(" */\n\n");
+ printf("#ifndef __ASM_ARM_MACH_TYPE_H\n");
+ printf("#define __ASM_ARM_MACH_TYPE_H\n\n");
+--
+2.17.1
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.18/defconfig
similarity index 100%
copy from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig
copy to meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/defconfig
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.18/k3/defconfig
similarity index 100%
copy from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/k3/defconfig
copy to meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/k3/defconfig
diff --git
a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/omapl138/defconfig
b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/omapl138/defconfig
similarity index 100%
copy from
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/omapl138/defconfig
copy to
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/omapl138/defconfig
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.18/ti33x/defconfig
similarity index 100%
copy from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig
copy to meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/ti33x/defconfig
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.18/ti43x/defconfig
similarity index 100%
copy from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig
copy to meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.18/ti43x/defconfig
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.18/defconfig
similarity index 100%
copy from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig
copy to meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/defconfig
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.18/k3/defconfig
similarity index 100%
copy from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig
copy to meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/k3/defconfig
diff --git
a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/omapl138/defconfig
b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/omapl138/defconfig
similarity index 100%
copy from
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/omapl138/defconfig
copy to
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/omapl138/defconfig
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.18/ti33x/defconfig
similarity index 100%
copy from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig
copy to
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/ti33x/defconfig
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.18/ti43x/defconfig
similarity index 100%
copy from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig
copy to
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.18/ti43x/defconfig
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.18.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.18.bb
index e817b530..a979668d 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.18.bb
@@ -1,15 +1,9 @@
-require linux-ti-staging_6.6.bb
+require linux-ti-staging_6.18.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 = "c79d7ef3a56ff61dd83d5527520b419a4f0e32e2"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.18:"
include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS')
else ''}
-
-PV = "6.6.58+git"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.18.bb
similarity index 70%
copy from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
copy to meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.18.bb
index c5563d1e..c2e2a3b5 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.18.bb
@@ -13,19 +13,21 @@ 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.12:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.18:"
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
+ ${EXTRA_DTC_ARGS}"
S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
-BRANCH ?= "ti-linux-6.12.y"
+BRANCH ?= "ti-linux-6.18.y"
-SRCREV ?= "2d5f05489a39201c2fcf95d2dc04af57b6f7f356"
-PV = "6.12.57+git"
+SRCREV ?= "75433f843c99d1ab544808749a46a6e2f0151a56"
+PV = "6.18.0+git"
KERNEL_REPRODUCIBILITY_PATCHES = " \
- file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \
+ file://0001-perf-python-Fix-compile-for-32bit-platforms.patch \
+ file://0001-arm-Remove-build-path-from-generated-mach-types.h.patch \
"
# Special configuration for remoteproc/rpmsg IPC modules
@@ -33,3 +35,5 @@ module_conf_rpmsg_client_sample = "blacklist
rpmsg_client_sample"
module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre:
virtio_rpmsg_bus"
module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre:
virtio_rpmsg_bus"
KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc
ti_k3_dsp_remoteproc"
+
+DEFAULT_PREFERENCE = "-1"
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#19348):
https://lists.yoctoproject.org/g/meta-ti/message/19348
Mute This Topic: https://lists.yoctoproject.org/mt/116735472/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
