[dahdi-commits] dahdi/linux.git branch "master" updated.

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  ee691c23f4069a1097cab8066c9787c68ee03ea8 (commit)
       via  9698657f7a5f60911a6d1be4ae0fcbd9c40d9580 (commit)
      from  79bf41ea8b69250984ff701f61bc97716e107cfb (commit)

Summary of changes:
 drivers/dahdi/xpp/firmwares/FPGA_1161.201.hex |    1 -
 drivers/dahdi/xpp/firmwares/Makefile          |    9 +++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit ee691c23f4069a1097cab8066c9787c68ee03ea8
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Mon Nov 17 18:00:51 2014 +0200

    xpp: firmware: a stray ^Z in FPGA_1161.201.hex

diff --git a/drivers/dahdi/xpp/firmwares/FPGA_1161.201.hex b/drivers/dahdi/xpp/firmwares/FPGA_1161.201.hex
index 2dd19ec..e63b7f1 100644
--- a/drivers/dahdi/xpp/firmwares/FPGA_1161.201.hex
+++ b/drivers/dahdi/xpp/firmwares/FPGA_1161.201.hex
@@ -20588,4 +20588,3 @@
 :1006200004000400040004000400040004000400AA
 :020630000400C4
 :00000001FF
-

commit 9698657f7a5f60911a6d1be4ae0fcbd9c40d9580
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Mon Nov 17 17:55:47 2014 +0200

    xpp: firmware: 203 as alias to (newer) 201
    
    Latest Astribank firmware (as of Rev. 11426 also supports some newer
    hardware types, which will have the ID 203. Anyone installing this newer
    version will now have 203 as an alias, but older versions will not have
    it.

diff --git a/drivers/dahdi/xpp/firmwares/Makefile b/drivers/dahdi/xpp/firmwares/Makefile
index f2be560..e176ef0 100644
--- a/drivers/dahdi/xpp/firmwares/Makefile
+++ b/drivers/dahdi/xpp/firmwares/Makefile
@@ -20,7 +20,12 @@ install:
 	mkdir -p $(TARGET)
 	install $(SCRIPTS) $(TARGET)/
 	install -m 644 ../XppConfig.pm $(FIRMWARES) $(TARGET)/
-	if [ ! -r $(TARGET)/USB_FW.202.hex ]; then \
-		ln -s USB_FW.201.hex $(TARGET)/USB_FW.202.hex;\
+	for id in 202 203; do \
+		if [ ! -r $(TARGET)/USB_FW.$$id.hex ]; then \
+			ln -s USB_FW.201.hex $(TARGET)/USB_FW.$$id.hex;\
+		fi; \
+	done
+	if [ ! -r $(TARGET)/FPGA_1161.203.hex ]; then \
+		ln -s FPGA_1161.201.hex $(TARGET)/FPGA_1161.203.hex;\
 	fi
 

-----------------------------------------------------------------------


-- 
dahdi/linux.git