summaryrefslogtreecommitdiff
authorNanxin Qin <nanxin.qin@amlogic.com>2017-09-08 10:06:37 (GMT)
committer Sandy Luo <sandy.luo@amlogic.com>2017-09-14 11:25:56 (GMT)
commit1826574311f5422eb9239313d77f68f03b3c53dd (patch)
treeceb0b2c655360293379e791dcf5d435c1e45e72e
parentd9af1e8708d073b2737ae697d86f208eb989450e (diff)
downloadamlogic-o-1826574311f5422eb9239313d77f68f03b3c53dd.zip
amlogic-o-1826574311f5422eb9239313d77f68f03b3c53dd.tar.gz
amlogic-o-1826574311f5422eb9239313d77f68f03b3c53dd.tar.bz2
common: add the tee moudule. [3/3]
PD#150739: add tee moudule. Change-Id: If214d4296ddee687a8301892138d7af49ca3b5e1 Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
Diffstat
-rw-r--r--common/media_modules.mk22
-rw-r--r--p212/Kernel.mk23
-rw-r--r--p230/Kernel.mk23
3 files changed, 28 insertions, 40 deletions
diff --git a/common/media_modules.mk b/common/media_modules.mk
index 6c1410c..5b1e264 100644
--- a/common/media_modules.mk
+++ b/common/media_modules.mk
@@ -1 +1,23 @@
+
+DEFAULT_MEDIA_KERNEL_MODULES := \
+ $(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/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
+
include hardware/amlogic/media_modules/Media.mk
diff --git a/p212/Kernel.mk b/p212/Kernel.mk
index e62e052..2b1cf1b 100644
--- a/p212/Kernel.mk
+++ b/p212/Kernel.mk
@@ -34,26 +34,9 @@ TARGET_AMLOGIC_INT_RECOVERY_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Ima
BOARD_VENDOR_KERNEL_MODULES := \
$(PRODUCT_OUT)/obj/lib_vendor/audio_data.ko \
$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/ddr_window_64.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/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
+ $(PRODUCT_OUT)/obj/lib_vendor/ddr_window_64.ko
+
+BOARD_VENDOR_KERNEL_MODULES += $(DEFAULT_MEDIA_KERNEL_MODULES)
WIFI_OUT := $(TARGET_OUT_INTERMEDIATES)/hardware/wifi
diff --git a/p230/Kernel.mk b/p230/Kernel.mk
index 8982dc7..6660ff9 100644
--- a/p230/Kernel.mk
+++ b/p230/Kernel.mk
@@ -33,26 +33,9 @@ TARGET_AMLOGIC_INT_RECOVERY_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Ima
BOARD_VENDOR_KERNEL_MODULES := \
$(PRODUCT_OUT)/obj/lib_vendor/audio_data.ko \
$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko \
- $(PRODUCT_OUT)/obj/lib_vendor/ddr_window_64.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/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
+ $(PRODUCT_OUT)/obj/lib_vendor/ddr_window_64.ko
+
+BOARD_VENDOR_KERNEL_MODULES += $(DEFAULT_MEDIA_KERNEL_MODULES)
WIFI_OUT := $(TARGET_OUT_INTERMEDIATES)/hardware/wifi