diff options
| author | Wolfgang Wegner <w.wegner@astro-kom.de> | 2010-04-23 09:08:05 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-11-30 20:59:21 (GMT) |
| commit | b0bc8b70ff74501fd7a6e42013a4a7ea05cf6ade (patch) | |
| tree | f9f6c3ce2f1bd245b0fc6a71641169b739b22313 /drivers | |
| parent | c87f6457bb9cb465e9630b00b4c824847a62c6c5 (diff) | |
| download | u-boot-b0bc8b70ff74501fd7a6e42013a4a7ea05cf6ade.tar.xz | |
add Xilinx_abort_fn to Xilinx_Spartan3_Slave_Serial_fns
Currently the hardware was left in an undefined state in case Spartan3
serial load failed. This patch adds Xilinx_abort_fn to give the board
a possibility to clean up in this case.
Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/fpga/spartan3.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c index 7a89b56..1dd6f26 100644 --- a/drivers/fpga/spartan3.c +++ b/drivers/fpga/spartan3.c @@ -366,6 +366,8 @@ static int Spartan3_ss_load (Xilinx_desc * desc, void *buf, size_t bsize) CONFIG_FPGA_DELAY (); if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) { /* check the time */ puts ("** Timeout waiting for INIT to start.\n"); + if (*fn->abort) + (*fn->abort) (cookie); return FPGA_FAIL; } } while (!(*fn->init) (cookie)); @@ -380,6 +382,8 @@ static int Spartan3_ss_load (Xilinx_desc * desc, void *buf, size_t bsize) CONFIG_FPGA_DELAY (); if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) { /* check the time */ puts ("** Timeout waiting for INIT to clear.\n"); + if (*fn->abort) + (*fn->abort) (cookie); return FPGA_FAIL; } } while ((*fn->init) (cookie)); @@ -394,6 +398,8 @@ static int Spartan3_ss_load (Xilinx_desc * desc, void *buf, size_t bsize) while DONE is low (inactive) */ if ((*fn->done) (cookie) == 0 && (*fn->init) (cookie)) { puts ("** CRC error during FPGA load.\n"); + if (*fn->abort) + (*fn->abort) (cookie); return (FPGA_FAIL); } val = data [bytecount ++]; |