[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-385-g04e57a7

[jorasse <jo...@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  04e57a739c1a26cc53b5cfe64ba8c5a924b13f18 (commit)
      from  ff075adbaf92fa902faa4f41528f0bcdc1886273 (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 04e57a739c1a26cc53b5cfe64ba8c5a924b13f18
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Aug 14 23:21:19 2013 +0200

    [UBOOT] apf51: Fix FPGA capability to re-load firmware multiple time

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

Summary of changes:
 patches/u-boot/2013.04/401-apf51.patch |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/patches/u-boot/2013.04/401-apf51.patch b/patches/u-boot/2013.04/401-apf51.patch
index 4f72a79..721f89a 100644
--- a/patches/u-boot/2013.04/401-apf51.patch
+++ b/patches/u-boot/2013.04/401-apf51.patch
@@ -1230,7 +1230,7 @@ new file mode 100644
 index 0000000..665928e
 --- /dev/null
 +++ b/board/armadeus/apf51/fpga.c
-@@ -0,0 +1,256 @@
+@@ -0,0 +1,257 @@
 +/*
 + * (C) Copyright 2002-2010
 + * Nicolas Colombain <nic...@ar...>
@@ -1277,9 +1277,11 @@ index 0000000..665928e
 +#define		PRINTF(fmt, args...)
 +#endif
 +
-+u32 temp_clk;		/* use to restore the emi_clk_sel after donwload */
-+u32 temp_rcr1;
-+u32 temp_wcr1;
++static u32 temp_clk;		/* use to restore the emi_clk_sel after donwload */
++static u32 temp_rcr1;
++static u32 temp_wcr1;
++static u32 temp_data;
++static u32 temp_index;
 +
 +/* Note that these are pointers to code that is in Flash.  They will be
 + * relocated at runtime.
@@ -1319,6 +1321,7 @@ index 0000000..665928e
 +	struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE;
 +	struct weim *weim = (struct weim *)WEIM_BASE_ADDR;
 +
++	temp_index = 0;
 +	temp_rcr1 = readl(&weim->cs1rcr1);
 +	writel(0x01000010, &weim->cs1rcr1);
 +	temp_wcr1 = readl(&weim->cs1wcr1);
@@ -1423,22 +1426,20 @@ index 0000000..665928e
 +int fpga_wdata_fn(unsigned char data, int flush, int cookie)
 +{
 +	PRINTF("%s:%d: FPGA WRITE DATA %02X\n", __func__, __LINE__, data);
-+	static u32 temp;
-+	static u32 index;
 +
-+	switch (index++) {
++	switch (temp_index++) {
 +	case 0:
-+		temp = data << 8;
++		temp_data = data << 8;
 +		break;
 +	case 1:
-+		temp = temp + data;
++		temp_data = temp_data + data;
 +		break;
 +	case 2:
-+		temp = temp + (data << 24);
++		temp_data = temp_data + (data << 24);
 +		break;
 +	default:
-+		*((unsigned long *)ACFG_FPGA_WDATA) = temp + (data << 16);
-+		index = 0;
++		*((unsigned long *)ACFG_FPGA_WDATA) = temp_data + (data << 16);
++		temp_index = 0;
 +		break;
 +	}
 +


hooks/post-receive
-- 
armadeus