summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-02-20 09:25:48 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-20 14:56:11 +0000
commit68512b7416d58c2498b2317f85f85b7045f902c4 (patch)
treeedd524f2ac4b5025264873f6172047b7a2fdb7dd
parentdf78c6a5af38e9e6f3888ca60a565edc4a3006eb (diff)
downloadpoky-68512b7416d58c2498b2317f85f85b7045f902c4.tar.gz
linux-yocto/4.12: fix qemuarm64 boot failure
The -stable update to 4.12 needs one more commit to fix the boot of qemuarm64. This will be part of the next 4.12 -stable series, but for now, we merge the patch directly. 40146055677a mm/sparsemem: Fix ARM64 boot crash when CONFIG_SPARSEMEM_EXTREME=y (From OE-Core rev: 4911e9c539b98bde0246ea4f8dc823c50951195e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.12.bb16
3 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
index b182173733..e6a45fd663 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
@@ -11,7 +11,7 @@ python () {
11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "8bade20d734f0b5e6ed13414b96cecaabe0c8039" 14SRCREV_machine ?= "33aa1a4ea44399f12dfb26146ea06db5cd02ca69"
15SRCREV_meta ?= "19d815d5a34bfaad95d87cc097cef18b594daac8" 15SRCREV_meta ?= "19d815d5a34bfaad95d87cc097cef18b594daac8"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
index f1a9c1d9fd..3ff2e1ce19 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.12.20"
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "1c4ad569af3e23a77994235435040e322908687f" 12SRCREV_machine ?= "40146055677a69730b2c36da1c8c1b4e9bae7bb0"
13SRCREV_meta ?= "19d815d5a34bfaad95d87cc097cef18b594daac8" 13SRCREV_meta ?= "19d815d5a34bfaad95d87cc097cef18b594daac8"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb
index 3916c6c39d..b10b82b771 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.12.bb
@@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/base"
11KBRANCH_qemux86-64 ?= "standard/base" 11KBRANCH_qemux86-64 ?= "standard/base"
12KBRANCH_qemumips64 ?= "standard/mti-malta64" 12KBRANCH_qemumips64 ?= "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "9728502c1fc96a1348ff06e1be8df75bee168032" 14SRCREV_machine_qemuarm ?= "6e5a99db3a495e023041a30d43262047795e645a"
15SRCREV_machine_qemuarm64 ?= "1c4ad569af3e23a77994235435040e322908687f" 15SRCREV_machine_qemuarm64 ?= "40146055677a69730b2c36da1c8c1b4e9bae7bb0"
16SRCREV_machine_qemumips ?= "b04e654320e56fa42e477698dbf61d99f0bb4501" 16SRCREV_machine_qemumips ?= "43dc47f90007d54c7086cc03b28e946e30135f1c"
17SRCREV_machine_qemuppc ?= "1c4ad569af3e23a77994235435040e322908687f" 17SRCREV_machine_qemuppc ?= "40146055677a69730b2c36da1c8c1b4e9bae7bb0"
18SRCREV_machine_qemux86 ?= "1c4ad569af3e23a77994235435040e322908687f" 18SRCREV_machine_qemux86 ?= "40146055677a69730b2c36da1c8c1b4e9bae7bb0"
19SRCREV_machine_qemux86-64 ?= "1c4ad569af3e23a77994235435040e322908687f" 19SRCREV_machine_qemux86-64 ?= "40146055677a69730b2c36da1c8c1b4e9bae7bb0"
20SRCREV_machine_qemumips64 ?= "7a297c3848d02c46acd40e3d2f285c7905f8134c" 20SRCREV_machine_qemumips64 ?= "69f0c96d8e47b0dccfb374809d729f0042c77868"
21SRCREV_machine ?= "1c4ad569af3e23a77994235435040e322908687f" 21SRCREV_machine ?= "40146055677a69730b2c36da1c8c1b4e9bae7bb0"
22SRCREV_meta ?= "19d815d5a34bfaad95d87cc097cef18b594daac8" 22SRCREV_meta ?= "19d815d5a34bfaad95d87cc097cef18b594daac8"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \