aboutsummaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen2/recipes-kernel/linux
diff options
context:
space:
mode:
authorTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2015-10-15 15:20:01 +0900
committerTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2015-10-15 16:13:55 +0900
commit4f7cf459dd3cdec72869cd40f4a1f6b02ba4faaf (patch)
tree65b0b33dd515d045f1050082bab1fc9ce68372f3 /meta-rcar-gen2/recipes-kernel/linux
parent9e0925569683e90eee9a07de76671457608b5597 (diff)
parentc7ca33aa5566636429f6b0ba9c959e2259acbc3e (diff)
[AGL] Merge genivi-7.0-bsp-1.8.0 into agl-1.0-bsp-1.8.0
* agl/genivi-7.0-bsp-1.8.0: r-car e2 (alt/silk): mesa: Temporary workaround to upstream Mesa build issue multimedia: Remove unnecessary do_install_append from omx-user-module multimedia: gstreamer1.0-* fix configure for out of tree build on git recipes r-car m2: set PREFERRED_VERSION_gstreamer1.0-omx* to 1.0.% when h/w acceleration enabled multimedia: add RPROVIDES for multimedia kernel modules Configure linux-renesas to build uinput Conflicts: meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb Change-Id: Id8bf7749e75fa2cf5e418b81a33659285e46532c Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Diffstat (limited to 'meta-rcar-gen2/recipes-kernel/linux')
-rw-r--r--meta-rcar-gen2/recipes-kernel/linux/linux.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux.inc b/meta-rcar-gen2/recipes-kernel/linux/linux.inc
index 560bf98..886c2a9 100644
--- a/meta-rcar-gen2/recipes-kernel/linux/linux.inc
+++ b/meta-rcar-gen2/recipes-kernel/linux/linux.inc
@@ -118,6 +118,9 @@ do_configure_prepend() {
kernel_configure_variable QUOTA y
kernel_configure_variable BT y
+ # add uinput for automated testing
+ kernel_configure_variable INPUT_MISC y
+ kernel_configure_variable INPUT_UINPUT y
# Keep this the last line
# Remove all modified configs and add the rest to .config