diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-07-07 14:39:05 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:28:43 +0100 |
commit | 59d3fb6db0bcdc4edd63dc1d7e3da8e34535c488 (patch) | |
tree | db51a49de5c3ccc91198ac555f1f8df6e7634233 | |
parent | 92469ae0e3d47a365636641ba4a67d51abf83217 (diff) | |
download | poky-59d3fb6db0bcdc4edd63dc1d7e3da8e34535c488.tar.gz |
linux-yocto/4.1/4.1: mei, usb and extcon changes
Backporting the following mainline changes to the 4.1 and 4.4
kernels:
device property: Avoid potential dereferences of invalid pointers
device property: convert to use match_string() helper
lib/string: introduce match_string() helper
device property: fix for a case of use-after-free
device property: fwnode->secondary may contain ERR_PTR(-ENODEV)
xhci: harden xhci_find_next_ext_cap against device removal
xhci: rework xhci extended capability list parsing functions
xhci: parse xhci protocol speed ID list for usb 3.1 usage
extcon: Redefine the unique id of supported external connectors without 'enum extcon' type
extcon: Remove optional print_name() function pointer of extcon_dev
extcon: Update the prototype of extcon_register_notifier() with enum extcon
extcon: Use capital letter for the name of external connectors
extcon: Use the unique id for external connector instead of string
extcon: Remove the optional name of extcon device
extcon: adc-jack: Remove the unneeded num_cables field
extcon: Alter MHL-TA cable name to TA cable name
extcon: Unify the dock device names on max8997/77693
extcon: Unify the jig cable names on rt8973 and max14577/77693/77843
extcon: Fix the checkpatch warning and minor coding style issue
extcon: Add extcon_get_edev_name() API to get the extcon device name
extcon: Modify the device name as extcon[X] for sysfs
extcon: Add manufactor name of each extcon device
And the following config change:
mei.cfg: Add CONFIG_INTEL_MEI_TXE=m
(From OE-Core rev: a04c634adc3d073701ecf2576fe9dd0cf8ace629)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.1.bb | 18 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.4.bb | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb index 15494b6335..858518baa0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "1ab0fb3f54886c143066754df67eb6abe4c5d7f9" | 14 | SRCREV_machine ?= "6d00f6d73a3268e99092096a3f5699c57370ece0" |
15 | SRCREV_meta ?= "886dacbd6290bbd5bb0632883f661fb57b232d94" | 15 | SRCREV_meta ?= "0845ec79bc2fbc45efcf4c44138fd698039960c5" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb index 106dc34508..eb99e6ebab 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "3bdc347cc2087a0217e3acddccda5bb775cd570b" | 14 | SRCREV_machine ?= "3bdc347cc2087a0217e3acddccda5bb775cd570b" |
15 | SRCREV_meta ?= "6f6ffd05b919b870b6b97c0200ff1fff4e614563" | 15 | SRCREV_meta ?= "4ebb8be6799bf2b738d46a3db49ebe59187f3b96" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb index 7503dd1b83..a062272c3d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.1.26" | |||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "6ea8af4a9bc8797d71e14d9e641d9e28b1dee917" | 12 | SRCREV_machine ?= "75d56a13f86fc48002e4a3f9ed60546db30432b7" |
13 | SRCREV_meta ?= "886dacbd6290bbd5bb0632883f661fb57b232d94" | 13 | SRCREV_meta ?= "0845ec79bc2fbc45efcf4c44138fd698039960c5" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb index 1df17848af..0bf3d8bb90 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | |||
@@ -10,7 +10,7 @@ KMETA = "kernel-meta" | |||
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "26d9c4e612512486290bad4525cef5c69f5e485d" | 12 | SRCREV_machine ?= "26d9c4e612512486290bad4525cef5c69f5e485d" |
13 | SRCREV_meta ?= "6f6ffd05b919b870b6b97c0200ff1fff4e614563" | 13 | SRCREV_meta ?= "4ebb8be6799bf2b738d46a3db49ebe59187f3b96" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb index f673609b7f..49adad0fd1 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb | |||
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "standard/base" | 11 | KBRANCH_qemux86-64 ?= "standard/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "ce593534958d0bc6a3d1bc3036f425b9d7d9f5f6" | 14 | SRCREV_machine_qemuarm ?= "494bf106c15685dafa318f418ce86228728006f1" |
15 | SRCREV_machine_qemuarm64 ?= "6ea8af4a9bc8797d71e14d9e641d9e28b1dee917" | 15 | SRCREV_machine_qemuarm64 ?= "75d56a13f86fc48002e4a3f9ed60546db30432b7" |
16 | SRCREV_machine_qemumips ?= "f1566b7d9fafd16b5dd98a313ffae1cab493a1c3" | 16 | SRCREV_machine_qemumips ?= "3d9c0d5f502f7ae6f74766b2e9980df2cf5f661c" |
17 | SRCREV_machine_qemuppc ?= "6ea8af4a9bc8797d71e14d9e641d9e28b1dee917" | 17 | SRCREV_machine_qemuppc ?= "75d56a13f86fc48002e4a3f9ed60546db30432b7" |
18 | SRCREV_machine_qemux86 ?= "6ea8af4a9bc8797d71e14d9e641d9e28b1dee917" | 18 | SRCREV_machine_qemux86 ?= "75d56a13f86fc48002e4a3f9ed60546db30432b7" |
19 | SRCREV_machine_qemux86-64 ?= "6ea8af4a9bc8797d71e14d9e641d9e28b1dee917" | 19 | SRCREV_machine_qemux86-64 ?= "75d56a13f86fc48002e4a3f9ed60546db30432b7" |
20 | SRCREV_machine_qemumips64 ?= "8bac527ccf5cef97eac0dec7d94fb8cb668d7e13" | 20 | SRCREV_machine_qemumips64 ?= "6c9b0acfa18a1c86da12ae17da643cde03dd82cd" |
21 | SRCREV_machine ?= "6ea8af4a9bc8797d71e14d9e641d9e28b1dee917" | 21 | SRCREV_machine ?= "75d56a13f86fc48002e4a3f9ed60546db30432b7" |
22 | SRCREV_meta ?= "886dacbd6290bbd5bb0632883f661fb57b232d94" | 22 | SRCREV_meta ?= "0845ec79bc2fbc45efcf4c44138fd698039960c5" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb index a91b9cedc7..ea8ce49da8 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb | |||
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "26d9c4e612512486290bad4525cef5c69f5e485d" | |||
19 | SRCREV_machine_qemux86-64 ?= "26d9c4e612512486290bad4525cef5c69f5e485d" | 19 | SRCREV_machine_qemux86-64 ?= "26d9c4e612512486290bad4525cef5c69f5e485d" |
20 | SRCREV_machine_qemumips64 ?= "565650ff074c7438081bd2ff0db4d7208d666ddf" | 20 | SRCREV_machine_qemumips64 ?= "565650ff074c7438081bd2ff0db4d7208d666ddf" |
21 | SRCREV_machine ?= "26d9c4e612512486290bad4525cef5c69f5e485d" | 21 | SRCREV_machine ?= "26d9c4e612512486290bad4525cef5c69f5e485d" |
22 | SRCREV_meta ?= "6f6ffd05b919b870b6b97c0200ff1fff4e614563" | 22 | SRCREV_meta ?= "4ebb8be6799bf2b738d46a3db49ebe59187f3b96" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" |