| Message ID | 20230322143203.20360-3-reatmon@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | Kernel and u-boot LTS | expand |
On Wed, Mar 22, 2023 at 09:32:02AM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: > 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 <reatmon@ti.com> > Signed-off-by: Andrew Davis <afd@ti.com> > --- > 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 <snip> > 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" I don't think this is needed any more - this hasn't been used for quite a while. IIRC, this was used to bundle DTB+DTBOs into a mini FIT image in the early DT Overlay days...
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"