diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-31 07:10:55 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-31 07:10:55 -0500 |
| commit | ab21ecef7a38dd211fe6db35c6e60800445eb6a2 (patch) | |
| tree | 88206942bc34bb97062d793e56db6f97cf74ea8f /arch/arm/mach-zynq/ps7_spl_init.c | |
| parent | 11d2e98d7e75dfb40651eb95c32ca36778cd96d3 (diff) | |
| parent | e7563c204eb4f7a422121c342e4e9f34cd1986e9 (diff) | |
Merge tag 'xilinx-for-v2018.03' of git://git.denx.de/u-boot-microblaze
Xilinx changes for v2018.03
- Several Kconfig fixes (also moving configs to defconfigs)
- Some DTS updates
- ZynqMP psu rework based on Zynq concept
- Add low level initialization for zc770 and zcu102
- Add support for Zynq zc770 x16 nand configuration
- Add mini nand/emmc ZynqMP targets
- Some arasan nand changes
Diffstat (limited to 'arch/arm/mach-zynq/ps7_spl_init.c')
| -rw-r--r-- | arch/arm/mach-zynq/ps7_spl_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-zynq/ps7_spl_init.c b/arch/arm/mach-zynq/ps7_spl_init.c index 6dc4e0364d8..ba2dad759ca 100644 --- a/arch/arm/mach-zynq/ps7_spl_init.c +++ b/arch/arm/mach-zynq/ps7_spl_init.c @@ -58,7 +58,7 @@ static void perf_start_clock(void) } /* Compute mask for given delay in miliseconds*/ -static int get_number_of_cycles_for_delay(unsigned int delay) +static unsigned long get_number_of_cycles_for_delay(unsigned long delay) { return (APU_FREQ / (2 * 1000)) * delay; } @@ -92,7 +92,7 @@ int __weak ps7_config(unsigned long *ps7_config_init) unsigned long mask; unsigned int numargs; int i; - int delay; + unsigned long delay; for (;;) { opcode = ptr[0]; |