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 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 2 +- 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 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 \ 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}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb index 1ed9d00b16..b6b2e5a9b6 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" KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "9d0a4947dc7117e393dc3b8c07246d26e22ecdec" -SRCREV_machine_qemuarm64 ?= "302ca233332fd364ecd028a0cf21b4cdc045e056" -SRCREV_machine_qemumips ?= "9c6fdae47597756042a1d4ed613dff96e430e8e9" -SRCREV_machine_qemuppc ?= "14679c588669b4b78b329c5858b7aea1791eb451" -SRCREV_machine_qemux86 ?= "550f5379bc4b001f656e7c98165606e543d0858c" -SRCREV_machine_qemux86-64 ?= "302ca233332fd364ecd028a0cf21b4cdc045e056" -SRCREV_machine_qemumips64 ?= "9b203f1aff41f7b713ec973cdcc7d016db4ffc26" -SRCREV_machine ?= "302ca233332fd364ecd028a0cf21b4cdc045e056" +SRCREV_machine_qemuarm ?= "4817747912b5c50ce5c31ef25658340ca615e1b4" +SRCREV_machine_qemuarm64 ?= "578602a722dbfb260801f3b37c6eafd2abb2340d" +SRCREV_machine_qemumips ?= "6ed76ec26b120f65f8547c8612b7334bd2745ec9" +SRCREV_machine_qemuppc ?= "a86ade84b2e142c0fd7536d96477107b6d07db5c" +SRCREV_machine_qemux86 ?= "af1f7f586bd32d39c057f17606991b887eadb389" +SRCREV_machine_qemux86-64 ?= "578602a722dbfb260801f3b37c6eafd2abb2340d" +SRCREV_machine_qemumips64 ?= "a63d40b860a6d255005a541894d53729090b40ea" +SRCREV_machine ?= "578602a722dbfb260801f3b37c6eafd2abb2340d" SRCREV_meta ?= "3a09b38a9f5015c56d99d17aa7c2f200c566249b" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;branch=${KBRANCH};name=machine; \ -- cgit 1.2.3-korg