Merge branch 'master' of git://git.denx.de/u-boot-socfpga

This commit is contained in:
Tom Rini
2018-10-31 17:15:55 -04:00
4 changed files with 16 additions and 3 deletions

View File

@@ -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);

View File

@@ -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");