diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 37 | ||||
| -rwxr-xr-x | v4l/scripts/make_noconfig.pl | 3 | ||||
| -rw-r--r-- | v4l/versions.txt | 22 |
3 files changed, 53 insertions, 9 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index f9c6fe516..8e4170277 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -21,14 +21,45 @@ default:: Makefile.media links .version EXTRA_CFLAGS += -DDVB_CVS=1 EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ + +ifeq ($(CONFIG_VIDEO_ADV_DEBUG),y) + EXTRA_CFLAGS += -DCONFIG_VIDEO_ADV_DEBUG=1 +endif + +ifeq ($(CONFIG_XC3028),m) + EXTRA_CFLAGS += -DCONFIG_XC3028=1 +endif + ifeq ($(CONFIG_DVB_FIRESAT),m) EXTRA_CFLAGS += -I$(srctree)/drivers/ieee1394/ endif +ifeq ($(CONFIG_VIDEO_CX88_DVB),m) + EXTRA_CFLAGS += -DCONFIG_VIDEO_CX88_DVB_MODULE=1 + EXTRA_CFLAGS += -DHAVE_CX22702=1 + EXTRA_CFLAGS += -DHAVE_OR51132=1 + EXTRA_CFLAGS += -DHAVE_LGDT330X=1 + EXTRA_CFLAGS += -DHAVE_MT352=1 + EXTRA_CFLAGS += -DHAVE_ZL10353=1 + EXTRA_CFLAGS += -DHAVE_NXT200X=1 + EXTRA_CFLAGS += -DHAVE_CX24123=1 + EXTRA_CFLAGS += -DHAVE_VP3054_I2C=1 +endif + +ifeq ($(CONFIG_VIDEO_SAA7134_DVB),m) + EXTRA_CFLAGS += -DHAVE_MT352=1 + EXTRA_CFLAGS += -DHAVE_TDA1004X=1 + EXTRA_CFLAGS += -DHAVE_NXT200X=1 +endif + ifeq ($(CONFIG_VIDEO_BUF_DVB),m) EXTRA_CFLAGS += -DHAVE_VIDEO_BUF_DVB=1 endif +ifeq ($(CONFIG_DVB_AV7110_OSD),y) + EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_OSD=1 +endif + ifeq ($(CONFIG_DVB_AV7110_FIRMWARE),y) EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE endif @@ -200,6 +231,12 @@ config:: links .version $(KDIR)/scripts/kconfig/conf Kconfig ./scripts/make_noconfig.pl +menuconfig:: links .version + ./scripts/make_kconfig.pl + -ln -s /usr/src/linux-2.6.16/scripts/kconfig scripts/ + $(KDIR)/scripts/kconfig/mconf Kconfig + ./scripts/make_noconfig.pl + allmodconfig:: links .version ./scripts/make_kconfig.pl $(KDIR)/scripts/kconfig/conf -m Kconfig diff --git a/v4l/scripts/make_noconfig.pl b/v4l/scripts/make_noconfig.pl index 503653a4f..a47ca4acf 100755 --- a/v4l/scripts/make_noconfig.pl +++ b/v4l/scripts/make_noconfig.pl @@ -55,6 +55,9 @@ close IN; open OUT,">.myconfig"; while ( my ($key, $value) = each(%config) ) { + if ($value eq "y") { + $value="m"; + } printf OUT "%-44s := %s\n",$key,$value; } close OUT; diff --git a/v4l/versions.txt b/v4l/versions.txt index 49622b7b9..255a31b17 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -3,12 +3,24 @@ # This is broken for a long time VIDEO_ZR36120 -# Those are architecture-dependent +# This is also marked as broken VIDEO_PLANB + +# Those are architecture-dependent VIDEO_VINO VIDEO_M32R_AR_M64278 [2.6.16] +VIDEO_USBVIDEO +USB_VICAM +USB_IBMCAM +USB_KONICAWC +USB_ET61X251 +USB_PWC +USB_SN9C102 +USB_ZC0301 + +[2.6.14] VIDEO_ZORAN VIDEO_ZORAN_BUZ VIDEO_ZORAN_DC10 @@ -62,14 +74,6 @@ RADIO_TYPHOON_PORT RADIO_TYPHOON_MUTEFREQ RADIO_ZOLTRIX RADIO_ZOLTRIX_PORT -VIDEO_USBVIDEO -USB_VICAM -USB_IBMCAM -USB_KONICAWC -USB_ET61X251 -USB_PWC -USB_SN9C102 -USB_ZC0301 [2.6.12] VIDEO_VIVI |