[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2664-gd6d4d8b

[Fabien M <fa...@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  d6d4d8bba6f9b33caf6da28674384ee37f7cd3d8 (commit)
       via  586368c370ef3c00fa1a3eab181438ac80c040a0 (commit)
      from  2cc750fd3f6f5edf90cbd9ed9f45af9f5c72126a (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 d6d4d8bba6f9b33caf6da28674384ee37f7cd3d8
Merge: 586368c 2cc750f
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jan 11 09:51:19 2012 +0100

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 586368c370ef3c00fa1a3eab181438ac80c040a0
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Jan 11 09:50:49 2012 +0100

    [OTHER] Check if bitstream is in .bin format for APF51

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

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

diff --git a/target/linux/modules/fpga/dev_tools/loader/load_fpga b/target/linux/modules/fpga/dev_tools/loader/load_fpga
index 708d7df..d417e0f 100755
--- a/target/linux/modules/fpga/dev_tools/loader/load_fpga
+++ b/target/linux/modules/fpga/dev_tools/loader/load_fpga
@@ -2,6 +2,7 @@
 #
 # Loads APFxx's FPGA by using fpgaloader driver
 #
+PLATFORM=`cat /etc/machine`
 
 if [ "$1" == "" ]; then
 	echo "Usage: `basename $0` <filename>"
@@ -14,6 +15,13 @@ if [ ! -f "$1" ]; then
 	exit 1
 fi
 
+if [ "$PLATFORM" == "APF51" ]; then
+	if [ "${1#*.}" != "bin" ]; then
+		echo "Wrong bitstream format, binany *.bin format must be used."
+		exit 1
+	fi
+fi
+
 if [ ! -c /dev/fpgaloader ]; then
 	modprobe fpgaloader
 	if [ "$?" != 0 ]; then
@@ -32,7 +40,6 @@ while [ ! -c /dev/fpgaloader ]; do
 	fi
 done
 
-PLATFORM=`cat /etc/machine`
 if [ "$PLATFORM" == "APF51" ]; then
 	# On APF51 FPGA loading shares NAND bus so it's safer to load
 	# firmware from RAM


hooks/post-receive
-- 
armadeus