V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
This commit is contained in:
Matthias Fuchs 2009-02-15 22:29:15 +01:00 committed by Wolfgang Denk
parent 3818b67764
commit 670cbde8da
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/fpga/spartan3.c
View File

@ -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. * Run the post configuration function if there is one.
*/ */
if (*fn->post) { if (*fn->post)
(*fn->post) (cookie); (*fn->post) (cookie);
}
else {
#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
if (ret_val == FPGA_SUCCESS)
puts ("Done.\n");
else
puts ("Fail.\n"); puts ("Fail.\n");
#endif #endif
}
} else { } else {
printf ("%s: NULL Interface function table!\n", __FUNCTION__); 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. * Run the post configuration function if there is one.
*/ */
if (*fn->post) { if (*fn->post)
(*fn->post) (cookie); (*fn->post) (cookie);
}
#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
if (ret_val == FPGA_SUCCESS) { if (ret_val == FPGA_SUCCESS)
puts ("Done.\n"); puts ("Done.\n");
} else
else {
puts ("Fail.\n"); puts ("Fail.\n");
}
#endif #endif
} else { } else {