diff options
| author | Tom Rini <trini@ti.com> | 2014-11-25 11:10:01 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-26 11:21:16 -0500 |
| commit | 878cd63e02f63f245182a101807186b44e20f116 (patch) | |
| tree | 982e41d25d53afc30c4e610fed7f458ebe74be60 /arch/arm/cpu/armv7/exynos/spl_boot.c | |
| parent | f2ffe7da7fcc266f8c9cb557031066cfd5eb2a03 (diff) | |
| parent | 7741c8b8c9215c6def36f24ac0b2d71543dd47ab (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot-samsung
Diffstat (limited to 'arch/arm/cpu/armv7/exynos/spl_boot.c')
| -rw-r--r-- | arch/arm/cpu/armv7/exynos/spl_boot.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/exynos/spl_boot.c b/arch/arm/cpu/armv7/exynos/spl_boot.c index ae3ad0167d..bc237c969f 100644 --- a/arch/arm/cpu/armv7/exynos/spl_boot.c +++ b/arch/arm/cpu/armv7/exynos/spl_boot.c @@ -195,10 +195,16 @@ void copy_uboot_to_ram(void) void (*end_bootop_from_emmc)(void); #endif #ifdef CONFIG_USB_BOOTING - u32 (*usb_copy)(void); int is_cr_z_set; unsigned int sec_boot_check; + /* + * Note that older hardware (before Exynos5800) does not expect any + * arguments, but it does not hurt to pass them, so a common function + * prototype is used. + */ + u32 (*usb_copy)(u32 num_of_block, u32 *dst); + /* Read iRAM location to check for secondary USB boot mode */ sec_boot_check = readl(EXYNOS_IRAM_SECONDARY_BASE); if (sec_boot_check == EXYNOS_USB_SECONDARY_BOOT) @@ -240,7 +246,7 @@ void copy_uboot_to_ram(void) */ is_cr_z_set = config_branch_prediction(0); usb_copy = get_irom_func(USB_INDEX); - usb_copy(); + usb_copy(0, (u32 *)CONFIG_SYS_TEXT_BASE); config_branch_prediction(is_cr_z_set); break; #endif |