generic: merge mips multi machine update to generic patches for 2.6.33

[openwrt.git] / package / broadcom-diag / Makefile

diff --git a/package/broadcom-diag/Makefile b/package/broadcom-diag/Makefile
index c414c3d..e9113c4 100644 (file)
--- a/package/broadcom-diag/Makefile
+++ b/package/broadcom-diag/Makefile
@@ -1,26 +1,22 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 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:=broadcom-diag
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-diag

-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
+PKG_RELEASE:=8

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

-  DEPENDS:=@LINUX_2_4_BRCM||LINUX_2_6_BRCM||LINUX_2_6_BRCM47XX
+  DEPENDS:=@TARGET_brcm_2_4||TARGET_brcm47xx

   TITLE:=Driver for router LEDs and Buttons
   TITLE:=Driver for router LEDs and Buttons

-  VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)

   FILES:=$(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX)
 endef
 
   FILES:=$(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX)
 endef
 


@@ -29,8 +25,8 @@ define Build/Prepare
        $(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
        $(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 

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

 endif
 
 define Build/Compile
 endif
 
 define Build/Compile


@@ -41,5 +37,5 @@ define Build/Compile
                EXTRA_CFLAGS="$(BUILDFLAGS)" \
                modules
 endef
                EXTRA_CFLAGS="$(BUILDFLAGS)" \
                modules
 endef

-       
+

 $(eval $(call KernelPackage,diag))
 $(eval $(call KernelPackage,diag))