From 69a18c18b14a906df1a48bea445bc777bac5b7e5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 19 Jul 2019 16:47:43 +0100 Subject: [PATCH] arm: media acceleration driver config changes --- configs/fedora/generic/CONFIG_VIDEO_HANTRO | 1 - configs/fedora/generic/arm/CONFIG_VIDEO_HANTRO | 1 + configs/fedora/generic/arm/CONFIG_VIDEO_HANTRO_ROCKCHIP | 1 + configs/fedora/generic/arm/CONFIG_VIDEO_MESON_VDEC | 1 + configs/fedora/generic/arm/CONFIG_VIDEO_ROCKCHIP_VPU | 1 - kernel-aarch64-debug.config | 4 ++-- kernel-aarch64.config | 4 ++-- kernel-armv7hl-debug.config | 4 ++-- kernel-armv7hl-lpae-debug.config | 4 ++-- kernel-armv7hl-lpae.config | 4 ++-- kernel-armv7hl.config | 4 ++-- kernel-i686-debug.config | 1 - kernel-i686.config | 1 - kernel-ppc64le-debug.config | 1 - kernel-ppc64le.config | 1 - kernel-s390x-debug.config | 1 - kernel-s390x.config | 1 - kernel-x86_64-debug.config | 1 - kernel-x86_64.config | 1 - 19 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_VIDEO_HANTRO create mode 100644 configs/fedora/generic/arm/CONFIG_VIDEO_HANTRO create mode 100644 configs/fedora/generic/arm/CONFIG_VIDEO_HANTRO_ROCKCHIP create mode 100644 configs/fedora/generic/arm/CONFIG_VIDEO_MESON_VDEC delete mode 100644 configs/fedora/generic/arm/CONFIG_VIDEO_ROCKCHIP_VPU diff --git a/configs/fedora/generic/CONFIG_VIDEO_HANTRO b/configs/fedora/generic/CONFIG_VIDEO_HANTRO deleted file mode 100644 index f97702090..000000000 --- a/configs/fedora/generic/CONFIG_VIDEO_HANTRO +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_VIDEO_HANTRO is not set diff --git a/configs/fedora/generic/arm/CONFIG_VIDEO_HANTRO b/configs/fedora/generic/arm/CONFIG_VIDEO_HANTRO new file mode 100644 index 000000000..41328bbfb --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_VIDEO_HANTRO @@ -0,0 +1 @@ +CONFIG_VIDEO_HANTRO=m diff --git a/configs/fedora/generic/arm/CONFIG_VIDEO_HANTRO_ROCKCHIP b/configs/fedora/generic/arm/CONFIG_VIDEO_HANTRO_ROCKCHIP new file mode 100644 index 000000000..f82718958 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_VIDEO_HANTRO_ROCKCHIP @@ -0,0 +1 @@ +CONFIG_VIDEO_HANTRO_ROCKCHIP=y diff --git a/configs/fedora/generic/arm/CONFIG_VIDEO_MESON_VDEC b/configs/fedora/generic/arm/CONFIG_VIDEO_MESON_VDEC new file mode 100644 index 000000000..69594d91d --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_VIDEO_MESON_VDEC @@ -0,0 +1 @@ +CONFIG_VIDEO_MESON_VDEC=m diff --git a/configs/fedora/generic/arm/CONFIG_VIDEO_ROCKCHIP_VPU b/configs/fedora/generic/arm/CONFIG_VIDEO_ROCKCHIP_VPU deleted file mode 100644 index 1b4c72b77..000000000 --- a/configs/fedora/generic/arm/CONFIG_VIDEO_ROCKCHIP_VPU +++ /dev/null @@ -1 +0,0 @@ -CONFIG_VIDEO_ROCKCHIP_VPU=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 771b7f487..82c5926e6 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -7076,7 +7076,8 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -# CONFIG_VIDEO_HANTRO is not set +CONFIG_VIDEO_HANTRO=m +CONFIG_VIDEO_HANTRO_ROCKCHIP=m CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m @@ -7098,7 +7099,6 @@ CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_QCOM_CAMSS=m CONFIG_VIDEO_QCOM_VENUS=m CONFIG_VIDEO_ROCKCHIP_RGA=m -CONFIG_VIDEO_ROCKCHIP_VPU=m CONFIG_VIDEO_SAA6588=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_DVB=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index c41e9e558..6fc3e73ad 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -7054,7 +7054,8 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -# CONFIG_VIDEO_HANTRO is not set +CONFIG_VIDEO_HANTRO=m +CONFIG_VIDEO_HANTRO_ROCKCHIP=m CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m @@ -7076,7 +7077,6 @@ CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_QCOM_CAMSS=m CONFIG_VIDEO_QCOM_VENUS=m CONFIG_VIDEO_ROCKCHIP_RGA=m -CONFIG_VIDEO_ROCKCHIP_VPU=m CONFIG_VIDEO_SAA6588=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_DVB=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index d177851be..913a377e8 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -7379,7 +7379,8 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -# CONFIG_VIDEO_HANTRO is not set +CONFIG_VIDEO_HANTRO=m +CONFIG_VIDEO_HANTRO_ROCKCHIP=m CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m @@ -7406,7 +7407,6 @@ CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_QCOM_VENUS=m CONFIG_VIDEO_ROCKCHIP_RGA=m -CONFIG_VIDEO_ROCKCHIP_VPU=m CONFIG_VIDEO_S5P_FIMC=m CONFIG_VIDEO_S5P_MIPI_CSIS=m CONFIG_VIDEO_SAA6588=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index d2a61d991..6f28ede0e 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -7025,7 +7025,8 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -# CONFIG_VIDEO_HANTRO is not set +CONFIG_VIDEO_HANTRO=m +CONFIG_VIDEO_HANTRO_ROCKCHIP=m CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m @@ -7046,7 +7047,6 @@ CONFIG_VIDEO_PVRUSB2_DVB=y CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_ROCKCHIP_RGA=m -CONFIG_VIDEO_ROCKCHIP_VPU=m CONFIG_VIDEO_S5P_FIMC=m CONFIG_VIDEO_S5P_MIPI_CSIS=m CONFIG_VIDEO_SAA6588=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 6fab498e3..ce54eba61 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -7004,7 +7004,8 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -# CONFIG_VIDEO_HANTRO is not set +CONFIG_VIDEO_HANTRO=m +CONFIG_VIDEO_HANTRO_ROCKCHIP=m CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m @@ -7025,7 +7026,6 @@ CONFIG_VIDEO_PVRUSB2_DVB=y CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_ROCKCHIP_RGA=m -CONFIG_VIDEO_ROCKCHIP_VPU=m CONFIG_VIDEO_S5P_FIMC=m CONFIG_VIDEO_S5P_MIPI_CSIS=m CONFIG_VIDEO_SAA6588=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 801eb4b40..35b59d6fc 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -7358,7 +7358,8 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -# CONFIG_VIDEO_HANTRO is not set +CONFIG_VIDEO_HANTRO=m +CONFIG_VIDEO_HANTRO_ROCKCHIP=m CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m @@ -7385,7 +7386,6 @@ CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_QCOM_VENUS=m CONFIG_VIDEO_ROCKCHIP_RGA=m -CONFIG_VIDEO_ROCKCHIP_VPU=m CONFIG_VIDEO_S5P_FIMC=m CONFIG_VIDEO_S5P_MIPI_CSIS=m CONFIG_VIDEO_SAA6588=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 4129ac6b0..476abe05b 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -6440,7 +6440,6 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -# CONFIG_VIDEO_HANTRO is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m diff --git a/kernel-i686.config b/kernel-i686.config index 8d0923b03..f931a2814 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -6419,7 +6419,6 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -# CONFIG_VIDEO_HANTRO is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index fa61210a0..21d2b0adc 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -6046,7 +6046,6 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -# CONFIG_VIDEO_HANTRO is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 317d0a33f..8d91d6e48 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -6023,7 +6023,6 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -# CONFIG_VIDEO_HANTRO is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 26499039d..b5afeeedc 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -5985,7 +5985,6 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -# CONFIG_VIDEO_HANTRO is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 734354711..a5c654c33 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -5962,7 +5962,6 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -# CONFIG_VIDEO_HANTRO is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index d040870f8..872a14dc3 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -6499,7 +6499,6 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -# CONFIG_VIDEO_HANTRO is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 5c0c68778..22cd79777 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -6478,7 +6478,6 @@ CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -# CONFIG_VIDEO_HANTRO is not set CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m