summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2020-04-04 03:29:20 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2020-04-14 02:11:04 (GMT)
commitdb449239d4e20ce701ca19e696e79072ae3b6253 (patch)
tree66db51bc08d097b43e25d7c4efcaf9287f222d7a
parentdd005336ccd66aab2d8183975bb98e31f6b08dac (diff)
downloadmedia_modules-db449239d4e20ce701ca19e696e79072ae3b6253.zip
media_modules-db449239d4e20ce701ca19e696e79072ae3b6253.tar.gz
media_modules-db449239d4e20ce701ca19e696e79072ae3b6253.tar.bz2
media_modules: support standalone build for R [2/3]
PD#SWPL-23425 Problem: need to support modules standalone build Solution: support modules standalone build Verify: franklin Change-Id: Ie7e305701ec80e055c2fe13554eeac3ac70f6f5f Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>
Diffstat
-rw-r--r--Makefile45
-rw-r--r--drivers/frame_provider/decoder/h265/vh265.c2
-rw-r--r--drivers/stream_input/amports/amstream.c2
-rw-r--r--drivers/stream_input/parser/demux/aml_dsc.c2
-rw-r--r--drivers/stream_input/parser/dvb_ci/cimax/aml_cimax_usb.c4
5 files changed, 50 insertions, 5 deletions
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..4b56afb
--- a/dev/null
+++ b/Makefile
@@ -0,0 +1,45 @@
+
+CONFIGS := CONFIG_AMLOGIC_MEDIA_VDEC_MPEG12=m \
+ CONFIG_AMLOGIC_MEDIA_VDEC_MPEG2_MULTI=m \
+ CONFIG_AMLOGIC_MEDIA_VDEC_MPEG4=m \
+ CONFIG_AMLOGIC_MEDIA_VDEC_MPEG4_MULTI=m \
+ CONFIG_AMLOGIC_MEDIA_VDEC_VC1=m \
+ CONFIG_AMLOGIC_MEDIA_VDEC_H264=m \
+ CONFIG_AMLOGIC_MEDIA_VDEC_H264_MULTI=m \
+ CONFIG_AMLOGIC_MEDIA_VDEC_H264_MVC=m \
+ CONFIG_AMLOGIC_MEDIA_VDEC_H265=m \
+ CONFIG_AMLOGIC_MEDIA_VDEC_VP9=m \
+ CONFIG_AMLOGIC_MEDIA_VDEC_MJPEG=m \
+ CONFIG_AMLOGIC_MEDIA_VDEC_MJPEG_MULTI=m \
+ CONFIG_AMLOGIC_MEDIA_VDEC_REAL=m \
+ CONFIG_AMLOGIC_MEDIA_VDEC_AVS=m \
+ CONFIG_AMLOGIC_MEDIA_VDEC_AVS2=m \
+ CONFIG_AMLOGIC_MEDIA_VENC_H264=m \
+ CONFIG_AMLOGIC_MEDIA_VENC_H265=m \
+ CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION=y \
+ CONFIG_AMLOGIC_MEDIA_GE2D=y \
+ CONFIG_AMLOGIC_MEDIA_VENC_MULTI=m \
+ CONFIG_AMLOGIC_MEDIA_VENC_JPEG=m
+
+EXTRA_INCLUDE := -I$(KERNEL_SRC)/$(M)/drivers/include
+
+CONFIGS_BUILD := -Wno-parentheses-equality -Wno-pointer-bool-conversion \
+ -Wno-unused-const-variable -Wno-typedef-redefinition \
+ -Wno-logical-not-parentheses -Wno-sometimes-uninitialized \
+ -Wno-frame-larger-than=
+
+
+modules:
+ $(MAKE) -C $(KERNEL_SRC) M=$(M)/drivers modules "EXTRA_CFLAGS+=-I$(INCLUDE) -Wno-error $(CONFIGS_BUILD) $(EXTRA_INCLUDE)" $(CONFIGS)
+
+all: modules
+
+modules_install:
+ $(MAKE) INSTALL_MOD_STRIP=1 M=$(M)/drivers -C $(KERNEL_SRC) modules_install
+ mkdir -p ${OUT_DIR}/../vendor_lib/modules
+ cd ${OUT_DIR}/$(M)/; find -name "*.ko" -exec cp {} ${OUT_DIR}/../vendor_lib/modules/ \;
+ mkdir -p ${OUT_DIR}/../vendor_lib/firmware/video
+ cp $(KERNEL_SRC)/$(M)/firmware/* ${OUT_DIR}/../vendor_lib/firmware/video/
+
+clean:
+ $(MAKE) -C $(KERNEL_SRC) M=$(M) clean
diff --git a/drivers/frame_provider/decoder/h265/vh265.c b/drivers/frame_provider/decoder/h265/vh265.c
index 323fc00..4edefe1 100644
--- a/drivers/frame_provider/decoder/h265/vh265.c
+++ b/drivers/frame_provider/decoder/h265/vh265.c
@@ -6927,7 +6927,7 @@ static int hevc_slice_segment_header_process(struct hevc_state_s *hevc,
/**/
/* if((iPrevPOC != curr_POC)){ */
if (rpm_param->p.slice_segment_address == 0) {
- struct PIC_s *pic;
+ struct PIC_s *pic = NULL;
hevc->new_pic = 1;
#ifdef MULTI_INSTANCE_SUPPORT
diff --git a/drivers/stream_input/amports/amstream.c b/drivers/stream_input/amports/amstream.c
index 9322290..b1c74ed 100644
--- a/drivers/stream_input/amports/amstream.c
+++ b/drivers/stream_input/amports/amstream.c
@@ -3862,7 +3862,7 @@ static ssize_t canuse_buferlevel_store(struct class *class,
if (ret != 0)
return -EINVAL;
- val = val;
+ (void)val;
reset_canuse_buferlevel(val);
return size;
}
diff --git a/drivers/stream_input/parser/demux/aml_dsc.c b/drivers/stream_input/parser/demux/aml_dsc.c
index 032c5e7..ab63845 100644
--- a/drivers/stream_input/parser/demux/aml_dsc.c
+++ b/drivers/stream_input/parser/demux/aml_dsc.c
@@ -706,7 +706,7 @@ static int _dsc_set_key(struct DescChannel *ch, int flags, enum ca_cw_type type,
return -1;
}
swdmx_desc_channel_set_algo(ch->chan, ch->algo);
- swdmx_desc_channel_set_param(ch->chan, SWDMX_AES_CBC_PARAM_ALIGN, SWDMX_DESC_ALIGN_HEAD);
+ swdmx_desc_channel_set_param(ch->chan, SWDMX_AES_CBC_PARAM_ALIGN, (u8*)SWDMX_DESC_ALIGN_HEAD);
}
if (type == CA_CW_AES_EVEN) {
swdmx_desc_channel_set_param(ch->chan, SWDMX_AES_CBC_PARAM_EVEN_KEY, key);
diff --git a/drivers/stream_input/parser/dvb_ci/cimax/aml_cimax_usb.c b/drivers/stream_input/parser/dvb_ci/cimax/aml_cimax_usb.c
index a45655e..bb0c71f 100644
--- a/drivers/stream_input/parser/dvb_ci/cimax/aml_cimax_usb.c
+++ b/drivers/stream_input/parser/dvb_ci/cimax/aml_cimax_usb.c
@@ -1188,7 +1188,7 @@ int cimax_usb_dev_add(struct device_s *dev, int id)
if (!g_usb)
return 0;
- id = id;
+ (void)id;
cimax_usb_device_open(dev);
cimax_usb_select_interface(dev, 3);
@@ -1227,7 +1227,7 @@ int cimax_usb_dev_remove(struct device_s *dev, int id)
pr_dbg("dev remove\n");
if (!g_usb)
return 0;
- id = id;
+ (void)id;
pr_dbg("setup poll -> stop\n");
cimax_usb_setup_poll(g_usb, STOP_MODE);
pr_dbg("setup poll end\n");