Merge changes I66dc6855,I2217a1ad into integration
authorSandrine Bailleux <[email protected]>
Mon, 23 Sep 2019 11:13:47 +0000 (11:13 +0000)
committerTrustedFirmware Code Review <[email protected]>
Mon, 23 Sep 2019 11:13:47 +0000 (11:13 +0000)
commit6dcb6045ccfa1d7afa7f6645c70b22d51addcff7
tree9b1d3e8f7d02a2e3ff4221f354c9dd55020e36c3
parent6a7cbfd56837409b85c26df0206177e59fc95a79
parent0aad563c74807195cc7fe2208d17e2d889157f1e
Merge changes I66dc6855,I2217a1ad into integration

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