diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-03-30 08:25:01 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-31 09:15:04 +0100 |
| commit | fbd209d96c95afbcfe52e974f5b8d708d8ab2e44 (patch) | |
| tree | b385a6a1148423e2885ed255f6081430bb9d781b | |
| parent | ccf1b338d559a1902b19dc73edd10f09817edf4e (diff) | |
| download | poky-fbd209d96c95afbcfe52e974f5b8d708d8ab2e44.tar.gz | |
linux-yocto/4.1: device property backports
Integrating the following 4.4 backports:
630b726098c9 mfd: make mfd_remove_devices() iterate in reverse order
aab24907568b driver core: Do not overwrite secondary fwnode with NULL if it is set
89775462ef50 device property: return -EINVAL when property isn't found in ACPI
a9eebae4a2c0 device property: check fwnode type in to_of_node()
(From OE-Core rev: 4dd3bd968042d943f279d91d220abc61ebd574a5)
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.1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.1.bb | 16 |
3 files changed, 10 insertions, 10 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 0e25536538..15a63fc445 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | |||
| @@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt/base" | |||
| 2 | 2 | ||
| 3 | require recipes-kernel/linux/linux-yocto.inc | 3 | require recipes-kernel/linux/linux-yocto.inc |
| 4 | 4 | ||
| 5 | SRCREV_machine ?= "d84b3cdc2d04fe42efb94b6f1e67c2d84af20bde" | 5 | SRCREV_machine ?= "b0b9b44cd66a067ac026b2a3db764d1e9b4dbb30" |
| 6 | SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" | 6 | SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" |
| 7 | 7 | ||
| 8 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ | 8 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ |
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 8300319e7e..9dca92287c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | |||
| @@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.1.18" | |||
| 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 ?= "49b34899e7caa4237e6efbdf2e8f68e578707cee" | 12 | SRCREV_machine ?= "630b726098c95111a41336de04a5b7e201b012e9" |
| 13 | SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" | 13 | SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" |
| 14 | 14 | ||
| 15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb index e3f2e64450..01708ddcc5 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb | |||
| @@ -11,14 +11,14 @@ 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 ?= "55edd4698b9d54da4e648783918f2ee9ab7693ad" | 14 | SRCREV_machine_qemuarm ?= "1582fc5caa4957ef6a1349c0ae4178c2846c1af1" |
| 15 | SRCREV_machine_qemuarm64 ?= "49b34899e7caa4237e6efbdf2e8f68e578707cee" | 15 | SRCREV_machine_qemuarm64 ?= "630b726098c95111a41336de04a5b7e201b012e9" |
| 16 | SRCREV_machine_qemumips ?= "2c794fb0c6e6dec146e9d99018016da9bb04018d" | 16 | SRCREV_machine_qemumips ?= "9406ef8745f90c401e3551f45e2945d1f7408327" |
| 17 | SRCREV_machine_qemuppc ?= "49b34899e7caa4237e6efbdf2e8f68e578707cee" | 17 | SRCREV_machine_qemuppc ?= "630b726098c95111a41336de04a5b7e201b012e9" |
| 18 | SRCREV_machine_qemux86 ?= "49b34899e7caa4237e6efbdf2e8f68e578707cee" | 18 | SRCREV_machine_qemux86 ?= "630b726098c95111a41336de04a5b7e201b012e9" |
| 19 | SRCREV_machine_qemux86-64 ?= "49b34899e7caa4237e6efbdf2e8f68e578707cee" | 19 | SRCREV_machine_qemux86-64 ?= "630b726098c95111a41336de04a5b7e201b012e9" |
| 20 | SRCREV_machine_qemumips64 ?= "28bf6a37b7600979593be2ee922361acd83d1617" | 20 | SRCREV_machine_qemumips64 ?= "c29ac79ffc2957612e789ac7a5fe4919f99bf99f" |
| 21 | SRCREV_machine ?= "49b34899e7caa4237e6efbdf2e8f68e578707cee" | 21 | SRCREV_machine ?= "630b726098c95111a41336de04a5b7e201b012e9" |
| 22 | SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" | 22 | SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d" |
| 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}; \ |
