summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2014-02-17 10:26:36 -0500
committerDenys Dmytriyenko <denys@ti.com>2014-02-17 10:26:36 -0500
commit800105c4c27f2bb7febc596cafae1071fabc4c83 (patch)
treeef4631df16c81508da936c2d36b30f93cf2d17ab
parent5b56c0ce9026857db8cdaef0f0d0b89065cfe98a (diff)
downloadmeta-ti-800105c4c27f2bb7febc596cafae1071fabc4c83.tar.gz
linux-ti-staging: drop SMP-disabling patch that breaks suspend/resume
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r--recipes-kernel/linux/linux-ti-staging_3.12.bb6
1 files changed, 1 insertions, 5 deletions
diff --git a/recipes-kernel/linux/linux-ti-staging_3.12.bb b/recipes-kernel/linux/linux-ti-staging_3.12.bb
index 220495a5..2561e12b 100644
--- a/recipes-kernel/linux/linux-ti-staging_3.12.bb
+++ b/recipes-kernel/linux/linux-ti-staging_3.12.bb
@@ -40,7 +40,7 @@ SRCREV = "9d5b470605a6e5df5c46444c2b2c108d21f9a24a"
40PV = "3.12.10" 40PV = "3.12.10"
41 41
42# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild 42# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
43MACHINE_KERNEL_PR_append = "e+gitr${SRCPV}" 43MACHINE_KERNEL_PR_append = "f+gitr${SRCPV}"
44PR = "${MACHINE_KERNEL_PR}" 44PR = "${MACHINE_KERNEL_PR}"
45 45
46SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \ 46SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \
@@ -51,11 +51,7 @@ SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;bra
51SRC_URI += "file://0001-ARM-config-omap-Sync-up-omap2plus-defconfig-with-sav.patch \ 51SRC_URI += "file://0001-ARM-config-omap-Sync-up-omap2plus-defconfig-with-sav.patch \
52 file://0002-ARM-config-omap-Make-advanced-networking-features-as.patch \ 52 file://0002-ARM-config-omap-Make-advanced-networking-features-as.patch \
53 file://0003-ARM-config-omap-Disable-extra-debug-options.patch \ 53 file://0003-ARM-config-omap-Disable-extra-debug-options.patch \
54 file://0005-ARM-OMAP-Kill-warning-in-CPUIDLE-code-with-CONFIG_SM.patch \
55 " 54 "
56SRC_URI_append_ti33x = "file://0004-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch"
57SRC_URI_append_ti43x = "file://0004-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch"
58
59# LCD resume fixes 55# LCD resume fixes
60SRC_URI += "file://0001-ARM-OMAP2-am43xx-Use-omap4-prm-context-ops.patch \ 56SRC_URI += "file://0001-ARM-OMAP2-am43xx-Use-omap4-prm-context-ops.patch \
61 file://0002-ARM-OMAP2-omap_hwmod-Add-context-ops-to-am43xx-soc_ops.patch \ 57 file://0002-ARM-OMAP2-omap_hwmod-Add-context-ops-to-am43xx-soc_ops.patch \