[PATCH] linux-ti-staging: rebase patch to disable SMP to apply cleanly

[PATCH] linux-ti-staging: rebase patch to disable SMP to apply cleanly

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

No PR bump is needed.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 ...Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch} | 10 +++++-----
 recipes-kernel/linux/linux-ti-staging_3.12.bb                  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename recipes-kernel/linux/linux-ti-staging/{0005-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch => 0001-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch} (87%)

diff --git a/recipes-kernel/linux/linux-ti-staging/0005-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch b/recipes-kernel/linux/linux-ti-staging/0001-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch
similarity index 87%
rename from recipes-kernel/linux/linux-ti-staging/0005-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch
rename to recipes-kernel/linux/linux-ti-staging/0001-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch
index 8e016b4..a389e5c 100644
--- a/recipes-kernel/linux/linux-ti-staging/0005-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch
+++ b/recipes-kernel/linux/linux-ti-staging/0001-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch
@@ -1,7 +1,7 @@
-From 2f6cbe000b1d31c91eee0248f24b0c306aadeb63 Mon Sep 17 00:00:00 2001
+From bd9c0b09db8798815cb577f82beebf7e6c03edcd Mon Sep 17 00:00:00 2001
 From: Santosh Shilimkar <santosh.shilimkar@ti.com>
 Date: Thu, 13 Feb 2014 08:52:41 -0500
-Subject: [PATCH 2/2] Not-for-merge: ARM: config: omap: Disable SMP for AM335x
+Subject: [PATCH] Not-for-merge: ARM: config: omap: Disable SMP for AM335x
  build
 
 SMP and SMP_ON_UP introduces some extra barriers and code many fast paths
@@ -28,7 +28,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
  1 file changed, 2 deletions(-)
 
 diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
-index a34b45a..bb6beb2 100644
+index ff579a7..25217e3 100644
 --- a/arch/arm/configs/omap2plus_defconfig
 +++ b/arch/arm/configs/omap2plus_defconfig
 @@ -36,8 +36,6 @@ CONFIG_OMAP4_ERRATA_I688=y
@@ -37,9 +37,9 @@ index a34b45a..bb6beb2 100644
  CONFIG_PCIE_DRA7XX=y
 -CONFIG_SMP=y
 -CONFIG_NR_CPUS=2
- CONFIG_PREEMPT_VOLUNTARY=y
  CONFIG_CMA=y
- CONFIG_ZBOOT_ROM_TEXT=0x0
+ CONFIG_PREEMPT_VOLUNTARY=y
+ CONFIG_LEDS=y
 -- 
 1.8.3.2
 
diff --git a/recipes-kernel/linux/linux-ti-staging_3.12.bb b/recipes-kernel/linux/linux-ti-staging_3.12.bb
index 7982c0d..1b97ab2 100644
--- a/recipes-kernel/linux/linux-ti-staging_3.12.bb
+++ b/recipes-kernel/linux/linux-ti-staging_3.12.bb
@@ -48,5 +48,5 @@ SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;bra
           "
 
 # Disable SMP in defconfig on single-core platforms to reduce overhead
-SRC_URI_append_ti33x = "file://0005-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch"
-SRC_URI_append_ti43x = "file://0005-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch"
+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.8.3.2