add annex a and annex b version of sangam atm driver/firmware

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1568 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 30 insertions, 8 deletions

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index cb642f7e1..1fa905042 100644
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -58,13 +58,23 @@ config BR2_LINUX_2_4_SOEKRIS
 
 comment "Kernel Modules"
 
-config BR2_PACKAGE_KMOD_SANGAM_ATM
-	tristate "AR7 Sangam ADSL Driver"
+config BR2_PACKAGE_KMOD_SANGAM_ATM_A
+	tristate "AR7 Sangam ADSL Driver (Annex A)"
+	default m
+	depends BR2_LINUX_2_4_AR7
+	select BR2_PACKAGE_KMOD_ATM
+	help
+	  ATM driver for the Sangam ADSL chip on AR7
+	  Annex A version
+
+config BR2_PACKAGE_KMOD_SANGAM_ATM_B
+	tristate "AR7 Sangam ADSL Driver (Annex B)"
 	default y
 	depends BR2_LINUX_2_4_AR7
 	select BR2_PACKAGE_KMOD_ATM
 	help
 	  ATM driver for the Sangam ADSL chip on AR7
+	  Annex B version
 
 config BR2_PACKAGE_KMOD_CPMAC
 	tristate "AR7 CPMAC Network Driver"
diff --git a/openwrt/target/linux/control/kmod-sangam-atm.control b/openwrt/target/linux/control/kmod-sangam-atm-annex-a.control
index b9d8fe19d..8406d7034 100644
--- a/openwrt/target/linux/control/kmod-sangam-atm.control
+++ b/openwrt/target/linux/control/kmod-sangam-atm-annex-a.control
@@ -1,6 +1,6 @@
-Package: kmod-sangam-atm
+Package: kmod-sangam-atm-annex-a
 Priority: optional
 Section: sys
 Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
 Source: buildroot internal
-Description: AR7 Sangam ATM/ADSL driver
+Description: AR7 Sangam ATM/ADSL driver (Annex A version)
diff --git a/openwrt/target/linux/control/kmod-sangam-atm-annex-b.control b/openwrt/target/linux/control/kmod-sangam-atm-annex-b.control
new file mode 100644
index 000000000..487fe88fb
--- /dev/null
+++ b/openwrt/target/linux/control/kmod-sangam-atm-annex-b.control
@@ -0,0 +1,6 @@
+Package: kmod-sangam-atm-annex-b
+Priority: optional
+Section: sys
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: AR7 Sangam ATM/ADSL driver (Annex B version)
diff --git a/openwrt/target/linux/linux-2.4/ar7.mk b/openwrt/target/linux/linux-2.4/ar7.mk
index a4aa76fd4..be64b1d65 100644
--- a/openwrt/target/linux/linux-2.4/ar7.mk
+++ b/openwrt/target/linux/linux-2.4/ar7.mk
@@ -7,9 +7,9 @@
 
 DOWNLOAD_SITE=http://openwrt.org/downloads/sources
 # extracted from netgear DG834B V1.0.5 GPL release
-ATM_FIRMWARE_DIR=sangam-atm-firmware-0.1
+ATM_FIRMWARE_DIR=sangam-atm-firmware-0.2
 ATM_FIRMWARE_FILE=$(ATM_FIRMWARE_DIR).tar.gz
-ATM_FIRMWARE_MD5SUM=dc1be257dcb536b6fa02a02c81956e7e
+ATM_FIRMWARE_MD5SUM=0e37eb105070cd7296ff6d5ae29325b1
 
 $(DL_DIR)/$(ATM_FIRMWARE_FILE):
 	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(ATM_FIRMWARE_FILE) $(ATM_FIRMWARE_MD5SUM) $(DOWNLOAD_SITE)
@@ -24,10 +24,16 @@ $(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked
 	touch $@
 
 
-$(eval $(call KMOD_template,SANGAM_ATM,sangam-atm,\
+$(eval $(call KMOD_template,SANGAM_ATM_A,sangam-atm-annex-a,\
 	$(MODULES_DIR)/kernel/drivers/atm/tiatm.o \
 ,CONFIG_MIPS_SANGAM_ATM,kmod-atm,60,tiatm, \
-	cp $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/*.bin $$(I_SANGAM_ATM)/lib/modules/ \
+	cp $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/ar0700xx_a.bin $$(I_SANGAM_ATM_A)/lib/modules/ar0700xx.bin \
+))
+
+$(eval $(call KMOD_template,SANGAM_ATM_B,sangam-atm-annex-b,\
+	$(MODULES_DIR)/kernel/drivers/atm/tiatm.o \
+,CONFIG_MIPS_SANGAM_ATM,kmod-atm,60,tiatm, \
+	cp $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/ar0700xx_b.bin $$(I_SANGAM_ATM_B)/lib/modules/ar0700xx.bin \
 ))
 
 $(eval $(call KMOD_template,CPMAC,cpmac,\