diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-29 09:03:11 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-29 09:03:11 -0400 |
commit | 92430b8fc8aac3b4ab92e9ca8a09d83c4788c609 (patch) | |
tree | 741586740ac365252852d8dcdbbedf9e57d2b81d /drivers/fpga/socfpga_arria10.c | |
parent | ad4a699cfe36639979d27a1045d766397b2cb0bb (diff) | |
parent | a89c2adc3d2834a7c79c1685155a8b8952cf77f4 (diff) |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-socfpga
- Various gen5 fixes
Diffstat (limited to 'drivers/fpga/socfpga_arria10.c')
-rw-r--r-- | drivers/fpga/socfpga_arria10.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c index 285280e507f..5fb9d6a1911 100644 --- a/drivers/fpga/socfpga_arria10.c +++ b/drivers/fpga/socfpga_arria10.c @@ -936,10 +936,11 @@ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size) fpgamgr_program_write(rbf_data, rbf_size); status = fpgamgr_program_finish(); - if (status) { - config_pins(gd->fdt_blob, "fpga"); - puts("FPGA: Enter user mode.\n"); - } + if (status) + return status; + + config_pins(gd->fdt_blob, "fpga"); + puts("FPGA: Enter user mode.\n"); return status; } |