Merge changes from topic "amlogic-g12a" into integration

* 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

diff --combined plat/amlogic/gxbb/gxbb_def.h
index 59d9cc9acb79b73dfa06e430a17bf2fe762fa7a7,2c92624067e57f9bb345a93db711d914f77a33af..fa5e4fa96593321426cf6d1ba29fcc63039a8786
--- 1/plat/amlogic/gxbb/gxbb_def.h
--- 2/plat/amlogic/gxbb/gxbb_def.h
+++ b/plat/amlogic/gxbb/gxbb_def.h
@@@ -95,6 -95,10 +95,10 @@@
  #define AML_HIU_MAILBOX_STAT_3                        UL(0xDA83C42C)
  #define AML_HIU_MAILBOX_CLR_3                 UL(0xDA83C430)
  
+ #define AML_SHA_DMA_BASE                      UL(0xC883E000)
+ #define AML_SHA_DMA_DESC                      (AML_SHA_DMA_BASE + 0x08)
+ #define AML_SHA_DMA_STATUS                    (AML_SHA_DMA_BASE + 0x18)
+ 
  /*******************************************************************************
   * System Monitor Call IDs and arguments
   ******************************************************************************/
@@@ -106,7 -110,6 +110,7 @@@
  
  #define AML_SM_JTAG_ON                                U(0x82000040)
  #define AML_SM_JTAG_OFF                               U(0x82000041)
 +#define AML_SM_GET_CHIP_ID                    U(0x82000044)
  
  #define AML_JTAG_STATE_ON                     U(0)
  #define AML_JTAG_STATE_OFF                    U(1)

diff --combined plat/amlogic/gxl/gxl_def.h
index 1e1a934d8ab69ceb404731901d85170dde685763,ea19338e7e77f4e7da09510fc7689dc85b48f2a6..f30eb287ddbe23abf013d56fcc60a4cb6e5a1d96
--- 1/plat/amlogic/gxl/gxl_def.h
--- 2/plat/amlogic/gxl/gxl_def.h
+++ b/plat/amlogic/gxl/gxl_def.h
@@@ -105,6 -105,10 +105,10 @@@
  #define AML_HIU_MAILBOX_STAT_3                        UL(0xDA83C42C)
  #define AML_HIU_MAILBOX_CLR_3                 UL(0xDA83C430)
  
+ #define AML_SHA_DMA_BASE                      UL(0xC883E000)
+ #define AML_SHA_DMA_DESC                      (AML_SHA_DMA_BASE + 0x08)
+ #define AML_SHA_DMA_STATUS                    (AML_SHA_DMA_BASE + 0x18)
+ 
  /*******************************************************************************
   * System Monitor Call IDs and arguments
   ******************************************************************************/
@@@ -116,7 -120,6 +120,7 @@@
  
  #define AML_SM_JTAG_ON                                U(0x82000040)
  #define AML_SM_JTAG_OFF                               U(0x82000041)
 +#define AML_SM_GET_CHIP_ID                    U(0x82000044)
  
  #define AML_JTAG_STATE_ON                     U(0)
  #define AML_JTAG_STATE_OFF                    U(1)