[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-100-gfd13881

[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  fd138818bafd8a0f5d19c994a509d72f382e9b7d (commit)
      from  52dceeef8c0448fd76393ef989171770a3082d13 (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 fd138818bafd8a0f5d19c994a509d72f382e9b7d
Author: Nicolas Colombain <nic...@ar...>
Date:   Mon May 2 15:00:33 2011 +0200

    [TOOLS] change fpga loader version and avoid test of init after download (copy of uboot procedure)

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

Summary of changes:
 .../modules/fpga/dev_tools/loader/fpga-loader.c    |    2 +-
 .../fpga/dev_tools/loader/xilinx-fpga-loader.c     |    6 ------
 2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/target/linux/modules/fpga/dev_tools/loader/fpga-loader.c b/target/linux/modules/fpga/dev_tools/loader/fpga-loader.c
index f950207..b49b01f 100644
--- a/target/linux/modules/fpga/dev_tools/loader/fpga-loader.c
+++ b/target/linux/modules/fpga/dev_tools/loader/fpga-loader.c
@@ -33,7 +33,7 @@
 #include "xilinx-fpga-loader.h"
 
 
-#define DRIVER_VERSION		"0.91"
+#define DRIVER_VERSION		"0.92"
 #define DRIVER_NAME		"fpgaloader"
 #define FPGA_PROC_DIRNAME	"driver/fpga"
 #define FPGA_PROC_FILENAME	FPGA_PROC_DIRNAME "/loader"
diff --git a/target/linux/modules/fpga/dev_tools/loader/xilinx-fpga-loader.c b/target/linux/modules/fpga/dev_tools/loader/xilinx-fpga-loader.c
index 4897f88..84c2afd 100644
--- a/target/linux/modules/fpga/dev_tools/loader/xilinx-fpga-loader.c
+++ b/target/linux/modules/fpga/dev_tools/loader/xilinx-fpga-loader.c
@@ -290,12 +290,6 @@ static int spartan_parallel_finish(struct fpga_desc *desc)
 				return -ETIMEDOUT;
 			}
 		}
-		/* Spartan signals an error if INIT goes low (active) */
-		if (!(*fn->init)()) {
-			printk("** CRC error during FPGA load.\n");
-			(*fn->abort) ();	/* abort the burn */
-			return -ETIMEDOUT;
-		}
 		(*fn->cs) (0);	/* Deassert the chip select */
 		(*fn->wr) (0);	/* Deassert the write pin */
 		(*fn->post) (); /* release resources */


hooks/post-receive
-- 
armadeus