From cbea0cdfe46b67fb696b0a045e8ace7dddf4ca49 Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Sat, 1 Apr 2006 20:36:50 -0600 Subject: Split out PVR USB2 model 24xxx hardware support to a config option From: Mike Isely Since there are lingering stability problems with support of the newer PVR USB2 model 24xxx series hardware, I have isolate those changes with a config option. This commit leaves that option off. Signed-off-by: Mike Isely --- v4l/Make.config | 2 ++ v4l/Makefile | 9 +++++++++ 2 files changed, 11 insertions(+) (limited to 'v4l') diff --git a/v4l/Make.config b/v4l/Make.config index 7d8ae8e8d..98df1af83 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -20,6 +20,8 @@ CONFIG_VIDEO_ALSA := y CONFIG_VIDEO_ADV_DEBUG := y CONFIG_VIDEO_PVRUSB2 := m +CONFIG_VIDEO_PVRUSB2_SYSFS := y +CONFIG_VIDEO_PVRUSB2_DEBUGIFC := y CONFIG_VIDEO_IVTV := n diff --git a/v4l/Makefile b/v4l/Makefile index 0b14488ee..da000e5d6 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -74,6 +74,15 @@ pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ pvrusb2-sysfs.o pvrusb2-context.o pvrusb2-io.o \ pvrusb2-cx2584x-v4l.o pvrusb2-wm8775.o \ pvrusb2-ioread.o pvrusb2-debugifc.o +ifeq ($(CONFIG_VIDEO_PVRUSB2_SYSFS),y) + EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_SYSFS +endif +ifeq ($(CONFIG_VIDEO_PVRUSB2_DEBUGIFC),y) + EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_DEBUGIFC +endif +ifeq ($(CONFIG_VIDEO_PVRUSB2_24XXX),y) + EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_24XXX +endif dvb-firesat-objs := firesat.o avc_api.o cmp.o firesat-rc.o ivtv-objs := ivtv-driver.o ivtv-fileops.o ivtv-i2c.o ivtv-streams.o \ ivtv-firmware.o ivtv-reset.o ivtv-gpio.o ivtv-queue.o \ -- cgit v1.2.3 From b05a756090fe5f60143b64a780785ede6e8ac856 Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Sat, 1 Apr 2006 20:47:32 -0600 Subject: Move pvrusb2 config switches further down in v4l's Makefile From: Mike Isely Cosmetic change related to pvrusb2 to ease maintenance of the v4l build. Signed-off-by: Mike Isely --- v4l/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'v4l') diff --git a/v4l/Makefile b/v4l/Makefile index da000e5d6..3a26fbdbe 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -74,15 +74,6 @@ pvrusb2-objs := pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \ pvrusb2-sysfs.o pvrusb2-context.o pvrusb2-io.o \ pvrusb2-cx2584x-v4l.o pvrusb2-wm8775.o \ pvrusb2-ioread.o pvrusb2-debugifc.o -ifeq ($(CONFIG_VIDEO_PVRUSB2_SYSFS),y) - EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_SYSFS -endif -ifeq ($(CONFIG_VIDEO_PVRUSB2_DEBUGIFC),y) - EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_DEBUGIFC -endif -ifeq ($(CONFIG_VIDEO_PVRUSB2_24XXX),y) - EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_24XXX -endif dvb-firesat-objs := firesat.o avc_api.o cmp.o firesat-rc.o ivtv-objs := ivtv-driver.o ivtv-fileops.o ivtv-i2c.o ivtv-streams.o \ ivtv-firmware.o ivtv-reset.o ivtv-gpio.o ivtv-queue.o \ @@ -233,6 +224,17 @@ $(obj)/av7110_firm.h: $(obj)/fdump EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE endif +# for pvrusb2 +ifeq ($(CONFIG_VIDEO_PVRUSB2_SYSFS),y) + EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_SYSFS +endif +ifeq ($(CONFIG_VIDEO_PVRUSB2_DEBUGIFC),y) + EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_DEBUGIFC +endif +ifeq ($(CONFIG_VIDEO_PVRUSB2_24XXX),y) + EXTRA_CFLAGS += -DCONFIG_VIDEO_PVRUSB2_24XXX +endif + ifeq ($(ARCH),) ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ -- cgit v1.2.3 From 0f63e48ac1d9cbb7c9783b4c4ff4ce94e8ef34cb Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 2 Apr 2006 18:07:04 -0400 Subject: add missing modules to install target From: Michael Krufky - added dib3000-common.ko to inst_frontends - added dvb-usb-dibusb-common.ko to inst_dvb-usb Thanks to: Martin Dauskardt Signed-off-by: Michael Krufky --- v4l/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'v4l') diff --git a/v4l/Makefile b/v4l/Makefile index 3a26fbdbe..a66036f68 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -336,8 +336,8 @@ inst_em28xx := em28xx.ko inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko inst_frontends := cx22702.ko dvb-pll.ko lgdt330x.ko or51132.ko tda1004x.ko inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko -inst_frontends += nxt200x.ko cx24123.ko mt312.ko stv0299.ko -inst_frontends += bcm3510.ko dib3000mb.ko dib3000mc.ko ves1820.ko +inst_frontends += nxt200x.ko cx24123.ko mt312.ko stv0299.ko bcm3510.ko +inst_frontends += dib3000-common.ko dib3000mb.ko dib3000mc.ko ves1820.ko inst_frontends += cx22700.ko tda8083.ko ves1x93.ko stv0297.ko sp8870.ko inst_frontends += l64781.ko s5h1420.ko tda10021.ko at76c651.ko tda80xx.ko inst_frontends += stv0297_cs2.ko zl10353.ko @@ -346,8 +346,8 @@ inst_saa7146 := saa7146.ko saa7146_vv.ko inst_b2c2 := b2c2-flexcop.ko b2c2-flexcop-pci.ko b2c2-flexcop-usb.ko inst_cinergyT2 := cinergyT2.ko inst_dvb-usb := dvb-usb.ko dvb-usb-vp7045.ko dvb-usb-vp702x.ko -inst_dvb-usb += dvb-usb-dtt200u.ko dvb-usb-a800.ko dvb-usb-dibusb-mb.ko -inst_dvb-usb += dvb-usb-dibusb-mc.ko dvb-usb-nova-t-usb2.ko +inst_dvb-usb += dvb-usb-dtt200u.ko dvb-usb-a800.ko dvb-usb-nova-t-usb2.ko +inst_dvb-usb += dvb-usb-dibusb-common.ko dvb-usb-dibusb-mc.ko dvb-usb-dibusb-mb.ko inst_dvb-usb += dvb-usb-umt-010.ko dvb-usb-digitv.ko dvb-usb-cxusb.ko inst_pluto2 := pluto2.ko inst_ttpci := budget-core.ko budget.ko ttpci-eeprom.ko budget-av.ko -- cgit v1.2.3