diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/defconfig b/recipes-kernel/linux/linux-ti-staging-4.19/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-4.14/defconfig rename to recipes-kernel/linux/linux-ti-staging-4.19/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/dra7xx/defconfig b/recipes-kernel/linux/linux-ti-staging-4.19/dra7xx/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-4.14/dra7xx/defconfig rename to recipes-kernel/linux/linux-ti-staging-4.19/dra7xx/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/k2g/defconfig b/recipes-kernel/linux/linux-ti-staging-4.19/k2g/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-4.14/k2g/defconfig rename to recipes-kernel/linux/linux-ti-staging-4.19/k2g/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/k3/defconfig b/recipes-kernel/linux/linux-ti-staging-4.19/k3/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-4.14/k3/defconfig rename to recipes-kernel/linux/linux-ti-staging-4.19/k3/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/keystone/defconfig b/recipes-kernel/linux/linux-ti-staging-4.19/keystone/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-4.14/keystone/defconfig rename to recipes-kernel/linux/linux-ti-staging-4.19/keystone/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/omapl138/defconfig b/recipes-kernel/linux/linux-ti-staging-4.19/omapl138/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-4.14/omapl138/defconfig rename to recipes-kernel/linux/linux-ti-staging-4.19/omapl138/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/ti33x/defconfig b/recipes-kernel/linux/linux-ti-staging-4.19/ti33x/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-4.14/ti33x/defconfig rename to recipes-kernel/linux/linux-ti-staging-4.19/ti33x/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-4.14/ti43x/defconfig b/recipes-kernel/linux/linux-ti-staging-4.19/ti43x/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-4.14/ti43x/defconfig rename to recipes-kernel/linux/linux-ti-staging-4.19/ti43x/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.14/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.19/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-rt-4.14/defconfig rename to recipes-kernel/linux/linux-ti-staging-rt-4.19/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.14/dra7xx/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.19/dra7xx/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-rt-4.14/dra7xx/defconfig rename to recipes-kernel/linux/linux-ti-staging-rt-4.19/dra7xx/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.14/k2g/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.19/k2g/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-rt-4.14/k2g/defconfig rename to recipes-kernel/linux/linux-ti-staging-rt-4.19/k2g/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.14/k3/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.19/k3/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-rt-4.14/k3/defconfig rename to recipes-kernel/linux/linux-ti-staging-rt-4.19/k3/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.14/keystone/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.19/keystone/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-rt-4.14/keystone/defconfig rename to recipes-kernel/linux/linux-ti-staging-rt-4.19/keystone/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.14/ti33x/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.19/ti33x/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-rt-4.14/ti33x/defconfig rename to recipes-kernel/linux/linux-ti-staging-rt-4.19/ti33x/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-rt-4.14/ti43x/defconfig b/recipes-kernel/linux/linux-ti-staging-rt-4.19/ti43x/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-rt-4.14/ti43x/defconfig rename to recipes-kernel/linux/linux-ti-staging-rt-4.19/ti43x/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-rt_4.14.bb b/recipes-kernel/linux/linux-ti-staging-rt_4.14.bb deleted file mode 100644 index a351ef8d..00000000 --- a/recipes-kernel/linux/linux-ti-staging-rt_4.14.bb +++ /dev/null @@ -1,10 +0,0 @@ -require linux-ti-staging_4.14.bb - -# Look in the generic major.minor directory for files -# This will have priority over generic non-rt path -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:" - -BRANCH = "ti-rt-linux-4.14.y" - -SRCREV = "aab33cfa0d3aed1fb463f6a6e62236db6b04fc5f" -PV = "4.14.79+git${SRCPV}" diff --git a/recipes-kernel/linux/linux-ti-staging-rt_4.19.bb b/recipes-kernel/linux/linux-ti-staging-rt_4.19.bb new file mode 100644 index 00000000..e6e4c1bf --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-rt_4.19.bb @@ -0,0 +1,10 @@ +require linux-ti-staging_4.19.bb + +# Look in the generic major.minor directory for files +# This will have priority over generic non-rt path +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.19:" + +BRANCH = "ti-rt-linux-4.19.y" + +SRCREV = "54cdc562d6d233f43e5ffce60562d6fe110adf90" +PV = "4.19.15+git${SRCPV}" diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.19/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-systest-4.14/defconfig rename to recipes-kernel/linux/linux-ti-staging-systest-4.19/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/dra7xx/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.19/dra7xx/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-systest-4.14/dra7xx/defconfig rename to recipes-kernel/linux/linux-ti-staging-systest-4.19/dra7xx/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/k2g/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.19/k2g/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-systest-4.14/k2g/defconfig rename to recipes-kernel/linux/linux-ti-staging-systest-4.19/k2g/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/k3/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.19/k3/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-systest-4.14/k3/defconfig rename to recipes-kernel/linux/linux-ti-staging-systest-4.19/k3/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/keystone/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.19/keystone/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-systest-4.14/keystone/defconfig rename to recipes-kernel/linux/linux-ti-staging-systest-4.19/keystone/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/omapl138/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.19/omapl138/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-systest-4.14/omapl138/defconfig rename to recipes-kernel/linux/linux-ti-staging-systest-4.19/omapl138/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/ti33x/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.19/ti33x/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-systest-4.14/ti33x/defconfig rename to recipes-kernel/linux/linux-ti-staging-systest-4.19/ti33x/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.14/ti43x/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.19/ti43x/defconfig similarity index 100% rename from recipes-kernel/linux/linux-ti-staging-systest-4.14/ti43x/defconfig rename to recipes-kernel/linux/linux-ti-staging-systest-4.19/ti43x/defconfig diff --git a/recipes-kernel/linux/linux-ti-staging-systest_4.14.bb b/recipes-kernel/linux/linux-ti-staging-systest_4.19.bb similarity index 55% rename from recipes-kernel/linux/linux-ti-staging-systest_4.14.bb rename to recipes-kernel/linux/linux-ti-staging-systest_4.19.bb index 5fa8fe27..6f02f1a7 100644 --- a/recipes-kernel/linux/linux-ti-staging-systest_4.14.bb +++ b/recipes-kernel/linux/linux-ti-staging-systest_4.19.bb @@ -1,5 +1,5 @@ -require linux-ti-staging_4.14.bb +require linux-ti-staging_4.19.bb # Look in the generic major.minor directory for files # This will have priority over generic non-rt path -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.19:" diff --git a/recipes-kernel/linux/linux-ti-staging_4.14.bb b/recipes-kernel/linux/linux-ti-staging_4.19.bb similarity index 90% rename from recipes-kernel/linux/linux-ti-staging_4.14.bb rename to recipes-kernel/linux/linux-ti-staging_4.19.bb index 18fae418..97a96a41 100644 --- a/recipes-kernel/linux/linux-ti-staging_4.14.bb +++ b/recipes-kernel/linux/linux-ti-staging_4.19.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for TI devices" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" inherit kernel @@ -11,7 +11,7 @@ require recipes-kernel/linux/ti-uio.inc require recipes-kernel/linux/bundle-devicetree.inc # Look in the generic major.minor directory for files -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.19:" # Pull in the devicetree files into the rootfs RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree" @@ -54,13 +54,13 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" S = "${WORKDIR}/git" -BRANCH = "ti-lsk-linux-4.14.y" +BRANCH = "ti-linux-4.19.y" -SRCREV = "3438de34744b2eba32456bf8e3f44b19e3061331" -PV = "4.14.79+git${SRCPV}" +SRCREV = "efb32b0ef31152f612fcefae8f7511e88da957be" +PV = "4.19.15+git${SRCPV}" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild -MACHINE_KERNEL_PR_append = "c" +MACHINE_KERNEL_PR_append = "a" PR = "${MACHINE_KERNEL_PR}" KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"