| Message ID | 20231211193317.27652-1-reatmon@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master] linux-ti-staging: Add 6.6 kernel in prep for LTS migration | expand |
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/defconfig new file mode 100644 index 00000000..24b53cf7 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/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.6/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/k3/defconfig new file mode 100644 index 00000000..ef1d3efd --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/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.6/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/omapl138/defconfig new file mode 100644 index 00000000..099493af --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/omapl138/defconfig @@ -0,0 +1 @@ +use-kernel-config=davinci_all_defconfig diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti33x/defconfig new file mode 100644 index 00000000..e6a967e1 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti33x/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/no_smp.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti43x/defconfig new file mode 100644 index 00000000..e6a967e1 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti43x/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/no_smp.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/defconfig new file mode 100644 index 00000000..43089dc8 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/k3/defconfig new file mode 100644 index 00000000..47d78664 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/k3/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=defconfig +config-fragment=kernel/configs/ti_arm64_prune.config kernel/configs/ti_rt.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/omapl138/defconfig new file mode 100644 index 00000000..2c829c0b --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/omapl138/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=davinci_all_defconfig +config-fragment=kernel/configs/ti_rt.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti33x/defconfig new file mode 100644 index 00000000..5de2b229 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti33x/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config kernel/configs/no_smp.config diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti43x/defconfig new file mode 100644 index 00000000..5de2b229 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti43x/defconfig @@ -0,0 +1,2 @@ +use-kernel-config=multi_v7_defconfig +config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config kernel/configs/no_smp.config 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.6.bb new file mode 100644 index 00000000..4928aa88 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb @@ -0,0 +1,16 @@ +require linux-ti-staging_6.6.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.6:" + +#BRANCH = "ti-rt-linux-6.6.y" +BRANCH = "ti-linux-6.6.y" + +SRCREV = "ffc253263a1375a65fa6c9f62a893e9767fbebfa" + +include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''} + +PV = "6.6.0+git${SRCPV}" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/defconfig new file mode 100644 index 00000000..24b53cf7 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/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.6/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/k3/defconfig new file mode 100644 index 00000000..ef1d3efd --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/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.6/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/omapl138/defconfig new file mode 100644 index 00000000..099493af --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/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.6.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb new file mode 100644 index 00000000..21090904 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb @@ -0,0 +1,7 @@ +require linux-ti-staging_6.6.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.6:" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb new file mode 100644 index 00000000..adc10a01 --- /dev/null +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb @@ -0,0 +1,44 @@ +SECTION = "kernel" +SUMMARY = "Linux kernel for TI devices" +LICENSE = "GPL-2.0-only" +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 ''} +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.6:" + +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ + ${EXTRA_DTC_ARGS}" + +S = "${WORKDIR}/git" + +BRANCH ?= "ti-linux-6.6.y" + +SRCREV ?= "ffc253263a1375a65fa6c9f62a893e9767fbebfa" +PV = "6.6.0+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" + +# Special configuration for remoteproc/rpmsg IPC modules +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"
We are preparing to migrate our kernel version to 6.6. 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 6.1 kernel and make this the default. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- .../linux/linux-ti-staging-6.6/defconfig | 2 + .../linux/linux-ti-staging-6.6/k3/defconfig | 2 + .../linux-ti-staging-6.6/omapl138/defconfig | 1 + .../linux-ti-staging-6.6/ti33x/defconfig | 2 + .../linux-ti-staging-6.6/ti43x/defconfig | 2 + .../linux/linux-ti-staging-rt-6.6/defconfig | 2 + .../linux-ti-staging-rt-6.6/k3/defconfig | 2 + .../omapl138/defconfig | 2 + .../linux-ti-staging-rt-6.6/ti33x/defconfig | 2 + .../linux-ti-staging-rt-6.6/ti43x/defconfig | 2 + .../linux/linux-ti-staging-rt_6.6.bb | 16 +++++++ .../linux-ti-staging-systest-6.6/defconfig | 2 + .../linux-ti-staging-systest-6.6/k3/defconfig | 2 + .../omapl138/defconfig | 1 + .../linux/linux-ti-staging-systest_6.6.bb | 7 +++ .../linux/linux-ti-staging_6.6.bb | 44 +++++++++++++++++++ 16 files changed, 91 insertions(+) create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/k3/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/omapl138/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti33x/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.6/ti43x/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/k3/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/omapl138/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti33x/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.6/ti43x/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/k3/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/omapl138/defconfig create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb