diff options
| author | Tom Rini <trini@konsulko.com> | 2018-10-31 17:15:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-31 17:15:55 -0400 |
| commit | fdaccfeb5e03e18c05be386b8a7c6be02be2cf15 (patch) | |
| tree | 0379c34582486705e60c9308202a3b1a6e5ed389 /drivers | |
| parent | a744370e6f1a4b8f8b578ce41ca2416e8c232c5b (diff) | |
| parent | f48db4ede07b52290477e188de714e327e4954de (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/fpga/socfpga_arria10.c | 2 | ||||
| -rw-r--r-- | drivers/fpga/socfpga_gen5.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c index d6b59498e5..114dd910ab 100644 --- a/drivers/fpga/socfpga_arria10.c +++ b/drivers/fpga/socfpga_arria10.c @@ -453,7 +453,7 @@ int fpgamgr_program_finish(void) */ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size) { - unsigned long status; + int status; /* disable all signals from hps peripheral controller to fpga */ writel(0, &system_manager_base->fpgaintf_en_global); diff --git a/drivers/fpga/socfpga_gen5.c b/drivers/fpga/socfpga_gen5.c index 184de743fd..6d16e0b37f 100644 --- a/drivers/fpga/socfpga_gen5.c +++ b/drivers/fpga/socfpga_gen5.c @@ -204,7 +204,7 @@ static int fpgamgr_program_poll_usermode(void) */ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size) { - unsigned long status; + int status; if ((uint32_t)rbf_data & 0x3) { puts("FPGA: Unaligned data, realign to 32bit boundary.\n"); |