Merge changes from topic "amlogic-g12a" into integration
authorSoby Mathew <soby.mathew@arm.com>
Fri, 27 Sep 2019 09:53:40 +0000 (09:53 +0000)
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>
Fri, 27 Sep 2019 09:53:40 +0000 (09:53 +0000)
* changes:
  amlogic: g12a: Add support for the S905X2 (G12A) platform
  amlogic: makefile: Use PLAT variable when possible
  amlogic: sha_dma: Move register mappings to platform header

1  2 
plat/amlogic/gxbb/gxbb_def.h
plat/amlogic/gxl/gxl_def.h

Simple merge
Simple merge