summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2016-02-13 00:38:27 +0000
committerDenys Dmytriyenko <denys@ti.com>2016-02-12 16:33:33 -0500
commit4e8fd045b6ea25e458921bb4722568b2637c6b0e (patch)
tree44e066e8bab89aced203e7889c3dfd0f1ffa783f
parent10b611eb197c71ad8f17167fbf6956e916e18ec0 (diff)
downloadmeta-ti-4e8fd045b6ea25e458921bb4722568b2637c6b0e.tar.gz
linux-ti-staging: update with platform, connectivity and A/D merges
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r--recipes-kernel/linux/linux-ti-staging-rt_4.1.bb2
-rw-r--r--recipes-kernel/linux/linux-ti-staging_4.1.bb4
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes-kernel/linux/linux-ti-staging-rt_4.1.bb b/recipes-kernel/linux/linux-ti-staging-rt_4.1.bb
index 2747c93d..b83c9db4 100644
--- a/recipes-kernel/linux/linux-ti-staging-rt_4.1.bb
+++ b/recipes-kernel/linux/linux-ti-staging-rt_4.1.bb
@@ -6,4 +6,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.1:"
6 6
7BRANCH = "ti-rt-linux-4.1.y" 7BRANCH = "ti-rt-linux-4.1.y"
8 8
9SRCREV = "beeed3c47260849f4fb465684c906f95a9ecd350" 9SRCREV = "dae41414135f3424c2cd6c6d03f6df979b94a0ff"
diff --git a/recipes-kernel/linux/linux-ti-staging_4.1.bb b/recipes-kernel/linux/linux-ti-staging_4.1.bb
index ed7daa6b..4a21d458 100644
--- a/recipes-kernel/linux/linux-ti-staging_4.1.bb
+++ b/recipes-kernel/linux/linux-ti-staging_4.1.bb
@@ -65,11 +65,11 @@ S = "${WORKDIR}/git"
65 65
66BRANCH = "ti-lsk-linux-4.1.y" 66BRANCH = "ti-lsk-linux-4.1.y"
67 67
68SRCREV = "016823748902fcafca15b6ea166c126e5afe1176" 68SRCREV = "40263b4e2d499174013331c8800a2811d39ff8b3"
69PV = "4.1.17+git${SRCPV}" 69PV = "4.1.17+git${SRCPV}"
70 70
71# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild 71# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
72MACHINE_KERNEL_PR_append = "c" 72MACHINE_KERNEL_PR_append = "d"
73PR = "${MACHINE_KERNEL_PR}" 73PR = "${MACHINE_KERNEL_PR}"
74 74
75KERNEL_CONFIG_DIR = "${S}/ti_config_fragments" 75KERNEL_CONFIG_DIR = "${S}/ti_config_fragments"