From: Seung-Woo Kim Date: Wed, 2 Dec 2020 09:33:18 +0000 (+0900) Subject: amlogic: media_modules: demux: choose only one from sw/hw demux X-Git-Tag: submit/tizen/20201211.030542~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=586e646e459bc19f79589d1e4b1501d81ee7eb3a;p=platform%2Fkernel%2Flinux-amlogic.git amlogic: media_modules: demux: choose only one from sw/hw demux Amlogic dvb sw_demux and hw_demux have same exported symbols and it is used from dvb_ci. This causes warnings and dvb_ci.ko module dependency is only set to the first built module, so here is no need to build both demuxs. Choose only one from sw/hw demux explictly. Change-Id: Ib6cd7f5f3852e77fdacb0180471ce854e8b6f0b7 Signed-off-by: Seung-Woo Kim --- diff --git a/drivers/amlogic/media/Kconfig b/drivers/amlogic/media/Kconfig index 6159286a38d6..d772ce01c215 100644 --- a/drivers/amlogic/media/Kconfig +++ b/drivers/amlogic/media/Kconfig @@ -26,6 +26,25 @@ config AMLOGIC_DVB_COMPAT it is enabled by default,depending on AMLOGIC_DVB and DVB_CORE. +choice + bool "Amlogic demux" + default AMLOGIC_DVB_SW_DEMUX + depends on AMLOGIC_DVB && DVB_CORE + help + select amlogic demux between sw demux and hw demux. + +config AMLOGIC_DVB_SW_DEMUX + bool "Amlogic SW demux" + help + Support Amlogic DVB SW demux. + +config AMLOGIC_DVB_HW_DEMUX + bool "Amlogic HW demux" + help + Support Amlogic DVB HW demux. + +endchoice + endmenu diff --git a/drivers/amlogic/media_modules/stream_input/Makefile b/drivers/amlogic/media_modules/stream_input/Makefile index 6518166f9807..57f161173563 100644 --- a/drivers/amlogic/media_modules/stream_input/Makefile +++ b/drivers/amlogic/media_modules/stream_input/Makefile @@ -10,8 +10,8 @@ stream_input-objs += parser/psparser.o stream_input-objs += parser/rmparser.o stream_input-objs += subtitle/subtitle.o -obj-$(CONFIG_AMLOGIC_DVB) += parser/hw_demux/ -obj-$(CONFIG_AMLOGIC_DVB) += parser/demux/ +obj-$(CONFIG_AMLOGIC_DVB_HW_DEMUX) += parser/hw_demux/ +obj-$(CONFIG_AMLOGIC_DVB_SW_DEMUX) += parser/demux/ obj-$(CONFIG_AMLOGIC_DVB) += parser/dvb_ci/ #obj-y += tv_frontend/ # obj-y += box-frontend/avl6211/