From af67a2938e007e08fd1d082a0932c78deaedb527 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 18 Dec 2014 16:51:15 +0800 Subject: linux-yocto: Fixup linux-yocto for aarch64 linux-yocto is updated to pass the sysroot path to the compiler when necessary. linux-yocto_ver.bb are updated to reference the correct linux-yocto branchs and SRCREVs. Signed-off-by: Mark Hatle Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/linux/linux-yocto.inc | 2 ++ meta/recipes-kernel/linux/linux-yocto_3.14.bb | 4 +++- meta/recipes-kernel/linux/linux-yocto_3.17.bb | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 90189857c6..7416af99f5 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -8,6 +8,8 @@ INC_PR = "r4" DEPENDS += "xz-native bc-native" DEPENDS_append_aarch64 = " libgcc" +KERNEL_CC_append_aarch64 = " ${TOOLCHAIN_OPTIONS}" +KERNEL_LD_append_aarch64 = " ${TOOLCHAIN_OPTIONS}" # A KMACHINE is the mapping of a yocto $MACHINE to what is built # by the kernel. This is typically the branch that should be built, diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb index 706cb7ce9c..5f0a09e973 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb @@ -4,6 +4,7 @@ require recipes-kernel/linux/linux-yocto.inc # board specific branches KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "standard/qemuarm64" KBRANCH_qemumips ?= "standard/mti-malta32" KBRANCH_qemuppc ?= "standard/qemuppc" KBRANCH_qemux86 ?= "standard/common-pc/base" @@ -11,6 +12,7 @@ KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" SRCREV_machine_qemuarm ?= "6166316d47b859aa38bfecc61f4808828af03937" +SRCREV_machine_qemuarm64 ?= "902f34d36102a4b2008b776ecae686f80d307e12" SRCREV_machine_qemumips ?= "4ececcc09c6550a0896728163907e729d817c2fd" SRCREV_machine_qemuppc ?= "1cc5b09f8bb7f40b289d149d370c62dcc8109501" SRCREV_machine_qemux86 ?= "38cd560d5022ed2dbd1ab0dca9642e47c98a0aa1" @@ -27,7 +29,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "meta" -COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" +COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.17.bb b/meta/recipes-kernel/linux/linux-yocto_3.17.bb index 71a82a7223..973d8aaa84 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.17.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.17.bb @@ -4,6 +4,7 @@ require recipes-kernel/linux/linux-yocto.inc # board specific branches KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "standard/qemuarm64" KBRANCH_qemumips ?= "standard/mti-malta32" KBRANCH_qemuppc ?= "standard/qemuppc" KBRANCH_qemux86 ?= "standard/common-pc" @@ -11,6 +12,7 @@ KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" SRCREV_machine_qemuarm ?= "a1183153c56ace9f9140c73ce730ec181f78dc0f" +SRCREV_machine_qemuarm64 ?= "268b7677421eef003a84f31c6bd0b8ec3acc1e36" SRCREV_machine_qemumips ?= "18c8db2009f25524a29a5258d041e0442c10817d" SRCREV_machine_qemuppc ?= "6d2bbdac0e6560542fa2252d91eee9ae0f17f9c7" SRCREV_machine_qemux86 ?= "5ff54d8fbf74278e9e5074cbba516a14f0915ff7" @@ -27,7 +29,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "meta" -COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" +COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -- cgit 1.2.3-korg