summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2017-08-31 10:21:21 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-02 00:52:09 +0100
commitea81d5983985419417f705c2b84b0e14a5e66f3c (patch)
treeae1656912a1c54ce616d48a71f2d6b6a1f016c1d
parenta7c38da138cd44a4beeec5da51ebbc879dcac379 (diff)
downloadpoky-ea81d5983985419417f705c2b84b0e14a5e66f3c.tar.gz
linux-yocto/4.12: silence qeumarma9 config warnings
When building the qemuarma9 BSP, we get the following warnings: ---------- CONFIG_VGA_CONSOLE ----------------- Config: CONFIG_VGA_CONSOLE From: tmp/work-shared/qemuarma9/kernel-source/.kernel-meta/configs/standard/arm-versatile-926ejs/bsp/qemuarma9/qemuarma9.cfg Requested value: # CONFIG_VGA_CONSOLE is not set Actual value: ---------- CONFIG_USB_ISP1760_HCD ----------------- Config: CONFIG_USB_ISP1760_HCD From: tmp/work-shared/qemuarma9/kernel-source/.kernel-meta/configs/standard/arm-versatile-926ejs/bsp/qemuarma9/qemuarma9.cfg Requested value: CONFIG_USB_ISP1760_HCD=y Actual value: Both of these options no longer need to be in the BSP fragments for qemuarma9, we fix them with these meta data changes: a2edeff915b9 qemuarma9: remove USB_ISP1760_HCD 5f76e8f64fa5 qemuarma9: drop VGA console disable (From OE-Core rev: b3abced7aadf9d51017b1d0c1ae44886649ff6a3) 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.bb2
3 files changed, 3 insertions, 3 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 1b1bf9f762..ffaa26d3d3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a" 14SRCREV_machine ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a"
15SRCREV_meta ?= "9acd7f92a1b3248310ec17407063f968732ad130" 15SRCREV_meta ?= "09bc15990cc56fefe4111b8c64530cf0c4755817"
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 \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}"
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 bdf660e6ce..56cd8ed29f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a" 12SRCREV_machine ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a"
13SRCREV_meta ?= "9acd7f92a1b3248310ec17407063f968732ad130" 13SRCREV_meta ?= "09bc15990cc56fefe4111b8c64530cf0c4755817"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb
index 964dbce3e7..6f806c2bec 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.12.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a"
19SRCREV_machine_qemux86-64 ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a" 19SRCREV_machine_qemux86-64 ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a"
20SRCREV_machine_qemumips64 ?= "b344c1888b03e40683ba109bb45b44e9cf4d1eb4" 20SRCREV_machine_qemumips64 ?= "b344c1888b03e40683ba109bb45b44e9cf4d1eb4"
21SRCREV_machine ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a" 21SRCREV_machine ?= "084d8ae2f349a7621e1e51c81b4494b123f3c09a"
22SRCREV_meta ?= "9acd7f92a1b3248310ec17407063f968732ad130" 22SRCREV_meta ?= "09bc15990cc56fefe4111b8c64530cf0c4755817"
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}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}"