summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-12-18 16:51:15 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-23 10:18:19 +0000
commiteef1d41751f691158376cd49955b956c28fec2f2 (patch)
tree1950a93dc92dbc2825b8869dfeb4b728477311f7 /meta/recipes-kernel
parenteba9c1be73a8c1567795b2073fa850537336c7f6 (diff)
downloadpoky-eef1d41751f691158376cd49955b956c28fec2f2.tar.gz
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. (From OE-Core rev: af67a2938e007e08fd1d082a0932c78deaedb527) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto.inc2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.14.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.17.bb4
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"
8 8
9DEPENDS += "xz-native bc-native" 9DEPENDS += "xz-native bc-native"
10DEPENDS_append_aarch64 = " libgcc" 10DEPENDS_append_aarch64 = " libgcc"
11KERNEL_CC_append_aarch64 = " ${TOOLCHAIN_OPTIONS}"
12KERNEL_LD_append_aarch64 = " ${TOOLCHAIN_OPTIONS}"
11 13
12# A KMACHINE is the mapping of a yocto $MACHINE to what is built 14# A KMACHINE is the mapping of a yocto $MACHINE to what is built
13# by the kernel. This is typically the branch that should be built, 15# 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
4 4
5# board specific branches 5# board specific branches
6KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" 6KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs"
7KBRANCH_qemuarm64 ?= "standard/qemuarm64"
7KBRANCH_qemumips ?= "standard/mti-malta32" 8KBRANCH_qemumips ?= "standard/mti-malta32"
8KBRANCH_qemuppc ?= "standard/qemuppc" 9KBRANCH_qemuppc ?= "standard/qemuppc"
9KBRANCH_qemux86 ?= "standard/common-pc/base" 10KBRANCH_qemux86 ?= "standard/common-pc/base"
@@ -11,6 +12,7 @@ KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
11KBRANCH_qemumips64 ?= "standard/mti-malta64" 12KBRANCH_qemumips64 ?= "standard/mti-malta64"
12 13
13SRCREV_machine_qemuarm ?= "6166316d47b859aa38bfecc61f4808828af03937" 14SRCREV_machine_qemuarm ?= "6166316d47b859aa38bfecc61f4808828af03937"
15SRCREV_machine_qemuarm64 ?= "902f34d36102a4b2008b776ecae686f80d307e12"
14SRCREV_machine_qemumips ?= "4ececcc09c6550a0896728163907e729d817c2fd" 16SRCREV_machine_qemumips ?= "4ececcc09c6550a0896728163907e729d817c2fd"
15SRCREV_machine_qemuppc ?= "1cc5b09f8bb7f40b289d149d370c62dcc8109501" 17SRCREV_machine_qemuppc ?= "1cc5b09f8bb7f40b289d149d370c62dcc8109501"
16SRCREV_machine_qemux86 ?= "38cd560d5022ed2dbd1ab0dca9642e47c98a0aa1" 18SRCREV_machine_qemux86 ?= "38cd560d5022ed2dbd1ab0dca9642e47c98a0aa1"
@@ -27,7 +29,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
27 29
28KMETA = "meta" 30KMETA = "meta"
29 31
30COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" 32COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
31 33
32# Functionality flags 34# Functionality flags
33KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" 35KERNEL_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
4 4
5# board specific branches 5# board specific branches
6KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" 6KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs"
7KBRANCH_qemuarm64 ?= "standard/qemuarm64"
7KBRANCH_qemumips ?= "standard/mti-malta32" 8KBRANCH_qemumips ?= "standard/mti-malta32"
8KBRANCH_qemuppc ?= "standard/qemuppc" 9KBRANCH_qemuppc ?= "standard/qemuppc"
9KBRANCH_qemux86 ?= "standard/common-pc" 10KBRANCH_qemux86 ?= "standard/common-pc"
@@ -11,6 +12,7 @@ KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
11KBRANCH_qemumips64 ?= "standard/mti-malta64" 12KBRANCH_qemumips64 ?= "standard/mti-malta64"
12 13
13SRCREV_machine_qemuarm ?= "a1183153c56ace9f9140c73ce730ec181f78dc0f" 14SRCREV_machine_qemuarm ?= "a1183153c56ace9f9140c73ce730ec181f78dc0f"
15SRCREV_machine_qemuarm64 ?= "268b7677421eef003a84f31c6bd0b8ec3acc1e36"
14SRCREV_machine_qemumips ?= "18c8db2009f25524a29a5258d041e0442c10817d" 16SRCREV_machine_qemumips ?= "18c8db2009f25524a29a5258d041e0442c10817d"
15SRCREV_machine_qemuppc ?= "6d2bbdac0e6560542fa2252d91eee9ae0f17f9c7" 17SRCREV_machine_qemuppc ?= "6d2bbdac0e6560542fa2252d91eee9ae0f17f9c7"
16SRCREV_machine_qemux86 ?= "5ff54d8fbf74278e9e5074cbba516a14f0915ff7" 18SRCREV_machine_qemux86 ?= "5ff54d8fbf74278e9e5074cbba516a14f0915ff7"
@@ -27,7 +29,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
27 29
28KMETA = "meta" 30KMETA = "meta"
29 31
30COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" 32COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
31 33
32# Functionality flags 34# Functionality flags
33KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" 35KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"