Skip to contentSkip to conversation

fpga: Fix Spartan III FPGA booting

PATCH New Matthias Fuchs 2 participants 2 messages Feb 15, 2009 – Feb 21, 2009 FPGA manager framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fpga: Fix Spartan III FPGA booting

This patch does some minor fixing of the Xilinx Spartan III FPGA boot code:

- Fixed call order of post configuration callback and success message printing (result of copy-paste?)
- remove obsolete comment
- minor coding style cleanup

---
 drivers/fpga/spartan3.c |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)
drivers/fpga/spartan3.c +7 -15
index 9ce41f1..8bb2449 100644
@@ -281,23 +281,18 @@ static int Spartan3_sp_load (Xilinx_desc * desc, void *buf, size_t bsize)
 			}
 		}
 
-		if (ret_val == FPGA_SUCCESS) {
-#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
-			puts ("Done.\n");
-#endif
-		}
 		/*
 		 * Run the post configuration function if there is one.
 		 */
-		if (*fn->post) {
+		if (*fn->post)
 			(*fn->post) (cookie);
-		}
 
-		else {
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
+		if (ret_val == FPGA_SUCCESS)
+			puts ("Done.\n");
+		else
 			puts ("Fail.\n");
 #endif
-		}
 
 	} else {
 		printf ("%s: NULL Interface function table!\n", __FUNCTION__);
@@ -567,17 +562,14 @@ static int Spartan3_ss_load (Xilinx_desc * desc, void *buf, size_t bsize)
 		/*
 		 * Run the post configuration function if there is one.
 		 */
-		if (*fn->post) {
+		if (*fn->post)
 			(*fn->post) (cookie);
-		}
 
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
-		if (ret_val == FPGA_SUCCESS) {
+		if (ret_val == FPGA_SUCCESS)
 			puts ("Done.\n");
-		}
-		else {
+		else
 			puts ("Fail.\n");
-		}
 #endif
 
 	} else {
Signature · 1 line
1.5.6.3
#1 lore raw

PATCH 1/1 fpga: Fix Spartan III FPGA booting

Dear Matthias Fuchs,

Quoted 8 lines · In message <[email protected]> you wrote:

This patch does some minor fixing of the Xilinx Spartan III FPGA boot code:

- Fixed call order of post configuration callback and success message printing (result of copy-paste?)
- remove obsolete comment
- minor coding style cleanup

Quoted 4 lines
---
 drivers/fpga/spartan3.c |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
When you die, the first thing you lose is your life. The  next  thing
is the illusions.                       - Terry Pratchett, _Pyramids_