diff options
author | Denys Dmytriyenko <denys@ti.com> | 2014-02-27 14:07:18 -0500 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2014-02-27 14:08:36 -0500 |
commit | 3b596055fe6f5e6c7d4e885e114c121f1ecd0c42 (patch) | |
tree | 495535df87df864516178ed455b471031168f711 /recipes-kernel | |
parent | ada96f348cb134ad5c5726ea71c3b869ab6a7d2c (diff) | |
download | meta-ti-3b596055fe6f5e6c7d4e885e114c121f1ecd0c42.tar.gz |
linux-ti-staging: rebase patch to disable SMP to apply cleanly
No PR bump is needed.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-ti-staging/0001-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch (renamed from recipes-kernel/linux/linux-ti-staging/0005-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch) | 10 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-ti-staging_3.12.bb | 4 |
2 files changed, 7 insertions, 7 deletions
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 index 8e016b4b..a389e5c6 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 @@ | |||
1 | From 2f6cbe000b1d31c91eee0248f24b0c306aadeb63 Mon Sep 17 00:00:00 2001 | 1 | From bd9c0b09db8798815cb577f82beebf7e6c03edcd Mon Sep 17 00:00:00 2001 |
2 | From: Santosh Shilimkar <santosh.shilimkar@ti.com> | 2 | From: Santosh Shilimkar <santosh.shilimkar@ti.com> |
3 | Date: Thu, 13 Feb 2014 08:52:41 -0500 | 3 | Date: Thu, 13 Feb 2014 08:52:41 -0500 |
4 | Subject: [PATCH 2/2] Not-for-merge: ARM: config: omap: Disable SMP for AM335x | 4 | Subject: [PATCH] Not-for-merge: ARM: config: omap: Disable SMP for AM335x |
5 | build | 5 | build |
6 | 6 | ||
7 | SMP and SMP_ON_UP introduces some extra barriers and code many fast paths | 7 | 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> | |||
28 | 1 file changed, 2 deletions(-) | 28 | 1 file changed, 2 deletions(-) |
29 | 29 | ||
30 | diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig | 30 | diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig |
31 | index a34b45a..bb6beb2 100644 | 31 | index ff579a7..25217e3 100644 |
32 | --- a/arch/arm/configs/omap2plus_defconfig | 32 | --- a/arch/arm/configs/omap2plus_defconfig |
33 | +++ b/arch/arm/configs/omap2plus_defconfig | 33 | +++ b/arch/arm/configs/omap2plus_defconfig |
34 | @@ -36,8 +36,6 @@ CONFIG_OMAP4_ERRATA_I688=y | 34 | @@ -36,8 +36,6 @@ CONFIG_OMAP4_ERRATA_I688=y |
@@ -37,9 +37,9 @@ index a34b45a..bb6beb2 100644 | |||
37 | CONFIG_PCIE_DRA7XX=y | 37 | CONFIG_PCIE_DRA7XX=y |
38 | -CONFIG_SMP=y | 38 | -CONFIG_SMP=y |
39 | -CONFIG_NR_CPUS=2 | 39 | -CONFIG_NR_CPUS=2 |
40 | CONFIG_PREEMPT_VOLUNTARY=y | ||
41 | CONFIG_CMA=y | 40 | CONFIG_CMA=y |
42 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 41 | CONFIG_PREEMPT_VOLUNTARY=y |
42 | CONFIG_LEDS=y | ||
43 | -- | 43 | -- |
44 | 1.8.3.2 | 44 | 1.8.3.2 |
45 | 45 | ||
diff --git a/recipes-kernel/linux/linux-ti-staging_3.12.bb b/recipes-kernel/linux/linux-ti-staging_3.12.bb index 7982c0d3..1b97ab29 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 | |||
48 | " | 48 | " |
49 | 49 | ||
50 | # Disable SMP in defconfig on single-core platforms to reduce overhead | 50 | # Disable SMP in defconfig on single-core platforms to reduce overhead |
51 | SRC_URI_append_ti33x = "file://0005-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch" | 51 | SRC_URI_append_ti33x = "file://0001-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch" |
52 | SRC_URI_append_ti43x = "file://0005-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch" | 52 | SRC_URI_append_ti43x = "file://0001-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch" |