[package] kernel: revert unrelated change in previous commit

[openwrt.git] / package / switch / Makefile

diff --git a/package/switch/Makefile b/package/switch/Makefile
index cdf1f51..17158da 100644 (file)
--- a/package/switch/Makefile
+++ b/package/switch/Makefile
@@ -1,27 +1,26 @@
 # 
 # 

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org

 #
 # 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$

 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=kmod-switch
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=kmod-switch

-PKG_RELEASE:=1
+PKG_RELEASE:=4

 
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/switch
   SUBMENU:=Other modules
 
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/switch
   SUBMENU:=Other modules

-  DEPENDS:=@TARGET_BRCM_2_4||TARGET_BRCM47XX
+  DEPENDS:=@TARGET_brcm47xx||TARGET_brcm63xx

   TITLE:=Switch drivers
   FILES:= \
   TITLE:=Switch drivers
   FILES:= \

-       $(PKG_BUILD_DIR)/switch-core.$(LINUX_KMOD_SUFFIX) \
-       $(PKG_BUILD_DIR)/switch-adm.$(LINUX_KMOD_SUFFIX) \
-       $(PKG_BUILD_DIR)/switch-robo.$(LINUX_KMOD_SUFFIX)
+       $(PKG_BUILD_DIR)/switch-core.ko \
+       $(PKG_BUILD_DIR)/switch-adm.ko \
+       $(PKG_BUILD_DIR)/switch-robo.ko

   AUTOLOAD:=$(call AutoLoad,20,switch-core switch-robo switch-adm)
 endef
 
   AUTOLOAD:=$(call AutoLoad,20,switch-core switch-robo switch-adm)
 endef
 


@@ -34,15 +33,10 @@ define Build/Prepare
        $(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
        $(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 

-ifeq ($(BOARD),brcm-2.4)
-  BUILDFLAGS := -DBROADCOM -DBCMDRIVER -I$(LINUX_DIR)/arch/mips/bcm947xx/include
-else
-  ifeq ($(BOARD),brcm47xx)
+ifeq ($(BOARD),brcm47xx)

     BUILDFLAGS := -DBROADCOM
     BUILDFLAGS := -DBROADCOM

-  endif

 endif
 
 endif
 

-

 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \


@@ -51,7 +45,16 @@ define Build/Compile
                EXTRA_CFLAGS="$(BUILDFLAGS)" \
                modules
 endef
                EXTRA_CFLAGS="$(BUILDFLAGS)" \
                modules
 endef

-       
+
+define Build/InstallDev
+       mkdir -p $(1)/usr/include
+       $(CP) ./src/switch-core.h $(1)/usr/include/
+endef
+
+define Build/UninstallDev
+       rm -f $(1)/usr/include/switch-core.h
+endef
+

 define KernelPackage/switch/install
        $(INSTALL_DIR) $(1)/lib/network/
        $(INSTALL_BIN) ./files/switch.sh $(1)/lib/network/
 define KernelPackage/switch/install
        $(INSTALL_DIR) $(1)/lib/network/
        $(INSTALL_BIN) ./files/switch.sh $(1)/lib/network/