linux-ti-staging: upgrade to 4.14

Some DTBs have changed, am57xx-evm moved to DT overlays.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>

conf/machine/am57xx-evm.conf

@@ -11,8 +11,7 @@ IMAGE_FSTYPES += "tar.xz"
 SERIAL_CONSOLE = "115200 ttyS2"
 
 KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb \
-                    am57xx-evm.dtb am57xx-evm-cam-mt9t111.dtb am57xx-evm-cam-ov10635.dtb \
-                    am57xx-evm-reva3.dtb am57xx-evm-reva3-cam-mt9t111.dtb am57xx-evm-reva3-cam-ov10635.dtb \
+                    ti/am57xx-evm.dtbo ti/mt9t111.dtbo ti/ov10635.dtbo \
                     am571x-idk.dtb am571x-idk-lcd-osd101t2045.dtb am571x-idk-lcd-osd101t2587.dtb \
                     am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb \
                     am574x-idk.dtb am574x-idk-lcd-osd101t2587.dtb \

conf/machine/dra7xx-evm.conf

@@ -10,10 +10,11 @@ IMAGE_FSTYPES += "tar.xz"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-KERNEL_DEVICETREE = "dra7-evm.dtb dra7-evm-lcd-lg.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \
-                    dra72-evm.dtb dra72-evm-lcd-lg.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \
+KERNEL_DEVICETREE = "dra7-evm.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \
+                    dra72-evm.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \
                     dra72-evm-revc.dtb dra72-evm-revc-lcd-osd101t2045.dtb dra72-evm-revc-lcd-osd101t2587.dtb \
-                    dra71-evm.dtb dra71-evm-lcd-auo-g101evn01.0.dtb dra76-evm.dtb dra76-evm-tfp410.dtb"
+                    dra71-evm.dtb dra71-evm-lcd-auo-g101evn01.0.dtb \
+                    dra76-evm.dtb dra76-evm-tfp410.dtb"
 
 UBOOT_MACHINE = "dra7xx_evm_config"
 

recipes-kernel/linux/linux-ti-staging-rt_4.14.bb

@@ -0,0 +1,9 @@
+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 = "92c3e398509d57ea7ad40ac87aa5b7ed5e5014e2"

recipes-kernel/linux/linux-ti-staging-rt_4.9.bb

@@ -1,9 +0,0 @@
-require linux-ti-staging_4.9.bb
-
-# Look in the generic major.minor directory for files
-# This will have priority over generic non-rt path
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.9:"
-
-BRANCH = "ti-rt-linux-4.9.y"
-
-SRCREV = "764089ed2a847e9d4c06c0e0baaaeaf42aa2d99f"

recipes-kernel/linux/linux-ti-staging-systest_4.14.bb

@@ -1,5 +1,5 @@
-require linux-ti-staging_4.9.bb
+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.9:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:"

recipes-kernel/linux/linux-ti-staging_4.14.bb

@@ -10,7 +10,7 @@ require recipes-kernel/linux/cmem.inc
 require recipes-kernel/linux/ti-uio.inc
 
 # Look in the generic major.minor directory for files
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.9:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:"
 
 # Pull in the devicetree files into the rootfs
 RDEPENDS_kernel-base += "kernel-devicetree"
@@ -52,10 +52,10 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/git"
 
-BRANCH = "ti-lsk-linux-4.9.y"
+BRANCH = "ti-lsk-linux-4.14.y"
 
-SRCREV = "89d085d1a407961d43d2492803facb6a8e678fda"
-PV = "4.9.69+git${SRCPV}"
+SRCREV = "36a950c35adcec9c55c20ef1deb5e33c87ae0a3f"
+PV = "4.14.19+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR_append = "a"