summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-05-24 11:53:59 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-29 19:36:01 +0100
commit662840a9acf1c21e096834ba25d66cbfe46766d9 (patch)
treeda76f731aace057ef2c65300ba41a9fdbdb99da2 /meta/recipes-kernel
parent1e583b1eb8785f9eba11a25c32414331d7ced165 (diff)
downloadpoky-662840a9acf1c21e096834ba25d66cbfe46766d9.tar.gz
linux-yocto/4.4: beaglebone: build in the usb controller drivers
Merging the following meta data change: [ In the current codes, we build the drivers for usb controller as modules. But for some image types, such as minimal or full-cmdline, these driver modules are not installed to the rootfs by default. This makes the using of the usb pretty inconvenience. So make them all builtin. Reported-and-suggested-by: hiims <h@101.org.il> Signed-off-by: Kevin Hao <kexin.hao@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ] (From OE-Core rev: cf5004a37f120043815bb9ee4ae065c1877f404a) (From OE-Core rev: f26b38c21d63e63b0f3a5f63cc8c164d94d46ece) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.4.bb2
3 files changed, 3 insertions, 3 deletions
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 94dc8915a2..023391670a 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
14SRCREV_machine ?= "7ef3fe56827bd9c20021e3a52bc36ebd4c6b2ce3" 14SRCREV_machine ?= "7ef3fe56827bd9c20021e3a52bc36ebd4c6b2ce3"
15SRCREV_meta ?= "d6ee402d461048cf1afd10375fee5769c06d21d6" 15SRCREV_meta ?= "fca9cc2483de4e7b981dc01122521c74e06fcc6a"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ 17SRC_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.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb
index 93ffe189ce..e66dd40931 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"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "578ff2a88676d20439dbf3877768370d06a22d8f" 12SRCREV_machine ?= "578ff2a88676d20439dbf3877768370d06a22d8f"
13SRCREV_meta ?= "d6ee402d461048cf1afd10375fee5769c06d21d6" 13SRCREV_meta ?= "fca9cc2483de4e7b981dc01122521c74e06fcc6a"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb
index a98f9fa9a9..31e5caaaa9 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 ?= "578ff2a88676d20439dbf3877768370d06a22d8f"
19SRCREV_machine_qemux86-64 ?= "578ff2a88676d20439dbf3877768370d06a22d8f" 19SRCREV_machine_qemux86-64 ?= "578ff2a88676d20439dbf3877768370d06a22d8f"
20SRCREV_machine_qemumips64 ?= "5faa3c8de491435842024b24b6a95fccdbe3f72a" 20SRCREV_machine_qemumips64 ?= "5faa3c8de491435842024b24b6a95fccdbe3f72a"
21SRCREV_machine ?= "578ff2a88676d20439dbf3877768370d06a22d8f" 21SRCREV_machine ?= "578ff2a88676d20439dbf3877768370d06a22d8f"
22SRCREV_meta ?= "d6ee402d461048cf1afd10375fee5769c06d21d6" 22SRCREV_meta ?= "fca9cc2483de4e7b981dc01122521c74e06fcc6a"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ 24SRC_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}"