diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-09-22 13:18:48 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-22 15:52:12 -0700 |
commit | 66f9781874aff3ad7fcaeb413582b16df30aac27 (patch) | |
tree | 09bdde67dbab5e49a0513f1275eaa7178508e4d3 /meta/recipes-kernel | |
parent | 52eac3e68246f16e24a801155f1dcb8082b26b69 (diff) | |
download | poky-66f9781874aff3ad7fcaeb413582b16df30aac27.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)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
6 files changed, 6 insertions, 6 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 | ||
14 | SRCREV_machine ?= "af1b926c9160b0dbf2bbe41b166a8a7b07191fd2" | 14 | SRCREV_machine ?= "af1b926c9160b0dbf2bbe41b166a8a7b07191fd2" |
15 | SRCREV_meta ?= "9beb3a28736e7b00199641864a46ee4b8e2e6428" | 15 | SRCREV_meta ?= "634d8f2230d1fb0b9ad4af974509d25d36e5179c" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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-rt_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb index 5333e156cd..3e0e3dc40e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "6b38725fe97a59cefef01b5213a1d234dd38a542" | 14 | SRCREV_machine ?= "6b38725fe97a59cefef01b5213a1d234dd38a542" |
15 | SRCREV_meta ?= "73417203913023f9438ea196377a363233857172" | 15 | SRCREV_meta ?= "856794172e8f046e7d6542e09d431c5a412a8a45" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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.18;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;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" | |||
13 | KCONF_BSP_AUDIT_LEVEL = "2" | 13 | KCONF_BSP_AUDIT_LEVEL = "2" |
14 | 14 | ||
15 | SRCREV_machine ?= "74ecbeb03ebfc2b9a73a6554924b043b903295f5" | 15 | SRCREV_machine ?= "74ecbeb03ebfc2b9a73a6554924b043b903295f5" |
16 | SRCREV_meta ?= "9beb3a28736e7b00199641864a46ee4b8e2e6428" | 16 | SRCREV_meta ?= "634d8f2230d1fb0b9ad4af974509d25d36e5179c" |
17 | 17 | ||
18 | PV = "${LINUX_VERSION}+git${SRCPV}" | 18 | PV = "${LINUX_VERSION}+git${SRCPV}" |
19 | 19 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb index 704035f899..60ceef6db2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb | |||
@@ -14,7 +14,7 @@ KMETA = "kernel-meta" | |||
14 | KCONF_BSP_AUDIT_LEVEL = "2" | 14 | KCONF_BSP_AUDIT_LEVEL = "2" |
15 | 15 | ||
16 | SRCREV_machine ?= "71799edb8a38622626cf3b5582dff152b512ccf0" | 16 | SRCREV_machine ?= "71799edb8a38622626cf3b5582dff152b512ccf0" |
17 | SRCREV_meta ?= "73417203913023f9438ea196377a363233857172" | 17 | SRCREV_meta ?= "856794172e8f046e7d6542e09d431c5a412a8a45" |
18 | 18 | ||
19 | PV = "${LINUX_VERSION}+git${SRCPV}" | 19 | PV = "${LINUX_VERSION}+git${SRCPV}" |
20 | 20 | ||
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" | |||
19 | SRCREV_machine_qemux86-64 ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b" | 19 | SRCREV_machine_qemux86-64 ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b" |
20 | SRCREV_machine_qemumips64 ?= "44e1719a8f4fe10e88c13b9ec6c1fa1d041efaed" | 20 | SRCREV_machine_qemumips64 ?= "44e1719a8f4fe10e88c13b9ec6c1fa1d041efaed" |
21 | SRCREV_machine ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b" | 21 | SRCREV_machine ?= "084af9624d268ddf4fd65b2f9e8e50ca2f22e62b" |
22 | SRCREV_meta ?= "9beb3a28736e7b00199641864a46ee4b8e2e6428" | 22 | SRCREV_meta ?= "634d8f2230d1fb0b9ad4af974509d25d36e5179c" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_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}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.18.bb b/meta/recipes-kernel/linux/linux-yocto_4.18.bb index d6e3768d92..80c36d72e3 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.18.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.18.bb | |||
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "71799edb8a38622626cf3b5582dff152b512ccf0" | |||
19 | SRCREV_machine_qemux86-64 ?= "71799edb8a38622626cf3b5582dff152b512ccf0" | 19 | SRCREV_machine_qemux86-64 ?= "71799edb8a38622626cf3b5582dff152b512ccf0" |
20 | SRCREV_machine_qemumips64 ?= "f3add308bccafeeed79fde2a3720236bf4fd6457" | 20 | SRCREV_machine_qemumips64 ?= "f3add308bccafeeed79fde2a3720236bf4fd6457" |
21 | SRCREV_machine ?= "71799edb8a38622626cf3b5582dff152b512ccf0" | 21 | SRCREV_machine ?= "71799edb8a38622626cf3b5582dff152b512ccf0" |
22 | SRCREV_meta ?= "73417203913023f9438ea196377a363233857172" | 22 | SRCREV_meta ?= "856794172e8f046e7d6542e09d431c5a412a8a45" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_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.18;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}" |