mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-10-02 11:11:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Peach-Pi: Use the enhanced usb_copy() prototype

Browse Source 
Exynos5800 IROM has a different, from 5250 and 5420, prototype of the
usb_copy() function. Luckily the earlier version did not expect any
arguments, which means the same code could be used with old and new
SoCs, the old ones just ignoring the arguments.

Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Signed-off-by: Akshay Saraswat <akshay.s@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
This commit is contained in:
Vadim Bendebury 2014-11-13 22:38:21 +05:30 committed by Minkyu Kang
parent 0e03e82465
commit 4f29862487
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/cpu/armv7/exynos/spl_boot.c
View File

@ -195,10 +195,16 @@ void copy_uboot_to_ram(void)
void (*end_bootop_from_emmc)(void); void (*end_bootop_from_emmc)(void);
#endif #endif
#ifdef CONFIG_USB_BOOTING #ifdef CONFIG_USB_BOOTING
u32 (*usb_copy)(void);
int is_cr_z_set; int is_cr_z_set;
unsigned int sec_boot_check; 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 */ /* Read iRAM location to check for secondary USB boot mode */
sec_boot_check = readl(EXYNOS_IRAM_SECONDARY_BASE); sec_boot_check = readl(EXYNOS_IRAM_SECONDARY_BASE);
if (sec_boot_check == EXYNOS_USB_SECONDARY_BOOT) 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); is_cr_z_set = config_branch_prediction(0);
usb_copy = get_irom_func(USB_INDEX); usb_copy = get_irom_func(USB_INDEX);
usb_copy(); usb_copy(0, (u32 *)CONFIG_SYS_TEXT_BASE);
config_branch_prediction(is_cr_z_set); config_branch_prediction(is_cr_z_set);
break; break;
#endif #endif