diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-03-16 12:48:21 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-20 23:12:25 +0000 |
commit | 2c666af53642719ca998721a4e54c6bef1b09711 (patch) | |
tree | c53933a7a59e7b96c2b1f20905fabd3711f4b8cd | |
parent | 8dc9162a55ef2e0861a2ba479b8e744af3e17e5e (diff) | |
download | poky-2c666af53642719ca998721a4e54c6bef1b09711.tar.gz |
linux-yocto/4.1: usb: add usb_otg_caps to usb_gadget structure.
We backported a series of usb OTG commits for BSPs that required
updated support, but this commit was missed. We backport it as
well to fix build issues in some configurations.
(From OE-Core rev: 06ab1c7f60fbc0a9aebb9fd9321a1b7213378037)
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 bd4fbbd33d..48f304dd2f 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 ?= "fe96b2fe1c896675ef3b62d2aae9ec2082a48899" | 5 | SRCREV_machine ?= "5984d68470257f07d515b94570cd4fbdc5439380" |
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 1002b29ae7..3de6f0efbd 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 ?= "9073fd86a770707cceb817867460db72eaa9f107" | 12 | SRCREV_machine ?= "304caa9480f19875e717faf3cad8cb7ecd758733" |
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 ff82047c54..a99ba9a160 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 ?= "3c2c6e8e8b528b9be1e034975623fd98e51bfc52" | 14 | SRCREV_machine_qemuarm ?= "694cc606807a8e5cce762027f51b4179520c9238" |
15 | SRCREV_machine_qemuarm64 ?= "9073fd86a770707cceb817867460db72eaa9f107" | 15 | SRCREV_machine_qemuarm64 ?= "304caa9480f19875e717faf3cad8cb7ecd758733" |
16 | SRCREV_machine_qemumips ?= "bee0b4b4981c34ea515758d0da3ad68012b8d0bf" | 16 | SRCREV_machine_qemumips ?= "9150f6c42a7f3d61c150dd0cc2f2de8749dceac9" |
17 | SRCREV_machine_qemuppc ?= "9073fd86a770707cceb817867460db72eaa9f107" | 17 | SRCREV_machine_qemuppc ?= "304caa9480f19875e717faf3cad8cb7ecd758733" |
18 | SRCREV_machine_qemux86 ?= "9073fd86a770707cceb817867460db72eaa9f107" | 18 | SRCREV_machine_qemux86 ?= "304caa9480f19875e717faf3cad8cb7ecd758733" |
19 | SRCREV_machine_qemux86-64 ?= "9073fd86a770707cceb817867460db72eaa9f107" | 19 | SRCREV_machine_qemux86-64 ?= "304caa9480f19875e717faf3cad8cb7ecd758733" |
20 | SRCREV_machine_qemumips64 ?= "600bca3cd7994a86ce1899132d1665ae0290c67a" | 20 | SRCREV_machine_qemumips64 ?= "e068452acbc753215c7e26d4e81cdf437b53b988" |
21 | SRCREV_machine ?= "9073fd86a770707cceb817867460db72eaa9f107" | 21 | SRCREV_machine ?= "304caa9480f19875e717faf3cad8cb7ecd758733" |
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}; \ |