summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-09-22 13:18:48 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-16 16:33:09 +0000
commit33380465d7de22a2b03d5be2d94b6c153f73d4b3 (patch)
tree63df735350b9b9c9c4f83b4b8fe1bde967293bdf /meta
parente964083b2b0f8fd9679045d2a3dbf4e2da412c7b (diff)
downloadpoky-33380465d7de22a2b03d5be2d94b6c153f73d4b3.tar.gz
linux-yocto: configuration warning fixes
Integrating the following commits to address kernel configuration audit warnings: 856794172e8f features/intel-pinctrl: Fix conflict with configs 397b67321037 bsp/intel-x86: Rename CONFIG_R8723BE to CONFIG_RTL8723BE fca2a16483f2 features/thermal: Add dependency for kernel option b6110e2e8e55 features/tpm: fix conflict with configs and add dependency ee22bc1f8fcd features/mmc: modify dependency e50eb6bd929b features: drop the obsolete kernel option f5327047994f features/hostapd: drop obsolete configs 48b54e625876 bsp/intel-x86: Drop configs that has been removed by kernel (From OE-Core rev: a49c66844c8c3a87f8383085661ff59bfb045452) (From OE-Core rev: 73a4746a5d37ab4869b0eb17979dc9d8970f2ae3) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> [Dropped 4.18 changes] Signed-off-by: Armin Kuster <akuster808@gmail.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 350d907a4e..86ce03ca4c 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 ?= "af1b926c9160b0dbf2bbe41b166a8a7b07191fd2" 14SRCREV_machine ?= "af1b926c9160b0dbf2bbe41b166a8a7b07191fd2"
15SRCREV_meta ?= "9beb3a28736e7b00199641864a46ee4b8e2e6428" 15SRCREV_meta ?= "634d8f2230d1fb0b9ad4af974509d25d36e5179c"
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 393295846e..4c2c7f75dc 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 ?= "74ecbeb03ebfc2b9a73a6554924b043b903295f5" 15SRCREV_machine ?= "74ecbeb03ebfc2b9a73a6554924b043b903295f5"
16SRCREV_meta ?= "9beb3a28736e7b00199641864a46ee4b8e2e6428" 16SRCREV_meta ?= "634d8f2230d1fb0b9ad4af974509d25d36e5179c"
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 ff14979186..a289356c52 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 ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b"
19SRCREV_machine_qemux86-64 ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b" 19SRCREV_machine_qemux86-64 ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b"
20SRCREV_machine_qemumips64 ?= "44e1719a8f4fe10e88c13b9ec6c1fa1d041efaed" 20SRCREV_machine_qemumips64 ?= "44e1719a8f4fe10e88c13b9ec6c1fa1d041efaed"
21SRCREV_machine ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b" 21SRCREV_machine ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b"
22SRCREV_meta ?= "9beb3a28736e7b00199641864a46ee4b8e2e6428" 22SRCREV_meta ?= "634d8f2230d1fb0b9ad4af974509d25d36e5179c"
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}"