Merge changes I66dc6855,I2217a1ad into integration
authorSandrine Bailleux <sandrine.bailleux@arm.com>
Mon, 23 Sep 2019 11:13:47 +0000 (11:13 +0000)
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>
Mon, 23 Sep 2019 11:13:47 +0000 (11:13 +0000)
* changes:
  rockchip: Update BL31_BASE to 0x40000
  rockchip: Fix typo for TF content text


Trivial merge