[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-481-gad95ac1

[Nicolas <th...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  ad95ac1866cc55a170e834bde1f86901dc3f4fc8 (commit)
      from  604ae41797e8371d575cd3fcffa9e8f7ad29d01b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ad95ac1866cc55a170e834bde1f86901dc3f4fc8
Author: Nicolas Colombain <nic...@ar...>
Date:   Thu Nov 6 11:55:53 2014 +0100

    [LINUX] add apf6SP support to load_fpga

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

Summary of changes:
 .../linux/modules/fpga/dev_tools/loader/load_fpga  |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/target/linux/modules/fpga/dev_tools/loader/load_fpga b/target/linux/modules/fpga/dev_tools/loader/load_fpga
index 379ca63..26bc844 100755
--- a/target/linux/modules/fpga/dev_tools/loader/load_fpga
+++ b/target/linux/modules/fpga/dev_tools/loader/load_fpga
@@ -15,6 +15,17 @@ if [ ! -f "$1" ]; then
 	exit 1
 fi
 
+if [ "$PLATFORM" == "APF6" ]; then
+	DEVLOADER=/dev/altera_cvp
+	major=`grep -w altera_cvp /proc/devices | cut -f1 -d" "`
+	if [ ! -e /dev/altera_cvp ]; then	
+		mknod /dev/altera_cvp c $major 0
+	fi
+	modprobe fpgaloader
+else
+	DEVLOADER=/dev/fpgaloader
+fi
+
 if [ "$PLATFORM" == "APF51" ]; then
 	filename="$1"
 	ext=${filename/*./}
@@ -24,7 +35,7 @@ if [ "$PLATFORM" == "APF51" ]; then
 	fi
 fi
 
-if [ ! -c /dev/fpgaloader ]; then
+if [ ! -c $DEVLOADER ]; then
 	modprobe fpgaloader
 	if [ "$?" != 0 ]; then
 		echo "Failed to modprobe FPGA loader driver. Please check your config !"
@@ -33,7 +44,7 @@ if [ ! -c /dev/fpgaloader ]; then
 fi
 
 timeout=0
-while [ ! -c /dev/fpgaloader ]; do
+while [ ! -c $DEVLOADER ]; do
 	usleep 1000
 	let timeout=timeout+1
 	if [ $timeout -gt 100 ]; then
@@ -56,7 +67,7 @@ else
 	BITFILE=$1
 fi
 
-dd if=$BITFILE of=/dev/fpgaloader
+dd if=$BITFILE of=$DEVLOADER
 RES=$?
 
 if [ "$PLATFORM" == "APF51" ]; then


hooks/post-receive
-- 
armadeus