From f34d529e671560f97100f62d7d25efc6263b0c36 Mon Sep 17 00:00:00 2001 From: Nanxin Qin Date: Mon, 4 Sep 2017 20:37:16 +0800 Subject: [PATCH] decoder: modify modules dir in the sysfs to compatible with kernel 3.14 [3/3] PD#150498: modify modules dir in the sysfs to compatible with kernel 3.14 Change-Id: Ie2f5ef1d0473f1683e991ba405e5347e0d95f6db Signed-off-by: Nanxin Qin --- .../frame_provider/decoder/Makefile | 27 ++++++++----------- .../frame_provider/decoder/avs/Makefile | 4 +-- .../frame_provider/decoder/h264/Makefile | 8 ++++++ .../decoder/h264_multi/Makefile | 4 +-- .../frame_provider/decoder/h265/Makefile | 2 ++ .../frame_provider/decoder/mjpeg/Makefile | 5 ++++ .../frame_provider/decoder/mpeg12/Makefile | 2 ++ .../frame_provider/decoder/mpeg4/Makefile | 5 ++++ .../frame_provider/decoder/real/Makefile | 2 ++ .../frame_provider/decoder/vc1/Makefile | 2 ++ .../frame_provider/decoder/vp9/Makefile | 2 ++ 11 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 drivers/amlogic/media_modules/frame_provider/decoder/h264/Makefile create mode 100644 drivers/amlogic/media_modules/frame_provider/decoder/h265/Makefile create mode 100644 drivers/amlogic/media_modules/frame_provider/decoder/mjpeg/Makefile create mode 100644 drivers/amlogic/media_modules/frame_provider/decoder/mpeg12/Makefile create mode 100644 drivers/amlogic/media_modules/frame_provider/decoder/mpeg4/Makefile create mode 100644 drivers/amlogic/media_modules/frame_provider/decoder/real/Makefile create mode 100644 drivers/amlogic/media_modules/frame_provider/decoder/vc1/Makefile create mode 100644 drivers/amlogic/media_modules/frame_provider/decoder/vp9/Makefile diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/Makefile b/drivers/amlogic/media_modules/frame_provider/decoder/Makefile index 3a5774a8e786..11d66b363c85 100644 --- a/drivers/amlogic/media_modules/frame_provider/decoder/Makefile +++ b/drivers/amlogic/media_modules/frame_provider/decoder/Makefile @@ -1,16 +1,11 @@ -obj-y += utils/ -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_MPEG12) += mpeg12/vmpeg12.o -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_MPEG4) += mpeg4/vmpeg4.o -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_MPEG4_MULTI) += mpeg4/vmpeg4_multi.o -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_VC1) += vc1/vvc1.o -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_H264) += h264/vh264.o -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_H264_MULTI) += h264_multi/ -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_H264_MVC) += h264/vh264_mvc.o -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_H264_4K2K) += h264/vh264_4k2k.o -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_H264_MVC) += h264/vh264_mvc.o -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_H265) += h265/vh265.o -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_VP9) += vp9/vvp9.o -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_MJPEG) += mjpeg/vmjpeg.o -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_MJPEG_MULTI) += mjpeg/vmjpeg_multi.o -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_REAL) += real/vreal.o -obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_AVS) += avs/ +obj-y += utils/ +obj-y += mpeg12/ +obj-y += mpeg4/ +obj-y += vc1/ +obj-y += h264/ +obj-y += h264_multi/ +obj-y += h265/ +obj-y += vp9/ +obj-y += mjpeg/ +obj-y += real/ +obj-y += avs/ diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/avs/Makefile b/drivers/amlogic/media_modules/frame_provider/decoder/avs/Makefile index cf154c9d432d..1d56236f9ef2 100644 --- a/drivers/amlogic/media_modules/frame_provider/decoder/avs/Makefile +++ b/drivers/amlogic/media_modules/frame_provider/decoder/avs/Makefile @@ -1,2 +1,2 @@ -obj-m += vavs.o -vavs-objs += avs.o avsp_trans.o +obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_AVS) += amvdec_avs.o +amvdec_avs-objs += avs.o avsp_trans.o diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/h264/Makefile b/drivers/amlogic/media_modules/frame_provider/decoder/h264/Makefile new file mode 100644 index 000000000000..a98001ce5e2b --- /dev/null +++ b/drivers/amlogic/media_modules/frame_provider/decoder/h264/Makefile @@ -0,0 +1,8 @@ +obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_H264) += amvdec_h264.o +amvdec_h264-objs += vh264.o + +obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_H264_MVC) += amvdec_h264mvc.o +amvdec_h264mvc-objs += vh264_mvc.o + +obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_H264_4K2K) += amvdec_h264_4k2k.o +amvdec_h264_4k2k-objs += vh264_4k2k.o diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/h264_multi/Makefile b/drivers/amlogic/media_modules/frame_provider/decoder/h264_multi/Makefile index 17cb87e4d77b..21dfb6abb5b9 100644 --- a/drivers/amlogic/media_modules/frame_provider/decoder/h264_multi/Makefile +++ b/drivers/amlogic/media_modules/frame_provider/decoder/h264_multi/Makefile @@ -1,2 +1,2 @@ -obj-m += vh264_multi.o -vh264_multi-objs += vmh264.o h264_dpb.o +obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_H264_MULTI) += amvdec_mh264.o +amvdec_mh264-objs += vmh264.o h264_dpb.o diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/h265/Makefile b/drivers/amlogic/media_modules/frame_provider/decoder/h265/Makefile new file mode 100644 index 000000000000..86b8b8887f15 --- /dev/null +++ b/drivers/amlogic/media_modules/frame_provider/decoder/h265/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_H265) += amvdec_h265.o +amvdec_h265-objs += vh265.o diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/mjpeg/Makefile b/drivers/amlogic/media_modules/frame_provider/decoder/mjpeg/Makefile new file mode 100644 index 000000000000..ab91854d49d4 --- /dev/null +++ b/drivers/amlogic/media_modules/frame_provider/decoder/mjpeg/Makefile @@ -0,0 +1,5 @@ +obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_MJPEG) += amvdec_mjpeg.o +amvdec_mjpeg-objs += vmjpeg.o + +obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_MJPEG_MULTI) += amvdec_mmjpeg.o +amvdec_mmjpeg-objs += vmjpeg_multi.o diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/mpeg12/Makefile b/drivers/amlogic/media_modules/frame_provider/decoder/mpeg12/Makefile new file mode 100644 index 000000000000..9a07229b0cb0 --- /dev/null +++ b/drivers/amlogic/media_modules/frame_provider/decoder/mpeg12/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_MPEG12) += amvdec_mpeg12.o +amvdec_mpeg12-objs += vmpeg12.o diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/mpeg4/Makefile b/drivers/amlogic/media_modules/frame_provider/decoder/mpeg4/Makefile new file mode 100644 index 000000000000..917cc85e6c7a --- /dev/null +++ b/drivers/amlogic/media_modules/frame_provider/decoder/mpeg4/Makefile @@ -0,0 +1,5 @@ +obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_MPEG4) += amvdec_mpeg4.o +amvdec_mpeg4-objs += vmpeg4.o + +obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_MPEG4_MULTI) += amvdec_mmpeg4.o +amvdec_mmpeg4-objs += vmpeg4_multi.o diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/real/Makefile b/drivers/amlogic/media_modules/frame_provider/decoder/real/Makefile new file mode 100644 index 000000000000..ab03ef29f11b --- /dev/null +++ b/drivers/amlogic/media_modules/frame_provider/decoder/real/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_REAL) += amvdec_real.o +amvdec_real-objs += vreal.o diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/vc1/Makefile b/drivers/amlogic/media_modules/frame_provider/decoder/vc1/Makefile new file mode 100644 index 000000000000..b43a6002e1b2 --- /dev/null +++ b/drivers/amlogic/media_modules/frame_provider/decoder/vc1/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_VC1) += amvdec_vc1.o +amvdec_vc1-objs += vvc1.o diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/vp9/Makefile b/drivers/amlogic/media_modules/frame_provider/decoder/vp9/Makefile new file mode 100644 index 000000000000..51edefe1e67d --- /dev/null +++ b/drivers/amlogic/media_modules/frame_provider/decoder/vp9/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_AMLOGIC_MEDIA_VDEC_VP9) += amvdec_vp9.o +amvdec_vp9-objs += vvp9.o