[PATCH 3/3] backports: add media subsystem drivers
From: "Luis R. Rodriguez" This adds backport support for all media subsystem drivers. This is enabled only for >= 3.2. Signed-off-by: Luis R. Rodriguez --- .blacklist.map |9 + backport/Makefile.kernel |7 + backport/Makefile.real |1 + backport/defconfigs/media | 506 copy-list | 17 + dependencies |3 + lib/blacklist.sh | 35 ++ .../media/0001-media_entity_info.patch | 67 +++ 8 files changed, 645 insertions(+) create mode 100644 .blacklist.map create mode 100644 backport/defconfigs/media create mode 100755 lib/blacklist.sh create mode 100644 patches/collateral-evolutions/media/0001-media_entity_info.patch diff --git a/.blacklist.map b/.blacklist.map new file mode 100644 index 000..84847e7 --- /dev/null +++ b/.blacklist.map @@ -0,0 +1,9 @@ +# Update this map when a driver gets renamed or +# symbols from old drivers get moved to a newer +# driver. If you have the driver on the right +# hand side it will be blacklisted upon installation +# only if you actually installed the driver on the +# left. + +# new-driver old-driver +videodev v4l2-compat-ioctl32 diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel index 3b2c1a4..5075e1d 100644 --- a/backport/Makefile.kernel +++ b/backport/Makefile.kernel @@ -7,6 +7,12 @@ NOSTDINC_FLAGS := \ -I$(M)/include/ \ -I$(M)/include/uapi \ -I$(M)/include/drm \ + -I$(M)/drivers/media/dvb-core/ \ + -I$(M)/drivers/media/tuners/ \ + -I$(M)/drivers/media/dvb-frontends/ \ + -I$(M)/drivers/media/common/siano/ \ + -I$(M)/drivers/media/common/b2c2/ \ + -I$(M)/drivers/media/pci/bt8xx/ \ -include $(M)/include/linux/compat-2.6.h \ $(call backport-cc-disable-warning, unused-but-set-variable) \ $(CFLAGS) @@ -24,3 +30,4 @@ obj-$(CPTCFG_BCMA) += drivers/bcma/ obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/ obj-$(CPTCFG_DRM) += drivers/gpu/drm/ obj-$(CPTCFG_REGULATOR) += drivers/regulator/ +obj-$(CPTCFG_MEDIA_SUPPORT) += drivers/media/ diff --git a/backport/Makefile.real b/backport/Makefile.real index 954fc86..7b3fcc1 100644 --- a/backport/Makefile.real +++ b/backport/Makefile.real @@ -82,6 +82,7 @@ install: modules @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_PWD) \ INSTALL_MOD_DIR=$(KMODDIR) $(KMODPATH_ARG) \ modules_install + @./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR) @/sbin/depmod -ae @echo @echo Your backported driver modules should be installed now. diff --git a/backport/defconfigs/media b/backport/defconfigs/media new file mode 100644 index 000..cbaf99f --- /dev/null +++ b/backport/defconfigs/media @@ -0,0 +1,506 @@ +CPTCFG_DVB_A8293=y +CPTCFG_DVB_AF9013=y +CPTCFG_DVB_AF9033=y +CPTCFG_DVB_ATBM8830=y +CPTCFG_DVB_AU8522=y +CPTCFG_DVB_AU8522_DTV=y +CPTCFG_DVB_AU8522_V4L=y +CPTCFG_DVB_AV7110=y +CPTCFG_DVB_B2C2_FLEXCOP=y +CPTCFG_DVB_B2C2_FLEXCOP_PCI=y +CPTCFG_DVB_B2C2_FLEXCOP_USB=y +CPTCFG_DVB_BCM3510=y +CPTCFG_DVB_BT8XX=y +CPTCFG_DVB_BUDGET=y +CPTCFG_DVB_BUDGET_AV=y +CPTCFG_DVB_BUDGET_CI=y +CPTCFG_DVB_BUDGET_CORE=y +CPTCFG_DVB_BUDGET_PATCH=y +CPTCFG_DVB_CORE=y +CPTCFG_DVB_CX22700=y +CPTCFG_DVB_CX22702=y +CPTCFG_DVB_CX24110=y +CPTCFG_DVB_CX24116=y +CPTCFG_DVB_CX24123=y +CPTCFG_DVB_CXD2820R=y +CPTCFG_DVB_DDBRIDGE=y +CPTCFG_DVB_DIB3000MB=y +CPTCFG_DVB_DIB3000MC=y +CPTCFG_DVB_DIB7000M=y +CPTCFG_DVB_DIB7000P=y +CPTCFG_DVB_DIB8000=y +CPTCFG_DVB_DIB9000=y +CPTCFG_DVB_DM1105=y +CPTCFG_DVB_DRXD=y +CPTCFG_DVB_DRXK=y +CPTCFG_DVB_DS3000=y +CPTCFG_DVB_DUMMY_FE=y +CPTCFG_DVB_EC100=y +CPTCFG_DVB_FIREDTV=y +CPTCFG_DVB_FIREDTV_INPUT=y +CPTCFG_DVB_HD29L2=y +CPTCFG_DVB_HOPPER=y +CPTCFG_DVB_ISL6405=y +CPTCFG_DVB_ISL6421=y +CPTCFG_DVB_ISL6423=y +CPTCFG_DVB_IT913X_FE=y +CPTCFG_DVB_IX2505V=y +CPTCFG_DVB_L64781=y +CPTCFG_DVB_LG2160=y +CPTCFG_DVB_LGDT3305=y +CPTCFG_DVB_LGDT330X=y +CPTCFG_DVB_LGS8GL5=y +CPTCFG_DVB_LGS8GXX=y +CPTCFG_DVB_LNBP21=y +CPTCFG_DVB_LNBP22=y +CPTCFG_DVB_M88RS2000=y +CPTCFG_DVB_MANTIS=y +CPTCFG_DVB_MB86A16=y +CPTCFG_DVB_MB86A20S=y +CPTCFG_DVB_MT312=y +CPTCFG_DVB_MT352=y +CPTCFG_DVB_NGENE=y +CPTCFG_DVB_NXT200X=y +CPTCFG_DVB_NXT6000=y +CPTCFG_DVB_OR51132=y +CPTCFG_DVB_OR51211=y +CPTCFG_DVB_PLL=y +CPTCFG_DVB_PLUTO2=y +CPTCFG_DVB_PT1=y +CPTCFG_DVB_RTL2830=y +CPTCFG_DVB_RTL2832=y +CPTCFG_DVB_S5H1409=y +CPTCFG_DVB_S5H1411=y +CPTCFG_DVB_S5H1420=y +CPTCFG_DVB_S5H1432=y +CPTCFG_DVB_S921=y +CPTCFG_DVB_SI21XX=y +CPTCFG_DVB_SP8870=y +CPTCFG_DVB_SP887X=y +CPTCFG_DVB_STB0899=y +CPTCFG_DVB_STB6000=y +CPTCFG_DVB_STB6100=y +CPTCFG_DVB_STV0288=y +CPTCFG_DVB_STV0297=y +CPTCFG_DVB_STV0299=y +CPTCFG_DVB_STV0367=y +CPTCFG_DVB_STV0900=y +CPTCFG_DVB_STV090x=y +CPTCFG_DVB_STV6110=y +CPTCFG_DVB_STV6110x=y
[PATCH 3/3] backports: add media subsystem drivers
From: Luis R. Rodriguez mcg...@do-not-panic.com This adds backport support for all media subsystem drivers. This is enabled only for = 3.2. Signed-off-by: Luis R. Rodriguez mcg...@do-not-panic.com --- .blacklist.map |9 + backport/Makefile.kernel |7 + backport/Makefile.real |1 + backport/defconfigs/media | 506 copy-list | 17 + dependencies |3 + lib/blacklist.sh | 35 ++ .../media/0001-media_entity_info.patch | 67 +++ 8 files changed, 645 insertions(+) create mode 100644 .blacklist.map create mode 100644 backport/defconfigs/media create mode 100755 lib/blacklist.sh create mode 100644 patches/collateral-evolutions/media/0001-media_entity_info.patch diff --git a/.blacklist.map b/.blacklist.map new file mode 100644 index 000..84847e7 --- /dev/null +++ b/.blacklist.map @@ -0,0 +1,9 @@ +# Update this map when a driver gets renamed or +# symbols from old drivers get moved to a newer +# driver. If you have the driver on the right +# hand side it will be blacklisted upon installation +# only if you actually installed the driver on the +# left. + +# new-driver old-driver +videodev v4l2-compat-ioctl32 diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel index 3b2c1a4..5075e1d 100644 --- a/backport/Makefile.kernel +++ b/backport/Makefile.kernel @@ -7,6 +7,12 @@ NOSTDINC_FLAGS := \ -I$(M)/include/ \ -I$(M)/include/uapi \ -I$(M)/include/drm \ + -I$(M)/drivers/media/dvb-core/ \ + -I$(M)/drivers/media/tuners/ \ + -I$(M)/drivers/media/dvb-frontends/ \ + -I$(M)/drivers/media/common/siano/ \ + -I$(M)/drivers/media/common/b2c2/ \ + -I$(M)/drivers/media/pci/bt8xx/ \ -include $(M)/include/linux/compat-2.6.h \ $(call backport-cc-disable-warning, unused-but-set-variable) \ $(CFLAGS) @@ -24,3 +30,4 @@ obj-$(CPTCFG_BCMA) += drivers/bcma/ obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/ obj-$(CPTCFG_DRM) += drivers/gpu/drm/ obj-$(CPTCFG_REGULATOR) += drivers/regulator/ +obj-$(CPTCFG_MEDIA_SUPPORT) += drivers/media/ diff --git a/backport/Makefile.real b/backport/Makefile.real index 954fc86..7b3fcc1 100644 --- a/backport/Makefile.real +++ b/backport/Makefile.real @@ -82,6 +82,7 @@ install: modules @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_PWD) \ INSTALL_MOD_DIR=$(KMODDIR) $(KMODPATH_ARG) \ modules_install + @./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR) @/sbin/depmod -ae @echo @echo Your backported driver modules should be installed now. diff --git a/backport/defconfigs/media b/backport/defconfigs/media new file mode 100644 index 000..cbaf99f --- /dev/null +++ b/backport/defconfigs/media @@ -0,0 +1,506 @@ +CPTCFG_DVB_A8293=y +CPTCFG_DVB_AF9013=y +CPTCFG_DVB_AF9033=y +CPTCFG_DVB_ATBM8830=y +CPTCFG_DVB_AU8522=y +CPTCFG_DVB_AU8522_DTV=y +CPTCFG_DVB_AU8522_V4L=y +CPTCFG_DVB_AV7110=y +CPTCFG_DVB_B2C2_FLEXCOP=y +CPTCFG_DVB_B2C2_FLEXCOP_PCI=y +CPTCFG_DVB_B2C2_FLEXCOP_USB=y +CPTCFG_DVB_BCM3510=y +CPTCFG_DVB_BT8XX=y +CPTCFG_DVB_BUDGET=y +CPTCFG_DVB_BUDGET_AV=y +CPTCFG_DVB_BUDGET_CI=y +CPTCFG_DVB_BUDGET_CORE=y +CPTCFG_DVB_BUDGET_PATCH=y +CPTCFG_DVB_CORE=y +CPTCFG_DVB_CX22700=y +CPTCFG_DVB_CX22702=y +CPTCFG_DVB_CX24110=y +CPTCFG_DVB_CX24116=y +CPTCFG_DVB_CX24123=y +CPTCFG_DVB_CXD2820R=y +CPTCFG_DVB_DDBRIDGE=y +CPTCFG_DVB_DIB3000MB=y +CPTCFG_DVB_DIB3000MC=y +CPTCFG_DVB_DIB7000M=y +CPTCFG_DVB_DIB7000P=y +CPTCFG_DVB_DIB8000=y +CPTCFG_DVB_DIB9000=y +CPTCFG_DVB_DM1105=y +CPTCFG_DVB_DRXD=y +CPTCFG_DVB_DRXK=y +CPTCFG_DVB_DS3000=y +CPTCFG_DVB_DUMMY_FE=y +CPTCFG_DVB_EC100=y +CPTCFG_DVB_FIREDTV=y +CPTCFG_DVB_FIREDTV_INPUT=y +CPTCFG_DVB_HD29L2=y +CPTCFG_DVB_HOPPER=y +CPTCFG_DVB_ISL6405=y +CPTCFG_DVB_ISL6421=y +CPTCFG_DVB_ISL6423=y +CPTCFG_DVB_IT913X_FE=y +CPTCFG_DVB_IX2505V=y +CPTCFG_DVB_L64781=y +CPTCFG_DVB_LG2160=y +CPTCFG_DVB_LGDT3305=y +CPTCFG_DVB_LGDT330X=y +CPTCFG_DVB_LGS8GL5=y +CPTCFG_DVB_LGS8GXX=y +CPTCFG_DVB_LNBP21=y +CPTCFG_DVB_LNBP22=y +CPTCFG_DVB_M88RS2000=y +CPTCFG_DVB_MANTIS=y +CPTCFG_DVB_MB86A16=y +CPTCFG_DVB_MB86A20S=y +CPTCFG_DVB_MT312=y +CPTCFG_DVB_MT352=y +CPTCFG_DVB_NGENE=y +CPTCFG_DVB_NXT200X=y +CPTCFG_DVB_NXT6000=y +CPTCFG_DVB_OR51132=y +CPTCFG_DVB_OR51211=y +CPTCFG_DVB_PLL=y +CPTCFG_DVB_PLUTO2=y +CPTCFG_DVB_PT1=y +CPTCFG_DVB_RTL2830=y +CPTCFG_DVB_RTL2832=y +CPTCFG_DVB_S5H1409=y +CPTCFG_DVB_S5H1411=y +CPTCFG_DVB_S5H1420=y +CPTCFG_DVB_S5H1432=y +CPTCFG_DVB_S921=y +CPTCFG_DVB_SI21XX=y +CPTCFG_DVB_SP8870=y +CPTCFG_DVB_SP887X=y +CPTCFG_DVB_STB0899=y +CPTCFG_DVB_STB6000=y +CPTCFG_DVB_STB6100=y +CPTCFG_DVB_STV0288=y +CPTCFG_DVB_STV0297=y +CPTCFG_DVB_STV0299=y +CPTCFG_DVB_STV0367=y +CPTCFG_DVB_STV0900=y +CPTCFG_DVB_STV090x=y