summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-31 11:12:10 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-31 11:12:10 +0000
commitc3d9a7dba18bfaeaeb683d51bce2a20845b7fbcb (patch)
treec138f55076b893e79f93a36f6ec82f10609bb55d
parent5efdbb7a7b8fc8978ff1c05713dc00553d3327fc (diff)
[ifxmips] fix licensing issues of ifxmips dsl driver
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20636 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/ifxmips-dsl-api/Config.in7
-rw-r--r--package/ifxmips-dsl-api/Makefile19
-rw-r--r--package/ifxmips-dsl-control/Makefile2
3 files changed, 26 insertions, 2 deletions
diff --git a/package/ifxmips-dsl-api/Config.in b/package/ifxmips-dsl-api/Config.in
index f27181e313..56177d1689 100644
--- a/package/ifxmips-dsl-api/Config.in
+++ b/package/ifxmips-dsl-api/Config.in
@@ -17,6 +17,13 @@ config IFXMIPS_ANNEX_B
endchoice
+config IFXMIPS_DSL_FIRMWARE
+ bool "ifxmips-dsl firmware extractor"
+ default y
+ depends on PACKAGE_kmod-ifxmips-dsl-api
+ help
+ Say Y, if you need ifxmips-dsl to auto extract the firmware for you from the a800 firmware image
+
config IFXMIPS_DSL_DEBUG
bool "ifxmips-dsl debugging"
depends on PACKAGE_kmod-ifxmips-dsl-api
diff --git a/package/ifxmips-dsl-api/Makefile b/package/ifxmips-dsl-api/Makefile
index 3fc31eda43..b1952b5edc 100644
--- a/package/ifxmips-dsl-api/Makefile
+++ b/package/ifxmips-dsl-api/Makefile
@@ -34,7 +34,7 @@ define KernelPackage/ifxmips-dsl-api
TITLE:=DSL CPE API driver
URL:=http://www.infineon.com/
MAINTAINER:=Infineon Technologies AG / Lantiq / blogic@openwrt.org
- DEPENDS:=@TARGET_ifxmips
+ DEPENDS:=@TARGET_ifxmips @BROKEN
FILES:=$(PKG_BUILD_DIR)/src/mei/ifxmips_mei.$(LINUX_KMOD_SUFFIX) \
$(PKG_BUILD_DIR)/src/drv_dsl_cpe_api.$(LINUX_KMOD_SUFFIX) \
$(PKG_BUILD_DIR)/src/mei/ifxmips_atm.$(LINUX_KMOD_SUFFIX)
@@ -57,6 +57,17 @@ define KernelPackage/ifxmips-dsl-api/config
source "$(SOURCE)/Config.in"
endef
+ifeq ($(CONFIG_IFXMIPS_DSL_FIRMWARE),y)
+FW_FILE:=arcor_A800_452CPW_FW_1.02.206(20081201).bin
+define Download/firmware
+ URL:=http://www.arcor.de/hilfe/files/pdf/
+ FILE=$(FW_FILE)
+ MD5SUM:=19d9af4e369287a0f0abaed415cdac10
+endef
+$(eval $(call Download,firmware))
+
+else
+
define Download/annex-a
FILE:=$(FW_BASE_NAME)_a-$(FW_A_VER).tar.gz
URL:=http://mirror2.openwrt.org/sources/
@@ -70,6 +81,7 @@ define Download/annex-b
MD5SUM:=$(FW_B_MD5)
endef
$(eval $(call Download,annex-b))
+endif
IFX_DSL_MAX_DEVICE=1
IFX_DSL_LINES_PER_DEVICE=1
@@ -145,7 +157,12 @@ endef
define KernelPackage/ifxmips-dsl-api/install
$(INSTALL_DIR) $(1)/lib/firmware/
+ifeq ($(CONFIG_IFXMIPS_DSL_FIRMWARE),y)
+ $(PLATFORM_DIR)/extract.sh $(DL_DIR) '$(FW_FILE)'
+ $(CP) $(DL_DIR)/dsl_$(if $(CONFIG_IFXMIPS_ANNEX_A),a,b).bin $(1)/lib/firmware/ModemHWE.bin
+else
$(CP) $(PKG_BUILD_DIR)/$(FW_BASE_NAME)_$(if $(CONFIG_IFXMIPS_ANNEX_A),a_$(FW_A_FILE_VER),b_$(FW_B_FILE_VER)).bin $(1)/lib/firmware/ModemHWE.bin
+endif
endef
$(eval $(call KernelPackage,ifxmips-dsl-api))
diff --git a/package/ifxmips-dsl-control/Makefile b/package/ifxmips-dsl-control/Makefile
index 035deada14..bd35d2f9c3 100644
--- a/package/ifxmips-dsl-control/Makefile
+++ b/package/ifxmips-dsl-control/Makefile
@@ -24,7 +24,7 @@ define Package/ifxmips-dsl-control
TITLE:=DSL CPE control application
URL:=http://www.infineon.com/
MAINTAINER:=Infineon Technologies AG / Lantiq / blogic@openwrt.org
- DEPENDS:=+kmod-ifxmips-dsl-api +libpthread
+ DEPENDS:=+kmod-ifxmips-dsl-api +libpthread @BROKEN
endef
define Package/ifxmips-dsl-control/description