From efed2d255dccafb8ae44f7d71b92b937ad5c42d8 Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Thu, 14 Sep 2017 17:43:18 +0900 Subject: [PATCH] Add uvc.cfg for usb video class kernel configure Add uvc.cfg into meta-agl-bsp/recipes-kernel, Then include this cfg in each board bbappend. See: https://gerrit.automotivelinux.org/gerrit/#/c/10803/ Change-Id: I5faebefef3560a27496103e1ad4a1ca70377a1ba Signed-off-by: zheng_wenlong Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10893 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- .../recipes-kernel/linux/linux-fslc-imx_%.bbappend | 2 ++ .../meta-intel/recipes-kernel/linux/linux-yocto_4.4%.bbappend | 3 +++ .../meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend | 3 +++ .../meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.9.bbappend | 3 +++ .../recipes-kernel/linux/linux-raspberrypi_%.bbappend | 3 +++ .../meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend | 3 +++ .../meta-renesas/recipes-kernel/linux/linux-renesas_%.bbappend | 3 +++ meta-agl-bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_%.bbappend | 3 +++ meta-agl-bsp/recipes-kernel/linux/linux-%.bbappend | 1 + meta-agl-bsp/recipes-kernel/linux/linux/uvc.cfg | 4 ++++ 10 files changed, 28 insertions(+) create mode 100644 meta-agl-bsp/recipes-kernel/linux/linux/uvc.cfg diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend index 5fe15cb97..bed10faf4 100644 --- a/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend +++ b/meta-agl-bsp/meta-freescale-layer/recipes-kernel/linux/linux-fslc-imx_%.bbappend @@ -101,3 +101,5 @@ KERNEL_CONFIG_FRAGMENTS_append_smack = "\ ${WORKDIR}/smack-default-lsm.cfg \ " +# Enable support for usb video class for usb camera devices +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/uvc.cfg" diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.4%.bbappend b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.4%.bbappend index 26063479e..68149e5a2 100644 --- a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.4%.bbappend +++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.4%.bbappend @@ -18,3 +18,6 @@ SRC_URI_prepend_intel-corei7-64 = "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', KERNEL_FEATURES_remove_corei7-64-intel-common = "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', 'broxton-m', 'features/amt/mei/mei.scc', '', d)}" KERNEL_FEATURES_append_corei7-64-intel-common = "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', 'broxton-m', ' features/mei/mei-spd.scc', '', d)}" SRC_URI_append = "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', 'broxton-m', ' file://security-tpm.cfg', '', d)}" + +# Enable support for usb video class for usb camera devices +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/uvc.cfg" diff --git a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend index 65484da51..d524ebfa4 100644 --- a/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend +++ b/meta-agl-bsp/meta-intel/recipes-kernel/linux/linux-yocto_4.9%.bbappend @@ -7,3 +7,6 @@ KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/usb-devices.cfg" # adding support for other graphic cards to work on more PC HW SRC_URI_append = " file://extra-graphic-devices.cfg" KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/extra-graphic-devices.cfg" + +# Enable support for usb video class for usb camera devices +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/uvc.cfg" diff --git a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.9.bbappend b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.9.bbappend index 854b7592f..77a15446e 100644 --- a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.9.bbappend +++ b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.9.bbappend @@ -28,3 +28,6 @@ KERNEL_CONFIG_FRAGMENTS_append_smack = "\ # file comes out of meta-agl-bsp/recipes-kernel/linux/linux_%.bbappend KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/can-bus.cfg" + +# Enable support for usb video class for usb camera devices +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/uvc.cfg" \ No newline at end of file diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend index ead116b09..753440a3d 100644 --- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend +++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend @@ -103,3 +103,6 @@ KERNEL_MODULE_AUTOLOAD += "hid-multitouch" RDEPENDS_${PN} += "kernel-module-snd-bcm2835" PACKAGES += "kernel-module-snd-bcm2835" + +# Enable support for usb video class for usb camera devices +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/uvc.cfg" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend index 93a060e1e..c3fb20506 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend @@ -7,3 +7,6 @@ SRC_URI_append = " file://namespace_fix.cfg \ file://ath9k_htc.cfg \ file://disable_ipv6.cfg \ " + +# Enable support for usb video class for usb camera devices +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/uvc.cfg" diff --git a/meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux-renesas_%.bbappend index 368f1ba1c..0871fbf2e 100755 --- a/meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux-renesas_%.bbappend +++ b/meta-agl-bsp/meta-renesas/recipes-kernel/linux/linux-renesas_%.bbappend @@ -42,3 +42,6 @@ KERNEL_CONFIG_FRAGMENTS_append_agl-porter-hibernate += " ${WORKDIR}/hibernation/ # file comes out of meta-agl-bsp/recipes-kernel/linux/linux_%.bbappend KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/can-bus.cfg" + +# Enable support for usb video class for usb camera devices +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/uvc.cfg" \ No newline at end of file diff --git a/meta-agl-bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_%.bbappend b/meta-agl-bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_%.bbappend index b2e543140..f9c0c0433 100644 --- a/meta-agl-bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_%.bbappend +++ b/meta-agl-bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_%.bbappend @@ -31,3 +31,6 @@ KERNEL_CONFIG_FRAGMENTS_append_smack = "\ # file comes out of meta-agl-bsp/recipes-kernel/linux/linux_%.bbappend KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/can-bus.cfg" + +# Enable support for usb video class for usb camera devices +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/uvc.cfg" diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-%.bbappend b/meta-agl-bsp/recipes-kernel/linux/linux-%.bbappend index f5e01e2f3..04aeb944b 100644 --- a/meta-agl-bsp/recipes-kernel/linux/linux-%.bbappend +++ b/meta-agl-bsp/recipes-kernel/linux/linux-%.bbappend @@ -3,4 +3,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux:" # Extra configuration options for the AGL kernel SRC_URI_append = " file://can-bus.cfg \ file://usb.cfg \ + file://uvc.cfg \ " diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/uvc.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/uvc.cfg new file mode 100644 index 000000000..7cfc377d4 --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/uvc.cfg @@ -0,0 +1,4 @@ +CONFIG_VIDEOBUF2_VMALLOC=y +CONFIG_MEDIA_USB_SUPPORT=y +CONFIG_USB_VIDEO_CLASS=y +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -- 2.16.6