X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/38b25a187b7c5a833e6d8e5ba215f25043d2d3ab..ca93116b8d8097330d718e820c26ade1343622dd:/package/ifx-vmmc/Makefile

diff --git a/package/ifx-vmmc/Makefile b/package/ifx-vmmc/Makefile
index 945d5ba7e..1cce8555e 100644
--- a/package/ifx-vmmc/Makefile
+++ b/package/ifx-vmmc/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,12 +10,14 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=drv_vmmc
 PKG_VERSION:=1.7.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MD5SUM:=3f1b44e79408a3320aa9f8b21a260fd0
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 
+PATCH_DIR ?= ./patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/ifx-vmmc
@@ -24,8 +26,9 @@ define KernelPackage/ifx-vmmc
   URL:=http://www.lantiq.com/
   MAINTAINER:=Lantiq
   DEPENDS:=+kmod-ifx-tapi @BROKEN
-  FILES:=$(PKG_BUILD_DIR)/src/drv_vmmc.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(PKG_BUILD_DIR)/src/drv_vmmc.ko
   AUTOLOAD:=$(call AutoLoad,25,drv_vmmc)
+  MENU:=1
 endef
 
 define KernelPackage/ifx-vmmc/description
@@ -33,9 +36,7 @@ define KernelPackage/ifx-vmmc/description
 endef
 
 define KernelPackage/ifx-vmmc/config
-	if PACKAGE_kmod-ifx-vmmc
-		source "$(SOURCE)/Config.in"
-	endif
+	source "$(SOURCE)/Config.in"
 endef
 
 CONFIGURE_ARGS += \
@@ -71,6 +72,7 @@ FW_DIR:=lib/firmware
 ifeq ($(CONFIG_VOICE_CPE_VMMC_WITH_DEVICE_DANUBE_extract),y)
   CONFIGURE_ARGS += --with-device=DANUBE
   FW_TARGET:=danube_firmware.bin
+  FW_SOURCE:=danube_firmware.bin
   FW_URL:=http://www.arcor.de/hilfe/files/pdf/
   FW_FILE=arcor_A800_452CPW_FW_1.02.206(20081201).bin
   FW_MD5SUM:=19d9af4e369287a0f0abaed415cdac10
@@ -81,6 +83,7 @@ endif
 
 ifeq ($(CONFIG_VOICE_CPE_VMMC_WITH_DEVICE_DANUBE),y)
   CONFIGURE_ARGS += --with-device=DANUBE
+  FW_SOURCE:=voip_R12.1.0.1.0-enc.bin
   FW_TARGET:=danube_firmware.bin
   FW_FILE=fw_voip_danube-12.1.0.1.0.tar.gz
   FW_MD5SUM:=51868b88dee9dbc65d3dbba355ded91c
@@ -101,9 +104,9 @@ endif
 
 ifeq ($(CONFIG_VOICE_CPE_VMMC_WITH_DEVICE_DANUBE_extract),y)
 define Download/decode
-  FILE:=ifxmips_fw_decode.tar.bz2
+  FILE:=ifxmips_fw_decodev2.tar.bz2
   URL:=http://downloads.openwrt.org/sources/
-  MD5SUM:=1197ff6cace6a7c86492a468f5fbfe07
+  MD5SUM:=9f4ebfae5cb9d9e8fca46057a653ae27
 endef
 $(eval $(call Download,decode))
 endif
@@ -151,7 +154,7 @@ endef
 define KernelPackage/ifx-vmmc/install
 	$(INSTALL_DIR) $(1)/etc/init.d $(1)/$(FW_DIR)
 	$(INSTALL_BIN) ./files/vmmc.init $(1)/etc/init.d/vmmc
-	$(CP) $(PKG_BUILD_DIR)/firmware/$(FW_TARGET) $(1)/$(FW_DIR)/$(FW_TARGET)
+	$(CP) $(PKG_BUILD_DIR)/firmware/$(FW_SOURCE) $(1)/$(FW_DIR)/$(FW_TARGET)
 	$(CP) $(PKG_BUILD_DIR)/coef/$(COEF_TARGET) $(1)/$(FW_DIR)/$(COEF_TARGET)
 endef