summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-07-15 00:12:05 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-18 21:24:30 +0100
commitf7f9f1673e780e70890b3d5c9a5da8bd4eeb1e6c (patch)
tree2d6322224e5e885c876af8dbd9d965ade992cb00
parentd0947c91955996ea25900e49303f298cd900b188 (diff)
downloadpoky-f7f9f1673e780e70890b3d5c9a5da8bd4eeb1e6c.tar.gz
linux-yocto/3.4: mips: fix gcc 4.8 compilation
Updating the SRCREVs to enable the following fix for gcc 4.8 mips compilation: Author: Steven J. Hill <sjhill@mips.com> Date: Fri Jul 6 21:56:01 2012 +0200 MIPS: Refactor 'clear_page' and 'copy_page' functions. Remove usage of the '__attribute__((alias("...")))' hack that aliased to integer arrays containing micro-assembled instructions. This hack breaks when building a microMIPS kernel. It also makes the code much easier to understand. [ralf@linux-mips.org: Added back export of the clear_page and copy_page symbols so certain modules will work again. Also fixed build with CONFIG_SIBYTE_DMA_PAGEOPS enabled.] Signed-off-by: Steven J. Hill <sjhill@mips.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/3866/ Acked-by: David Daney <david.daney@cavium.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> (cherry picked from commit c022630633624a75b3b58f43dd3c6cc896a56cff) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> (From OE-Core rev: 5cd0d0f0e19b53a002feb91ba0cde9ea7ec19f29) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb12
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index 5e50cde184..ec5320685d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -8,8 +8,8 @@ LINUX_KERNEL_TYPE = "preempt-rt"
8 8
9KMETA = "meta" 9KMETA = "meta"
10 10
11SRCREV_machine ?= "1a7a6b495dd6f68e3e2a8a716ceabd283da7f480" 11SRCREV_machine ?= "516cc41b2f9a93d77fe6713bb6dfec20aa24f5ce"
12SRCREV_machine_qemuppc ?= "0ce0666df1e29a74ccfd65bbcf8286b2e632cc3f" 12SRCREV_machine_qemuppc ?= "a96230572ba5bc05decb7bcaa81b02e972d6841b"
13SRCREV_meta ?= "7250de4d4afc2558082cd42b8a0d151903436e8f" 13SRCREV_meta ?= "7250de4d4afc2558082cd42b8a0d151903436e8f"
14 14
15PR = "${INC_PR}.1" 15PR = "${INC_PR}.1"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
index a61fe7010b..18c469cd67 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
@@ -12,7 +12,7 @@ LINUX_VERSION ?= "3.4.52"
12 12
13KMETA = "meta" 13KMETA = "meta"
14 14
15SRCREV_machine ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d" 15SRCREV_machine ?= "4122d6cf3f9e1fd6d54f6e13af29c4c589289fdc"
16SRCREV_meta ?= "7250de4d4afc2558082cd42b8a0d151903436e8f" 16SRCREV_meta ?= "7250de4d4afc2558082cd42b8a0d151903436e8f"
17 17
18PR = "${INC_PR}.1" 18PR = "${INC_PR}.1"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index beb67ee49c..8db015ad01 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -3,12 +3,12 @@ require recipes-kernel/linux/linux-yocto.inc
3KBRANCH_DEFAULT = "standard/base" 3KBRANCH_DEFAULT = "standard/base"
4KBRANCH = "${KBRANCH_DEFAULT}" 4KBRANCH = "${KBRANCH_DEFAULT}"
5 5
6SRCREV_machine_qemuarm ?= "89c1e24271fba1c235959cb96c91dba98c542821" 6SRCREV_machine_qemuarm ?= "a3bd53305c7dcd11a2683fbe5d830d44236f4cd4"
7SRCREV_machine_qemumips ?= "99e87eb8b1e985eb6addf7590c4e837ff7c7e873" 7SRCREV_machine_qemumips ?= "e142ba98038a697e3a96b8f30a16e93602eff3c7"
8SRCREV_machine_qemuppc ?= "62f5c50609c93c5b70736a4374cee8075ab82566" 8SRCREV_machine_qemuppc ?= "290c3dd687145104d4e3f0e7732669c1c42b19fe"
9SRCREV_machine_qemux86 ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d" 9SRCREV_machine_qemux86 ?= "4122d6cf3f9e1fd6d54f6e13af29c4c589289fdc"
10SRCREV_machine_qemux86-64 ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d" 10SRCREV_machine_qemux86-64 ?= "4122d6cf3f9e1fd6d54f6e13af29c4c589289fdc"
11SRCREV_machine ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d" 11SRCREV_machine ?= "4122d6cf3f9e1fd6d54f6e13af29c4c589289fdc"
12SRCREV_meta ?= "7250de4d4afc2558082cd42b8a0d151903436e8f" 12SRCREV_meta ?= "7250de4d4afc2558082cd42b8a0d151903436e8f"
13 13
14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"