diff options
| author |   Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2015-12-11 14:44:28 +0000 |
|---|---|---|
| committer | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2015-12-11 14:44:28 +0000 |
| commit | b2bba9c294acd5c09a306f1e1f2a9b40ec6bcb31 (patch) | |
| tree | b6262d57a2abd67b697f26cf7b724678da30e9a8 | |
| parent | cef7a97004941814abd7b1ac7e85a4c0e67b19fe (diff) | |
| parent | 999b45704385490ec5dd5b80bb436c437db816a4 (diff) | |
| download | meta-qcom-b2bba9c294acd5c09a306f1e1f2a9b40ec6bcb31.tar.gz meta-qcom-b2bba9c294acd5c09a306f1e1f2a9b40ec6bcb31.tar.bz2 meta-qcom-b2bba9c294acd5c09a306f1e1f2a9b40ec6bcb31.zip | |
Merge branch 'jethro'
| -rw-r--r-- | conf/machine/dragonboard-410c.conf | 2 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-linaro-qcomlt_4.2.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/dragonboard-410c.conf b/conf/machine/dragonboard-410c.conf index 8c6bdb3..5be70ae 100644 --- a/conf/machine/dragonboard-410c.conf +++ b/conf/machine/dragonboard-410c.conf @@ -32,7 +32,7 @@ KERNEL_DEVICETREE = "${S}/arch/arm64/boot/dts/dragonboard.dts" SERIAL_CONSOLE = "115200 ttyMSM0" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-wcn36xx kernel-module-wcn36xx-platform', '', d)} \ + kernel-modules \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \ ${@'firmware-qcom-dragonboard410c' if d.getVar('ACCEPT_QCOM_EULA', True) == '1' else ''}" diff --git a/recipes-kernel/linux/linux-linaro-qcomlt_4.2.bb b/recipes-kernel/linux/linux-linaro-qcomlt_4.2.bb index 13f4445..3a140fe 100644 --- a/recipes-kernel/linux/linux-linaro-qcomlt_4.2.bb +++ b/recipes-kernel/linux/linux-linaro-qcomlt_4.2.bb @@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-dtb.inc require recipes-kernel/linux/linux-qcom-bootimg.inc SRCBRANCH = "release/qcomlt-4.2" -SRCREV = "d3a8cef5d9a3eaa2b8e0f9f95e82354a40fac528" +SRCREV = "d9e72b03cd9ce0096b991498aa1847c81ae4439a" COMPATIBLE_MACHINE = "(ifc6410|dragonboard-410c)" |