Merge tag 'rockchip-for-v2018.11-rc2' of git://git.denx.de/u-boot-rockchip
authorTom Rini <trini@konsulko.com>
Fri, 5 Oct 2018 14:16:46 +0000 (10:16 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 5 Oct 2018 17:40:42 +0000 (13:40 -0400)
commita4b38fca7e83f0556c0afc96492741e4464444df
tree9be8746db8e6a1e9488b40aa347381684175025a
parent46031b3aa08814f797a379356750aa5fb94cd3f7
parentf25c1755a715d0d1794bd0827549367c20182501
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>
common/spl/spl_optee.S