From a31c715fe484af7fe582d8becac0f20a33acac42 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 8 Sep 2015 09:44:45 -0400 Subject: linux-yocto/3.14: fix edgerouter (octeon) build Upating the SRCREVs to import the following commit: Author: Kevin Hao Date: Mon Aug 31 19:34:48 2015 +0800 mips: octeon: use ll/sc for the atomic ops for all the predecessor of octeon2 Even the octeon plus has the support of the 'saa' instruction, but we don't have a way to distinguish between octeon and octeon plus at compile time and pass "-march=octeon" to all the predecessor of octeon2. So it will cause the following error when trying to assemble the "saa" instruction with option "-march=octeon": {standard input}: Assembler messages: {standard input}:360: Error: Unrecognized opcode `saa $2,($4)' scripts/Makefile.build:308: recipe for target 'arch/mips/cavium-octeon/executive/cvmx-lap.o' failed Forcing to use the "ll/sc" for the atomic ops for all the predecessor of octeon2 to fix this issue. Signed-off-by: Kevin Hao Signed-off-by: Bruce Ashfield Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb') 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 d59f06b81c..4d3d5c88df 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" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "302ca233332fd364ecd028a0cf21b4cdc045e056" -SRCREV_machine_qemuppc ?= "e4847afbb42583fa05e6a94c8d0c8f8e37ed5622" +SRCREV_machine ?= "8281915527ba8d79e59906c02f28e7aa11424723" +SRCREV_machine_qemuppc ?= "5e7d372ebc327f28656fc972fab55605eea8aec3" SRCREV_meta ?= "3a09b38a9f5015c56d99d17aa7c2f200c566249b" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;branch=${KBRANCH};name=machine \ -- cgit 1.2.3-korg