summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2019-03-21 00:50:52 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-24 17:00:52 +0000
commit50ce8c47e551d356cef8ea376776a339efae3a91 (patch)
tree1bb87e0f5facf163c72824e31dc4d351d190f2f4
parentb32c0ba7c9969189c824d2c7dc72af466786a19e (diff)
downloadpoky-50ce8c47e551d356cef8ea376776a339efae3a91.tar.gz
linux-yocto: fix wrongfully used qemuarma15 in place of qemuarmv5
Commit 6fc70eb4f3494bee2be10ee24fe3ea1c8b5ff988 changes "qemuarm" machine from old ARMv5 to a newer Cortex-A15, moving the old platform under "qemuarmv5" name. When adding this new "old" platform name to COMPATIBLE_MACHINE in linux-yocto recipes, mistakes were made referring it by "qemuarma15", as discussed in [1]. This change fixes those mistakes. [1]http://lists.openembedded.org/pipermail/openembedded-core/2019-March/280292.html (From OE-Core rev: 4babf396a91ba375fad9c4dc610cfbdef8d17d4f) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.19.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
index 36761b9943..c3f9d5facd 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
@@ -31,7 +31,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
31 31
32LINUX_KERNEL_TYPE = "preempt-rt" 32LINUX_KERNEL_TYPE = "preempt-rt"
33 33
34COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarma15|qemuarm64|qemuppc|qemumips)" 34COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)"
35 35
36KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" 36KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
37 37
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
index 52dbabd7a4..2d85817bdd 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
@@ -24,7 +24,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}"
26 26
27COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarma15" 27COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5"
28 28
29# Functionality flags 29# Functionality flags
30KERNEL_FEATURES = "" 30KERNEL_FEATURES = ""
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
index aca9f15404..340e950f63 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
@@ -38,7 +38,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
38 38
39KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" 39KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
40 40
41COMPATIBLE_MACHINE = "qemuarm|qemuarma15|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" 41COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
42 42
43# Functionality flags 43# Functionality flags
44KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" 44KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"