diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 21 | ||||
| -rwxr-xr-x | v4l/scripts/make_config_compat.pl | 7 | ||||
| -rwxr-xr-x | v4l/scripts/make_kconfig.pl | 5 | ||||
| -rwxr-xr-x | v4l/scripts/make_makefile.pl | 6 | ||||
| -rwxr-xr-x | v4l/scripts/strip-trailing-whitespaces.sh | 2 | ||||
| -rw-r--r-- | v4l/versions.txt | 6 |
6 files changed, 37 insertions, 10 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 52ca3ec54..512b355f4 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -48,6 +48,17 @@ default:: config-compat.h Makefile.media links oss firmware:: $(MAKE) -C firmware +v4l2-spec:: + $(MAKE) -C ../v4l2-spec + +dvb-spec:: + $(MAKE) -C ../dvb-spec/dvbapi + +spec:: v4l2-spec dvb-spec + +apps:: + $(MAKE) -C ../v4l2-apps + ################################################# # Object specific rules @@ -265,6 +276,7 @@ config-compat.h:: $(obj)/.version .myconfig scripts/make_config_compat.pl kernel-links makelinks:: cd ..; v4l/scripts/makelinks.sh $(SRCDIR) + ################################################# # Cardlist updating rule @@ -279,7 +291,10 @@ clean:: @find . -name '*.h' -type l -exec rm '{}' \; -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \ config-compat.h Module.symvers Module.markers modules.order - make -C firmware clean + $(MAKE) -C firmware $@ + $(MAKE) -C ../v4l2-spec $@ + $(MAKE) -C ../dvb-spec/dvbapi $@ + $(MAKE) -C ../v4l2-apps $@ distclean:: clean -rm -f .version .*.o.flags .*.o.d Makefile.media \ @@ -289,7 +304,9 @@ distclean:: clean -rm -f scripts/lxdialog scripts/kconfig oss @find .. -name '*.orig' -exec rm '{}' \; @find .. -name '*.rej' -exec rm '{}' \; - $(MAKE) -C firmware distclean + $(MAKE) -C firmware $@ + $(MAKE) -C ../v4l2-spec $@ + $(MAKE) -C ../v4l2-apps $@ ################################################# # Kernel module insert/removal rules diff --git a/v4l/scripts/make_config_compat.pl b/v4l/scripts/make_config_compat.pl index d24b5f718..423dcff77 100755 --- a/v4l/scripts/make_config_compat.pl +++ b/v4l/scripts/make_config_compat.pl @@ -277,6 +277,13 @@ open IN, "<$infile" or die "File not found: $infile"; $out.= "#ifndef __CONFIG_COMPAT_H__\n"; $out.= "#define __CONFIG_COMPAT_H__\n\n"; $out.= "#include <linux/autoconf.h>\n\n"; + +# mmdebug.h includes autoconf.h. So if this header exists, +# then include it before our config is set. +if (-f "$kdir/include/linux/mmdebug.h") { + $out.= "#include <linux/mmdebug.h>\n\n"; +} + while(<IN>) { next unless /^(\S+)\s*:= (\S+)$/; $out.= "#undef $1\n"; diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index 7c259eeb6..144325c34 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -537,6 +537,11 @@ if (!defined $kernopts{HAS_IOMEM} && cmp_ver($kernver, '2.6.22') < 0) { $kernopts{HAS_IOMEM} = 2; } +# Kernel < 2.6.22 is missing the HAS_DMA option +if (!defined $kernopts{HAS_DMA} && cmp_ver($kernver, '2.6.22') < 0) { + $kernopts{HAS_DMA} = 2; +} + # Kernel < 2.6.23 is missing the VIRT_TO_BUS option if (!defined $kernopts{VIRT_TO_BUS} && cmp_ver($kernver, '2.6.23') < 0) { # VIRT_TO_BUS -> !PPC64 diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl index 43c563d47..35ab7dddf 100755 --- a/v4l/scripts/make_makefile.pl +++ b/v4l/scripts/make_makefile.pl @@ -192,8 +192,6 @@ open_makefile('../linux/drivers/media/Makefile'); # Creating Install rule print OUT "media-install::\n"; -print OUT "\t\@echo \"Stripping debug info from files\"\n"; -print OUT "\t\@strip --strip-debug \$(inst-m)\n\n"; removeobsolete(); removeubuntu(); @@ -210,7 +208,9 @@ while (my ($dir, $files) = each %instdir) { print OUT "if [ \$\$n -eq 4 ]; then echo; echo -n \"\t\t\"; n=1; fi; "; print OUT "echo -n \"\$\$i \"; "; print OUT "install -m 644 -c \$\$i \$(DESTDIR)\$(KDIR26)/$dir; fi; done; "; - print OUT "if [ \$\$n -ne 0 ]; then echo; fi;\n\n"; + print OUT "if [ \$\$n -ne 0 ]; then echo; "; + print OUT "strip --strip-debug \$(DESTDIR)\$(KDIR26)/$dir/*.ko; "; + print OUT "fi;\n\n"; } print OUT "\t@echo\n"; print OUT "\t/sbin/depmod -a \$(KERNELRELEASE) \$(if \$(DESTDIR),-b \$(DESTDIR))\n\n"; diff --git a/v4l/scripts/strip-trailing-whitespaces.sh b/v4l/scripts/strip-trailing-whitespaces.sh index cb341ce76..def48a67d 100755 --- a/v4l/scripts/strip-trailing-whitespaces.sh +++ b/v4l/scripts/strip-trailing-whitespaces.sh @@ -21,7 +21,7 @@ fi for file in `eval $files`; do case "$file" in - *.patch) + *.gif | *.pdf | *.patch) continue ;; esac diff --git a/v4l/versions.txt b/v4l/versions.txt index b05ebdb0f..8435046c5 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -8,10 +8,6 @@ VIDEO_PXA27x [2.6.28] USB_STV06XX -[2.6.27] -# Needs struct pxa_dma_desc -VIDEO_PXA27x - [2.6.26] # Requires struct i2c_device_id VIDEO_TVP514X @@ -41,6 +37,8 @@ USB_SI470X USB_GSPCA_FINEPIX # uses linux/hid.h and struct delayed_work USB_SI470X +# due to INIT_WORK changes +USB_GSPCA_SQ905 [2.6.19] #This driver were developed at kernel 2.6.19, requiring vmalloc_user/remap_vmalloc_range |