diff options
| author | Tom Rini <trini@konsulko.com> | 2018-10-05 10:16:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-05 13:40:42 -0400 |
| commit | a4b38fca7e83f0556c0afc96492741e4464444df (patch) | |
| tree | 9be8746db8e6a1e9488b40aa347381684175025a /include | |
| parent | 46031b3aa08814f797a379356750aa5fb94cd3f7 (diff) | |
| parent | f25c1755a715d0d1794bd0827549367c20182501 (diff) | |
Merge tag 'rockchip-for-v2018.11-rc2' of git://git.denx.de/u-boot-rockchip
Rockchip-focused changes for v2018.11-rc2:
- fixes to rkimage for SPL boot via USB
- fixes to make_fit_atf.py, incl. entry-point calculation and python3
compatibility
- OP-TEE support for ARMv7-based SoCs
- fixes to RGMII/GMII selection on the RK3328
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/spl.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/spl.h b/include/spl.h index b42683c9e7..9a439f468b 100644 --- a/include/spl.h +++ b/include/spl.h @@ -289,6 +289,19 @@ int spl_mmc_load_image(struct spl_image_info *spl_image, void spl_invoke_atf(struct spl_image_info *spl_image); /** + * spl_optee_entry - entry function for optee + * + * args defind in op-tee project + * https://github.com/OP-TEE/optee_os/ + * core/arch/arm/kernel/generic_entry_a32.S + * @arg0: pagestore + * @arg1: (ARMv7 standard bootarg #1) + * @arg2: device tree address, (ARMv7 standard bootarg #2) + * @arg3: non-secure entry address (ARMv7 bootarg #0) + */ +void spl_optee_entry(void *arg0, void *arg1, void *arg2, void *arg3); + +/** * board_return_to_bootrom - allow for boards to continue with the boot ROM * * If a board (e.g. the Rockchip RK3368 boards) provide some |