summaryrefslogtreecommitdiff
authorNanxin Qin <nanxin.qin@amlogic.com>2017-09-04 12:46:23 (GMT)
committer Nanxin Qin <nanxin.qin@amlogic.com>2017-09-05 06:46:34 (GMT)
commit5d474d07daa569b8a982801ddecdc1ac1acfda27 (patch)
treeb1189acbf0110b046ab5ed21e67bc4a2835ff51f
parent926667245fb717fe20cdc45e68912ab3734cdd10 (diff)
downloadamlogic-o-5d474d07daa569b8a982801ddecdc1ac1acfda27.zip
amlogic-o-5d474d07daa569b8a982801ddecdc1ac1acfda27.tar.gz
amlogic-o-5d474d07daa569b8a982801ddecdc1ac1acfda27.tar.bz2
common: modify modules dir in the sysfs to compatible with kernel 3.14 [2/3]
PD#150498: modify modules dir in the sysfs to compatible with kernel 3.14 Change-Id: Ifbb93b62fdda5108ce250ddebcf9ab89ca7ddcfc Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
Diffstat
-rw-r--r--common/init.amlogic.media.rc28
-rw-r--r--p212/Kernel.mk38
-rw-r--r--p230/Kernel.mk37
3 files changed, 52 insertions, 51 deletions
diff --git a/common/init.amlogic.media.rc b/common/init.amlogic.media.rc
index 3790986..59d98b8 100644
--- a/common/init.amlogic.media.rc
+++ b/common/init.amlogic.media.rc
@@ -6,18 +6,18 @@ on fs
insmod /vendor/lib/modules/decoder_common.ko
insmod /vendor/lib/modules/stream_input.ko
- insmod /vendor/lib/modules/vavs.ko
- insmod /vendor/lib/modules/vh264.ko
- insmod /vendor/lib/modules/vh264_4k2k.ko
- insmod /vendor/lib/modules/vh264_multi.ko
- insmod /vendor/lib/modules/vh264_mvc.ko
- insmod /vendor/lib/modules/vh265.ko
- insmod /vendor/lib/modules/vmjpeg.ko
- insmod /vendor/lib/modules/vmjpeg_multi.ko
- insmod /vendor/lib/modules/vmpeg12.ko
- insmod /vendor/lib/modules/vmpeg4.ko
- insmod /vendor/lib/modules/vmpeg4_multi.ko
- insmod /vendor/lib/modules/vreal.ko
- insmod /vendor/lib/modules/vvc1.ko
- insmod /vendor/lib/modules/vvp9.ko
+ insmod /vendor/lib/modules/amvdec_avs.ko
+ insmod /vendor/lib/modules/amvdec_h264.ko
+ insmod /vendor/lib/modules/amvdec_h264_4k2k.ko
+ insmod /vendor/lib/modules/amvdec_mh264.ko
+ insmod /vendor/lib/modules/amvdec_h264mvc.ko
+ insmod /vendor/lib/modules/amvdec_h265.ko
+ insmod /vendor/lib/modules/amvdec_mjpeg.ko
+ insmod /vendor/lib/modules/amvdec_mmjpeg.ko
+ insmod /vendor/lib/modules/amvdec_mpeg12.ko
+ insmod /vendor/lib/modules/amvdec_mpeg4.ko
+ insmod /vendor/lib/modules/amvdec_mmpeg4.ko
+ insmod /vendor/lib/modules/amvdec_real.ko
+ insmod /vendor/lib/modules/amvdec_vc1.ko
+ insmod /vendor/lib/modules/amvdec_vp9.ko
insmod /vendor/lib/modules/encoder.ko
diff --git a/p212/Kernel.mk b/p212/Kernel.mk
index 2f905bc..ab9594c 100644
--- a/p212/Kernel.mk
+++ b/p212/Kernel.mk
@@ -35,29 +35,29 @@ INTERMEDIATES_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image.gz
TARGET_AMLOGIC_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/uImage
TARGET_AMLOGIC_INT_RECOVERY_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image_recovery
-BOARD_VENDOR_KERNEL_MODULES := $(PRODUCT_OUT)/obj/lib_vendor/audio_data.ko \
+BOARD_VENDOR_KERNEL_MODULES := \
+ $(PRODUCT_OUT)/obj/lib_vendor/audio_data.ko \
$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/media_clock.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vavs.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vh264_multi.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vmjpeg.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vmpeg4.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vvc1.ko \
$(PRODUCT_OUT)/obj/lib_vendor/ddr_window_64.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/encoder.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vh264_4k2k.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vh264_mvc.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vmjpeg_multi.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vmpeg4_multi.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vvp9.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/decoder_common.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/media_clock.ko \
$(PRODUCT_OUT)/obj/lib_vendor/firmware.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/decoder_common.ko \
$(PRODUCT_OUT)/obj/lib_vendor/stream_input.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vh264.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vh265.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vmpeg12.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vreal.ko
-
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_avs.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_mpeg12.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_mpeg4.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_mmpeg4.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_h264.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_mh264.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_h264mvc.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_h264_4k2k.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_h265.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_mjpeg.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_mmjpeg.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_vc1.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_vp9.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_real.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/encoder.ko
WIFI_OUT := $(TARGET_OUT_INTERMEDIATES)/hardware/wifi
diff --git a/p230/Kernel.mk b/p230/Kernel.mk
index 0ccb0c9..8982dc7 100644
--- a/p230/Kernel.mk
+++ b/p230/Kernel.mk
@@ -30,28 +30,29 @@ INTERMEDIATES_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image.gz
TARGET_AMLOGIC_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/uImage
TARGET_AMLOGIC_INT_RECOVERY_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image_recovery
-BOARD_VENDOR_KERNEL_MODULES := $(PRODUCT_OUT)/obj/lib_vendor/audio_data.ko \
+BOARD_VENDOR_KERNEL_MODULES := \
+ $(PRODUCT_OUT)/obj/lib_vendor/audio_data.ko \
$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/media_clock.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vavs.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vh264_multi.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vmjpeg.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vmpeg4.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vvc1.ko \
$(PRODUCT_OUT)/obj/lib_vendor/ddr_window_64.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/encoder.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vh264_4k2k.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vh264_mvc.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vmjpeg_multi.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vmpeg4_multi.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vvp9.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/decoder_common.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/media_clock.ko \
$(PRODUCT_OUT)/obj/lib_vendor/firmware.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/decoder_common.ko \
$(PRODUCT_OUT)/obj/lib_vendor/stream_input.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vh264.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vh265.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vmpeg12.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/vreal.ko
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_avs.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_mpeg12.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_mpeg4.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_mmpeg4.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_h264.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_mh264.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_h264mvc.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_h264_4k2k.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_h265.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_mjpeg.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_mmjpeg.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_vc1.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_vp9.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/amvdec_real.ko \
+ $(PRODUCT_OUT)/obj/lib_vendor/encoder.ko
WIFI_OUT := $(TARGET_OUT_INTERMEDIATES)/hardware/wifi