diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-05-27 12:18:35 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-29 19:36:01 +0100 |
commit | ec2d08375be9a9fdd6bb170aa4c342640cda3505 (patch) | |
tree | 45f8389eb2cde4405b844265a2d4ff1f6e42c227 /meta | |
parent | 217448b91185dd8719d03e2f4d55ba44105a42d0 (diff) | |
download | poky-ec2d08375be9a9fdd6bb170aa4c342640cda3505.tar.gz |
linux-yocto/4.1: fix musb compilation error
We had a partial musb change merged into the 4.1 tree, which resulted in:
| kernel-source/drivers/usb/musb/musb_dsps.c:
In function 'dsps_create_musb_pdev':
| kernel-source/drivers/usb/musb/musb_dsps.c:750:8:
error: 'struct musb_hdrc_config' has no member named 'maximum_speed'
| config->maximum_speed = usb_get_maximum_speed(&parent->dev);
| ^~
By backporting commit:
9b7537642cb6a [usb: musb: set the controller speed based on the config setting]
We get our missing structure field, and we can once again build musb.
[YOCTO: #9680]
(From OE-Core rev: b746223787a0195c3a4d16523003c62ec0ac8451)
(From OE-Core rev: b6b0a40e5c9ffe1a2150b36cb2a447a1361d474b)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster@mvista.com>
fixup as meta hash was not updated to latest
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 51fa3adeb2..ce54fc58bb 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | |||
@@ -11,7 +11,7 @@ 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 ?= "320892013ad33ab41f530ad321939aec07d09d22" | 14 | SRCREV_machine ?= "e22280e8c2905d96c7cc5917df202b6ed904d042" |
15 | SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" | 15 | SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" |
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 \ |
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 35a76ef0cd..2eea7b8903 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.24" | |||
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 ?= "ecc983477682203619da0e456fa4a8689ac41097" | 12 | SRCREV_machine ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" |
13 | SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" | 13 | SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" |
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 2332e11f42..dd2ef7654b 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 ?= "d11c336b38ab0d4e55eb683aca5ca9c6b6cd8b42" | 14 | SRCREV_machine_qemuarm ?= "cadb80aa4bcee282f1b0798ef35ad8b96ec44931" |
15 | SRCREV_machine_qemuarm64 ?= "ecc983477682203619da0e456fa4a8689ac41097" | 15 | SRCREV_machine_qemuarm64 ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" |
16 | SRCREV_machine_qemumips ?= "f8e363f638b283738369155b4a9990b5d0f902a7" | 16 | SRCREV_machine_qemumips ?= "737eda6388a529d0937e9d91daa3644b11f322dc" |
17 | SRCREV_machine_qemuppc ?= "ecc983477682203619da0e456fa4a8689ac41097" | 17 | SRCREV_machine_qemuppc ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" |
18 | SRCREV_machine_qemux86 ?= "ecc983477682203619da0e456fa4a8689ac41097" | 18 | SRCREV_machine_qemux86 ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" |
19 | SRCREV_machine_qemux86-64 ?= "ecc983477682203619da0e456fa4a8689ac41097" | 19 | SRCREV_machine_qemux86-64 ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" |
20 | SRCREV_machine_qemumips64 ?= "1db47ec6c39071b29f82a040b9b9a81584f50461" | 20 | SRCREV_machine_qemumips64 ?= "f276d128428b031521d766bfbfe84f9f9f992930" |
21 | SRCREV_machine ?= "ecc983477682203619da0e456fa4a8689ac41097" | 21 | SRCREV_machine ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" |
22 | SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" | 22 | SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" |
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}; \ |