From: Sandrine Bailleux <sandrine.bailleux@arm.com>
Date: Mon, 23 Sep 2019 11:13:47 +0000 (+0000)
Subject: Merge changes I66dc6855,I2217a1ad into integration
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6dcb6045ccfa1d7afa7f6645c70b22d51addcff7;p=project%2Fbcm63xx%2Fatf.git

Merge changes I66dc6855,I2217a1ad into integration

* changes:
  rockchip: Update BL31_BASE to 0x40000
  rockchip: Fix typo for TF content text
---

6dcb6045ccfa1d7afa7f6645c70b22d51addcff7