diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-05-07 23:36:13 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-09 22:26:44 +0100 |
commit | 5929d94ab78988034868c7fcc9bcfe73df265690 (patch) | |
tree | 43694763f6fdc3bf6361b8ca79a6bb138012a251 | |
parent | c1267093c6ab90fa41295272a6368db72193cc72 (diff) | |
download | poky-5929d94ab78988034868c7fcc9bcfe73df265690.tar.gz |
linux-yocto/3.14: fix qemumips build error
Updating the SRCREVs to import the following fix:
mips: define cpu_has_saa in common features include
To avoid build failures such as the following on non-cavium
platforms:
| arch/mips/include/asm/atomic.h: In function 'atomic_add':
| arch/mips/include/asm/atomic.h:52:6: error: 'cpu_has_saa'
| undeclared (first use in this function)
| if (cpu_has_saa) {
| ^
We define a disabled cpu_has_saa unless the machine specific feature
overrides define a value.
(From OE-Core rev: b2f786ca319714bd41d6f9e7ba9efaa8a6d412ab)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.14.bb | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb index 23e1688dae..86b31738b6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb | |||
@@ -3,8 +3,8 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" | |||
3 | 3 | ||
4 | require recipes-kernel/linux/linux-yocto.inc | 4 | require recipes-kernel/linux/linux-yocto.inc |
5 | 5 | ||
6 | SRCREV_machine ?= "91dc6afcecd47c08e7e13e674d8d7e9dcede5aca" | 6 | SRCREV_machine ?= "0c641a6c0e38137364535b99e43657a0cbc07cd4" |
7 | SRCREV_machine_qemuppc ?= "2655b44cfe839f6f9ba15b061e1b4d386d5821f6" | 7 | SRCREV_machine_qemuppc ?= "cfc4e296efcaa84358c9ab1cdeee6ce7c378436f" |
8 | SRCREV_meta ?= "46df2668fa657162d11f96a6f1af138c562a03aa" | 8 | SRCREV_meta ?= "46df2668fa657162d11f96a6f1af138c562a03aa" |
9 | 9 | ||
10 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" | 10 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" |
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 1d99965061..d0b71c4859 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.36" | |||
9 | KMETA = "meta" | 9 | KMETA = "meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "2a2be8720802fae73fbdf1da37f61d7843332ba3" | 12 | SRCREV_machine ?= "b991a586470900e3de824f5ea75653aa2150594d" |
13 | SRCREV_meta ?= "46df2668fa657162d11f96a6f1af138c562a03aa" | 13 | SRCREV_meta ?= "46df2668fa657162d11f96a6f1af138c562a03aa" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb index fa433b61c8..d4ea55a239 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb | |||
@@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/common-pc/base" | |||
11 | KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" | 11 | KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "90f1033d72d422b4e4a8125f68cd1623d6788870" | 14 | SRCREV_machine_qemuarm ?= "e4f91293908648d495b4f9735768633569e39b9f" |
15 | SRCREV_machine_qemuarm64 ?= "2a2be8720802fae73fbdf1da37f61d7843332ba3" | 15 | SRCREV_machine_qemuarm64 ?= "b991a586470900e3de824f5ea75653aa2150594d" |
16 | SRCREV_machine_qemumips ?= "bc927927f774c9d12f6c4689dbfba9f5578d0b62" | 16 | SRCREV_machine_qemumips ?= "6623389731309b0ac591736d5b438de833f195c7" |
17 | SRCREV_machine_qemuppc ?= "e4dfdbf1a059e0edb1be677973f8e2c73e012c8a" | 17 | SRCREV_machine_qemuppc ?= "3217fbcd002914fba4914d2e61dabb378081fd25" |
18 | SRCREV_machine_qemux86 ?= "594bfbce3133d75d9aa569883bdeaed15eeadc8f" | 18 | SRCREV_machine_qemux86 ?= "8794bd6a473199b2baa7a405d44cdbfa5351b60b" |
19 | SRCREV_machine_qemux86-64 ?= "2a2be8720802fae73fbdf1da37f61d7843332ba3" | 19 | SRCREV_machine_qemux86-64 ?= "b991a586470900e3de824f5ea75653aa2150594d" |
20 | SRCREV_machine_qemumips64 ?= "ea8b5406c6ec027d0475146ac84f24eb34196b78" | 20 | SRCREV_machine_qemumips64 ?= "6649ef219b3bf6da1678547b9da376367520e80a" |
21 | SRCREV_machine ?= "2a2be8720802fae73fbdf1da37f61d7843332ba3" | 21 | SRCREV_machine ?= "b991a586470900e3de824f5ea75653aa2150594d" |
22 | SRCREV_meta ?= "46df2668fa657162d11f96a6f1af138c562a03aa" | 22 | SRCREV_meta ?= "46df2668fa657162d11f96a6f1af138c562a03aa" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" |