[Armadeus-commitlog] SF.net SVN: armadeus:[1200] trunk/buildroot/target

[<Fa...@us...>]

Revision: 1200
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1200&view=rev
Author:   FabM
Date:     2009-04-03 16:52:18 +0000 (Fri, 03 Apr 2009)

Log Message:
-----------
[U-BOOT] Release FPGA_RESET at the end of configuration, wait for DONE to stop toggling clock and ignore firmware size

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/apf27/apf27.h
    trunk/buildroot/target/u-boot/u-boot-1.3.4-310-apf27.patch

Added Paths:
-----------
    trunk/buildroot/target/u-boot/u-boot-1.3.4-320-spartan.patch

Modified: trunk/buildroot/target/device/armadeus/apf27/apf27.h
===================================================================
--- trunk/buildroot/target/device/armadeus/apf27/apf27.h	2009-04-03 16:28:17 UTC (rev 1199)
+++ trunk/buildroot/target/device/armadeus/apf27/apf27.h	2009-04-03 16:52:18 UTC (rev 1200)
@@ -545,8 +545,7 @@
 #define CFG_ENV_RANGE       0X00060000  /* 384kB ( 3 flash blocks )  */
 #define	CONFIG_ENV_OVERWRITE	1		/* env is writable now   */
 #define	CONFIG_FIRMWARE_OFFSET	0x00100000
-//#define	CONFIG_FIRMWARE_LEN	0x00080000	/* 512kB ( 4 flash blocks )  */
-#define	CONFIG_FIRMWARE_LEN	0x000249F0	/* 150kB  for 200k*/
+#define	CONFIG_FIRMWARE_LEN	0x00080000	/* 512kB ( 4 flash blocks )  */
 #define	CONFIG_KERNEL_OFFSET	0x00180000
 #define	CONFIG_KERNEL_LEN	0x00500000	/* 5.0MB */
 #define	CONFIG_ROOTFS_OFFSET	0x00680000

Modified: trunk/buildroot/target/u-boot/u-boot-1.3.4-310-apf27.patch
===================================================================
--- trunk/buildroot/target/u-boot/u-boot-1.3.4-310-apf27.patch	2009-04-03 16:28:17 UTC (rev 1199)
+++ trunk/buildroot/target/u-boot/u-boot-1.3.4-310-apf27.patch	2009-04-03 16:52:18 UTC (rev 1200)
@@ -417,11 +417,11 @@
 + {
 + 	PRINTF ("%s:%d: FPGA POST ", __FUNCTION__, __LINE__);
 + 
-+ 	GPIO_CLEAR(CFG_FPGA_RESET);	
 + 	imx_gpio_mode (CFG_FPGA_RW | GPIO_PF | GPIO_PUEN);
 + 	imx_gpio_mode (CFG_FPGA_CS | GPIO_PF | GPIO_PUEN);
 + 	imx_gpio_mode (CFG_FPGA_CLK | GPIO_PF | GPIO_PUEN);
 + 	GPIO_SET(CFG_FPGA_PRG);	
++ 	GPIO_CLEAR(CFG_FPGA_RESET);	
 + 	imx_gpio_mode (CFG_FPGA_RESET | GPIO_OUT | GPIO_PUEN | GPIO_GPIO);
 + 	return cookie;
 + }

Added: trunk/buildroot/target/u-boot/u-boot-1.3.4-320-spartan.patch
===================================================================
--- trunk/buildroot/target/u-boot/u-boot-1.3.4-320-spartan.patch	                        (rev 0)
+++ trunk/buildroot/target/u-boot/u-boot-1.3.4-320-spartan.patch	2009-04-03 16:52:18 UTC (rev 1200)
@@ -0,0 +1,34 @@
+diff -purN /home/fabien/apf27/buildroot/project_build_armv5te/apf27/u-boot-1.3.4/common/spartan3.c /home/fabien/tmp/spartan3.c
+--- ref/u-boot-1.3.4/common/spartan3.c	2006-11-02 15:15:01.000000000 +0100
++++ u-boot-1.3.4/common/spartan3.c	2006-11-25 22:48:54.000000000 +0100
+@@ -220,7 +220,7 @@ static int Spartan3_sp_load (Xilinx_desc
+ 		(*fn->clk) (TRUE, TRUE, cookie);	/* Assert the clock pin */
+ 
+ 		/* Load the data */
+-		while (bytecount < bsize) {
++		while ( (*fn->done) (cookie) == FPGA_FAIL){
+ 			/* XXX - do we check for an Ctrl-C press in here ??? */
+ 			/* XXX - Check the error bit? */
+ 
+@@ -230,8 +230,8 @@ static int Spartan3_sp_load (Xilinx_desc
+ 			CONFIG_FPGA_DELAY ();
+ 			(*fn->clk) (TRUE, TRUE, cookie);	/* Assert the clock pin */
+ 
+-#ifdef CFG_FPGA_CHECK_BUSY
+ 			ts = get_timer (0);	/* get current time */
++#ifdef CFG_FPGA_CHECK_BUSY
+ 			while ((*fn->busy) (cookie)) {
+ 				/* XXX - we should have a check in here somewhere to
+ 				 * make sure we aren't busy forever... */
+@@ -248,6 +248,11 @@ static int Spartan3_sp_load (Xilinx_desc
+ 				}
+ 			}
+ #endif
++			if (get_timer (ts) > CFG_FPGA_WAIT) {	/* check the time */
++				puts ("** Timeout waiting for BUSY to clear.\n");
++				(*fn->abort) (cookie);	/* abort the burn */
++				return FPGA_FAIL;
++			}
+ 
+ #ifdef CFG_FPGA_PROG_FEEDBACK
+ 			if (bytecount % (bsize / 40) == 0)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.