[meta-ti] [PATCH 4/4] linux-ti-staging: Add version 3.15 of TI integration kernel

[Chase Maupin]

* Add version 3.15 of the TI integration kernel.  Major changes
  from previous version are:
    * Config fragments now come primarily from the integration
      tree.  Removed baseport and connectivity fragments for now
      and the others can be removed as they are added to the
      integration tree.
    * Added a non-smp.cfg config to disable SMP for single core
      devices instead of using a patch to the defconfig file as
      we did in the past.

Signed-off-by: Chase Maupin <Chase.Maupin at ti.com>
---
 .../defconfig                                      |    0
 .../ipc.cfg                                        |    0
 .../linux/linux-ti-staging-3.15/non-smp.cfg        |    5 +++++
 .../systest.cfg                                    |    0
 ...ti-staging_3.12.bb => linux-ti-staging_3.15.bb} |   20 +++++++++-----------
 5 files changed, 14 insertions(+), 11 deletions(-)
 copy recipes-kernel/linux/{linux-mainline => linux-ti-staging-3.15}/defconfig (100%)
 copy recipes-kernel/linux/{linux-ti-staging-3.12 => linux-ti-staging-3.15}/ipc.cfg (100%)
 create mode 100644 recipes-kernel/linux/linux-ti-staging-3.15/non-smp.cfg
 copy recipes-kernel/linux/{linux-ti-staging-3.12 => linux-ti-staging-3.15}/systest.cfg (100%)
 copy recipes-kernel/linux/{linux-ti-staging_3.12.bb => linux-ti-staging_3.15.bb} (75%)

diff --git a/recipes-kernel/linux/linux-mainline/defconfig b/recipes-kernel/linux/linux-ti-staging-3.15/defconfig
similarity index 100%
copy from recipes-kernel/linux/linux-mainline/defconfig
copy to recipes-kernel/linux/linux-ti-staging-3.15/defconfig
diff --git a/recipes-kernel/linux/linux-ti-staging-3.12/ipc.cfg b/recipes-kernel/linux/linux-ti-staging-3.15/ipc.cfg
similarity index 100%
copy from recipes-kernel/linux/linux-ti-staging-3.12/ipc.cfg
copy to recipes-kernel/linux/linux-ti-staging-3.15/ipc.cfg
diff --git a/recipes-kernel/linux/linux-ti-staging-3.15/non-smp.cfg b/recipes-kernel/linux/linux-ti-staging-3.15/non-smp.cfg
new file mode 100644
index 0000000..d61a413
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti-staging-3.15/non-smp.cfg
@@ -0,0 +1,5 @@
+##################################################
+# Non-SMP config options
+##################################################
+CONFIG_SMP=n
+CONFIG_NR_CPUS=n
diff --git a/recipes-kernel/linux/linux-ti-staging-3.12/systest.cfg b/recipes-kernel/linux/linux-ti-staging-3.15/systest.cfg
similarity index 100%
copy from recipes-kernel/linux/linux-ti-staging-3.12/systest.cfg
copy to recipes-kernel/linux/linux-ti-staging-3.15/systest.cfg
diff --git a/recipes-kernel/linux/linux-ti-staging_3.12.bb b/recipes-kernel/linux/linux-ti-staging_3.15.bb
similarity index 75%
copy from recipes-kernel/linux/linux-ti-staging_3.12.bb
copy to recipes-kernel/linux/linux-ti-staging_3.15.bb
index d555b04..aa2828c 100644
--- a/recipes-kernel/linux/linux-ti-staging_3.12.bb
+++ b/recipes-kernel/linux/linux-ti-staging_3.15.bb
@@ -9,7 +9,7 @@ require recipes-kernel/linux/linux-dtb.inc
 require recipes-kernel/linux/setup-defconfig.inc
 
 # Look in the generic major.minor directory for files
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}-3.12:"
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}-3.15:"
 
 # Pull in the devicetree files into the rootfs
 RDEPENDS_kernel-base += "kernel-devicetree"
@@ -37,25 +37,23 @@ COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15"
 
 S = "${WORKDIR}/git"
 
-BRANCH = "ti-linux-3.12.y"
+BRANCH = "ti-linux-3.15.y"
 
 SRCREV = "f0d4672333685697320f4907d5b4d3919121c299"
-PV = "3.12.17"
+PV = "3.14+3.15-rc6"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-MACHINE_KERNEL_PR_append = "b+gitr${SRCPV}"
+MACHINE_KERNEL_PR_append = "c+gitr${SRCPV}"
 PR = "${MACHINE_KERNEL_PR}"
 
-KERNEL_CONFIG_FRAGMENTS = "baseport.cfg connectivity.cfg ipc.cfg"
+KERNEL_CONFIG_DIR = "arch/arm/configs/ti_config_fragments"
+KERNEL_CONFIG_FRAGMENTS = "ipc.cfg"
+KERNEL_CONFIG_FRAGMENTS_append_ti33x = "non-smp.cfg"
+KERNEL_CONFIG_FRAGMENTS_append_ti43x = "non-smp.cfg"
 
 SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \
            file://defconfig \
-           file://baseport.cfg \
-           file://connectivity.cfg \
            file://ipc.cfg \
            file://systest.cfg \
+           file://non-smp.cfg \
           "
-
-# Disable SMP in defconfig on single-core platforms to reduce overhead
-SRC_URI_append_ti33x = "file://0001-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch"
-SRC_URI_append_ti43x = "file://0001-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch"
-- 
1.7.9.5