summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-09-25 09:59:28 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-25 23:15:49 +0100
commite6704327568993170ae3be5880cbbc191fa1af99 (patch)
treef5403c548131c22f76f2ac27a9ba5b0edaebedf2 /meta
parent48ad67e485979d686bfa6c211b9cf21faf08e94c (diff)
downloadpoky-e6704327568993170ae3be5880cbbc191fa1af99.tar.gz
linux-yocto/4.14: fix beaglebone configuration warnings
Backporting the following fixes from 4.18 to 4.14 to remove beaglebone configuration warnings: 1fb0b0379fb5 beaglebone: Clean up the cfg file 4176e7ded8e1 beaglebone: Drop the needless unsetting of the kernel options 65c209da574d beaglebone: Drop the obsolete kernel options (From OE-Core rev: 2adec315b44dad0f99ad55e04b4e3b6608613147) Signed-off-by: Kevin Hao <kexin.hao@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.14.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb
index 24a2c59328..e6f42f29e6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "c37a14708f5b618602f84f83f902346e055824c3" 14SRCREV_machine ?= "c37a14708f5b618602f84f83f902346e055824c3"
15SRCREV_meta ?= "46a547fa5195c2990e513ae3050376b7670e8287" 15SRCREV_meta ?= "1fb0b0379fb5883ce5af7485374e3f78ee4272d3"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb
index de22031301..f599c90db2 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb
@@ -13,7 +13,7 @@ KMETA = "kernel-meta"
13KCONF_BSP_AUDIT_LEVEL = "2" 13KCONF_BSP_AUDIT_LEVEL = "2"
14 14
15SRCREV_machine ?= "3218be18094b7dfb4471b083c469452c8c7709ce" 15SRCREV_machine ?= "3218be18094b7dfb4471b083c469452c8c7709ce"
16SRCREV_meta ?= "46a547fa5195c2990e513ae3050376b7670e8287" 16SRCREV_meta ?= "1fb0b0379fb5883ce5af7485374e3f78ee4272d3"
17 17
18PV = "${LINUX_VERSION}+git${SRCPV}" 18PV = "${LINUX_VERSION}+git${SRCPV}"
19 19
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/meta/recipes-kernel/linux/linux-yocto_4.14.bb
index 7c97d53da1..40ee1e9fc4 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.14.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "78a16a4d8cfd58f91be412797aac248e811d083b"
19SRCREV_machine_qemux86-64 ?= "78a16a4d8cfd58f91be412797aac248e811d083b" 19SRCREV_machine_qemux86-64 ?= "78a16a4d8cfd58f91be412797aac248e811d083b"
20SRCREV_machine_qemumips64 ?= "f074d718736e95e8ed5460bf8e85c7e77ff7df87" 20SRCREV_machine_qemumips64 ?= "f074d718736e95e8ed5460bf8e85c7e77ff7df87"
21SRCREV_machine ?= "78a16a4d8cfd58f91be412797aac248e811d083b" 21SRCREV_machine ?= "78a16a4d8cfd58f91be412797aac248e811d083b"
22SRCREV_meta ?= "46a547fa5195c2990e513ae3050376b7670e8287" 22SRCREV_meta ?= "1fb0b0379fb5883ce5af7485374e3f78ee4272d3"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}"