summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-ti-staging-3.14/defconfig (renamed from recipes-kernel/linux/linux-ti-staging-3.15/defconfig)0
-rw-r--r--recipes-kernel/linux/linux-ti-staging-3.14/ipc.cfg (renamed from recipes-kernel/linux/linux-ti-staging-3.15/ipc.cfg)0
-rw-r--r--recipes-kernel/linux/linux-ti-staging-3.14/non-smp.cfg (renamed from recipes-kernel/linux/linux-ti-staging-3.15/non-smp.cfg)0
-rw-r--r--recipes-kernel/linux/linux-ti-staging-3.14/systest.cfg (renamed from recipes-kernel/linux/linux-ti-staging-3.15/systest.cfg)0
-rw-r--r--recipes-kernel/linux/linux-ti-staging_3.14.bb (renamed from recipes-kernel/linux/linux-ti-staging_3.15.bb)12
5 files changed, 5 insertions, 7 deletions
diff --git a/recipes-kernel/linux/linux-ti-staging-3.15/defconfig b/recipes-kernel/linux/linux-ti-staging-3.14/defconfig
index 926b35a5..926b35a5 100644
--- a/recipes-kernel/linux/linux-ti-staging-3.15/defconfig
+++ b/recipes-kernel/linux/linux-ti-staging-3.14/defconfig
diff --git a/recipes-kernel/linux/linux-ti-staging-3.15/ipc.cfg b/recipes-kernel/linux/linux-ti-staging-3.14/ipc.cfg
index 645dfdfa..645dfdfa 100644
--- a/recipes-kernel/linux/linux-ti-staging-3.15/ipc.cfg
+++ b/recipes-kernel/linux/linux-ti-staging-3.14/ipc.cfg
diff --git a/recipes-kernel/linux/linux-ti-staging-3.15/non-smp.cfg b/recipes-kernel/linux/linux-ti-staging-3.14/non-smp.cfg
index d61a4139..d61a4139 100644
--- a/recipes-kernel/linux/linux-ti-staging-3.15/non-smp.cfg
+++ b/recipes-kernel/linux/linux-ti-staging-3.14/non-smp.cfg
diff --git a/recipes-kernel/linux/linux-ti-staging-3.15/systest.cfg b/recipes-kernel/linux/linux-ti-staging-3.14/systest.cfg
index e21602f4..e21602f4 100644
--- a/recipes-kernel/linux/linux-ti-staging-3.15/systest.cfg
+++ b/recipes-kernel/linux/linux-ti-staging-3.14/systest.cfg
diff --git a/recipes-kernel/linux/linux-ti-staging_3.15.bb b/recipes-kernel/linux/linux-ti-staging_3.14.bb
index 64db8da7..a3045b24 100644
--- a/recipes-kernel/linux/linux-ti-staging_3.15.bb
+++ b/recipes-kernel/linux/linux-ti-staging_3.14.bb
@@ -3,15 +3,13 @@ DESCRIPTION = "Linux kernel for TI devices"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" 4LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
5 5
6DEFAULT_PREFERENCE = "-1"
7
8inherit kernel 6inherit kernel
9 7
10require recipes-kernel/linux/linux-dtb.inc 8require recipes-kernel/linux/linux-dtb.inc
11require recipes-kernel/linux/setup-defconfig.inc 9require recipes-kernel/linux/setup-defconfig.inc
12 10
13# Look in the generic major.minor directory for files 11# Look in the generic major.minor directory for files
14FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-3.15:" 12FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-3.14:"
15 13
16# Pull in the devicetree files into the rootfs 14# Pull in the devicetree files into the rootfs
17RDEPENDS_kernel-base += "kernel-devicetree" 15RDEPENDS_kernel-base += "kernel-devicetree"
@@ -39,13 +37,13 @@ COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"
39 37
40S = "${WORKDIR}/git" 38S = "${WORKDIR}/git"
41 39
42BRANCH = "ti-linux-3.15.y" 40BRANCH = "ti-linux-3.14.y"
43 41
44SRCREV = "3fd9aad17d3b4d1d7ee50ae788c0a096921e7216" 42SRCREV = "9d00dd1187099b0841125220c7432a3507e5b5fa"
45PV = "3.14+3.15-rc6" 43PV = "3.14.8"
46 44
47# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild 45# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
48MACHINE_KERNEL_PR_append = "b+gitr${SRCPV}" 46MACHINE_KERNEL_PR_append = "a+gitr${SRCPV}"
49PR = "${MACHINE_KERNEL_PR}" 47PR = "${MACHINE_KERNEL_PR}"
50 48
51KERNEL_CONFIG_DIR = "ti_config_fragments" 49KERNEL_CONFIG_DIR = "ti_config_fragments"