Remove LINUX_2_6 dependency from qc-usb

[openwrt.git] / package / qc-usb / Makefile

diff --git a/package/qc-usb/Makefile b/package/qc-usb/Makefile
index 3ae5061..ff41469 100644 (file)
--- a/package/qc-usb/Makefile
+++ b/package/qc-usb/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id: $
+# $Id$

 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk


@@ -35,38 +35,44 @@ define Package/qc-usb-utils/description
  These programs are completely useless without a qc-usb-modules package.
 endef
 
  These programs are completely useless without a qc-usb-modules package.
 endef
 

-define KernelPackage/usb-qc
+define KernelPackage/video-quickcam

 $(call Package/qc-usb/Default)
 $(call Package/qc-usb/Default)

-  TITLE:=Support for USB QuickCam Express webcam
-  SUBMENU:=USB Support
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT kmod-usb-core +kmod-videodev
+  SUBMENU:=Video Support
+  TITLE:=QuickCam Express USB webcam support
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core kmod-video-core

   FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,quickcam)
 endef
 
   FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,quickcam)
 endef
 

-define KernelPackage/usb-qc/description
+define KernelPackage/video-quickcam/description

  Kernel support for Logitech's QuickCam Express webcam and other webcams 
  with similar chipsets.
 endef
 
  Kernel support for Logitech's QuickCam Express webcam and other webcams 
  with similar chipsets.
 endef
 

-ifneq ($(CONFIG_PACKAGE_kmod-usb-qc),)
+ifeq ($(KERNEL),2.4)
+  ifeq ($(LINUX_KARCH),i386)
+    KERNEL_C_OPTS:= -Os -mpreferred-stack-boundary=2 -march=i486 -fno-unit-at-a-time
+  endif
+  ifeq ($(LINUX_KARCH),mips)
+    KERNEL_C_OPTS:= -Os -G 0 -mlong-calls -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap
+  endif
+endif
+
+ifneq ($(CONFIG_PACKAGE_kmod-video-quickcam),)

   define Build/Compile/kmod
   define Build/Compile/kmod

-       $(MAKE) -C $(LINUX_DIR) \
-               PATH="$(TARGET_PATH)" \
-                KVER="$(LINUX_VERSION)" \
-               KERNELRELEASE="$(LINUX_VERSION)" \
-                KSRC="$(LINUX_DIR)" \
-                SUBDIRS="$(PKG_BUILD_DIR)" \
-                KERNEL_DIR="$(KERNEL_DIR)" \
-                ARCH="$(LINUX_KARCH)" \
-                CROSS_COMPILE="$(TARGET_CROSS)" \
-               modules
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               LINUX_DIR="$(LINUX_DIR)" \
+               ARCH="$(LINUX_KARCH)" \
+               CROSS_COMPILE="$(TARGET_CROSS)" \
+               CC="$(TARGET_CC)" \
+               LD="$(TARGET_CC) -nodefaultlibs -nostartfiles" \
+               USER_OPT="$(KERNEL_C_OPTS)" \
+               quickcam.$(LINUX_KMOD_SUFFIX)

   endef
 endif
 
 define Build/Compile
        $(call Build/Compile/kmod)
   endef
 endif
 
 define Build/Compile
        $(call Build/Compile/kmod)

-

        $(MAKE) -C $(PKG_BUILD_DIR) \
                CFLAGS="$(TARGET_CFLAGS)" \
                qcset
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CFLAGS="$(TARGET_CFLAGS)" \
                qcset


@@ -78,4 +84,4 @@ define Package/qc-usb-utils/install
 endef
 
 $(eval $(call BuildPackage,qc-usb-utils))
 endef
 
 $(eval $(call BuildPackage,qc-usb-utils))

-$(eval $(call KernelPackage,usb-qc))
+$(eval $(call KernelPackage,video-quickcam))