From: Tom Rini <trini@konsulko.com>
Date: Fri, 5 Oct 2018 14:16:46 +0000 (-0400)
Subject: Merge tag 'rockchip-for-v2018.11-rc2' of git://git.denx.de/u-boot-rockchip
X-Git-Tag: v2018.11-rc2~64
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a4b38fca7e83f0556c0afc96492741e4464444df;p=oweals%2Fu-boot.git

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>
---

a4b38fca7e83f0556c0afc96492741e4464444df
diff --cc common/spl/spl_optee.S
index 0000000000,86fc398546..8bd1949ddf
mode 000000,100644..100644
--- a/common/spl/spl_optee.S
+++ b/common/spl/spl_optee.S
@@@ -1,0 -1,12 +1,12 @@@
 -// SPDX-License-Identifier: GPL-2.0+
++/* SPDX-License-Identifier: GPL-2.0+ */
+ /*
+  * Copyright (C) 2017 Rockchip Electronic Co.,Ltd
+  */
+ 
+ #include <linux/linkage.h>
+ #include <asm/assembler.h>
+ 
+ ENTRY(spl_optee_entry)
+ 	ldr lr, =CONFIG_SYS_TEXT_BASE
+ 	mov pc, r3
+ ENDPROC(spl_optee_entry)