summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2015-09-05 02:07:03 +0000
committerDenys Dmytriyenko <denys@ti.com>2015-09-04 16:13:29 -0400
commit008e80c27f3103685a642dd0bbc9647aedb8e3f6 (patch)
treea97a69167e9221aecda21f051e334a0a14697b1e
parent5f1263e769223f0b26309867f05692142087ce11 (diff)
downloadmeta-ti-008e80c27f3103685a642dd0bbc9647aedb8e3f6.tar.gz
linux-ti-staging: SGX patches went into kernel, drop them locally
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r--recipes-kernel/linux/linux-ti-staging_4.1.bb17
1 files changed, 2 insertions, 15 deletions
diff --git a/recipes-kernel/linux/linux-ti-staging_4.1.bb b/recipes-kernel/linux/linux-ti-staging_4.1.bb
index 4ecab8ef..a423ca74 100644
--- a/recipes-kernel/linux/linux-ti-staging_4.1.bb
+++ b/recipes-kernel/linux/linux-ti-staging_4.1.bb
@@ -50,11 +50,11 @@ S = "${WORKDIR}/git"
50 50
51BRANCH = "ti-lsk-linux-4.1.y" 51BRANCH = "ti-lsk-linux-4.1.y"
52 52
53SRCREV = "1d476946dc0c881868ffd78cd2be30740ce0dea1" 53SRCREV = "3adfb503c87468c448ee30191511184fb0c65dd0"
54PV = "4.1.6+git${SRCPV}" 54PV = "4.1.6+git${SRCPV}"
55 55
56# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild 56# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
57MACHINE_KERNEL_PR_append = "g" 57MACHINE_KERNEL_PR_append = "h"
58PR = "${MACHINE_KERNEL_PR}" 58PR = "${MACHINE_KERNEL_PR}"
59 59
60KERNEL_CONFIG_DIR = "${S}/ti_config_fragments" 60KERNEL_CONFIG_DIR = "${S}/ti_config_fragments"
@@ -70,16 +70,3 @@ KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
70KERNEL_GIT_PROTOCOL = "git" 70KERNEL_GIT_PROTOCOL = "git"
71SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ 71SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
72 file://defconfig" 72 file://defconfig"
73
74GFX_PATCHES = "file://0005-arm-Export-cache-flush-management-symbols-when-MULTI.patch \
75 file://0006-ARM-dts-am33xx-add-DT-node-for-gpu.patch \
76 file://0007-ARM-dts-am437x-add-DT-node-for-gpu.patch \
77 file://0008-ARM-OMAP2-Use-pdata-quirks-for-sgx-deassert_hardrese.patch"
78
79SRC_URI_append_omap-a15 = " ${GFX_PATCHES} file://sgx.cfg"
80SRC_URI_append_ti33x = " ${GFX_PATCHES} file://sgx.cfg"
81SRC_URI_append_ti43x = " ${GFX_PATCHES} file://sgx.cfg"
82
83KERNEL_CONFIG_FRAGMENTS_append_omap-a15 = " ${WORKDIR}/sgx.cfg"
84KERNEL_CONFIG_FRAGMENTS_append_ti33x = " ${WORKDIR}/sgx.cfg"
85KERNEL_CONFIG_FRAGMENTS_append_ti43x = " ${WORKDIR}/sgx.cfg"