summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-04-02 14:37:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-10 17:35:16 +0100
commitc3a0496b0ac3f89bcc4c4c5dc96b80fa5377d6af (patch)
tree8ce77f276402f22671340b721309947bc6399e31 /meta
parent1ac45f78d9a1315f7c687b0444c381a1f67e6819 (diff)
downloadpoky-c3a0496b0ac3f89bcc4c4c5dc96b80fa5377d6af.tar.gz
linux-yocto/3.14: intel configuration fixes
Importing the intel configuration fixes from Darren Hart: a82ccc635e7a meta: Purge retired BSPs chiefriver, sys940x, and atom-pc b50ba1e37c26 x86: Drop X86_32 configs 8aa0a946f528 x86: Move MTRR config into x86 common fragments ddae217aefee common-pc: Remove SMP from common-pc*-cpu fragments f3ad83aa4c39 x86: Consolidate common x86* CPU features (From OE-Core rev: 399d3d51f35fd8782367e82c7b6e641f32396f80) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.14.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
index 2e142bfd90..2a1e20429d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.14"
9KMETA = "meta" 9KMETA = "meta"
10 10
11SRCREV_machine ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 11SRCREV_machine ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
12SRCREV_meta ?= "fc8c30398dbc3cdea787a1042242d4aab689d0ae" 12SRCREV_meta ?= "8f55bee2403176a50cc0dd41811aa60fcf07243c"
13 13
14PV = "${LINUX_VERSION}+git${SRCPV}" 14PV = "${LINUX_VERSION}+git${SRCPV}"
15 15
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index 46c42601fe..b275f2738d 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
@@ -17,7 +17,7 @@ SRCREV_machine_qemux86 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
17SRCREV_machine_qemux86-64 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 17SRCREV_machine_qemux86-64 ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
18SRCREV_machine_qemumips64 ?= "ccb2a788551a7951563ac44a27175c6f28501008" 18SRCREV_machine_qemumips64 ?= "ccb2a788551a7951563ac44a27175c6f28501008"
19SRCREV_machine ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" 19SRCREV_machine ?= "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
20SRCREV_meta ?= "fc8c30398dbc3cdea787a1042242d4aab689d0ae" 20SRCREV_meta ?= "8f55bee2403176a50cc0dd41811aa60fcf07243c"
21 21
22SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 22SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
23 23