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-tiny_3.14.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb') 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 f65e0e0ed7..412c817ff5 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" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "302ca233332fd364ecd028a0cf21b4cdc045e056" +SRCREV_machine ?= "578602a722dbfb260801f3b37c6eafd2abb2340d" SRCREV_meta ?= "3a09b38a9f5015c56d99d17aa7c2f200c566249b" PV = "${LINUX_VERSION}+git${SRCPV}" -- cgit 1.2.3-korg