Merge "allwinner: Fix non-default PRELOADED_BL33_BASE" into integration

diff --cc plat/allwinner/common/allwinner-common.mk
index 88ffc31f71bd874976898aaf57aa29c313a900c3,4d8b2514ab09783116ef90a171603e1e07cf3d19..901d888954d285bca1276b7afbc5fadffd980742
--- 1/plat/allwinner/common/allwinner-common.mk
--- 2/plat/allwinner/common/allwinner-common.mk
+++ b/plat/allwinner/common/allwinner-common.mk
@@@ -48,8 -48,10 +48,11 @@@ ENABLE_SVE_FOR_NS           :=      
  ERRATA_A53_835769             :=      1
  ERRATA_A53_843419             :=      1
  ERRATA_A53_855873             :=      1
 +ERRATA_A53_1530924            :=      1
  
+ # The traditional U-Boot load address is 160MB into DRAM.
+ PRELOADED_BL33_BASE           ?=      0x4a000000
+ 
  # The reset vector can be changed for each CPU.
  PROGRAMMABLE_RESET_ADDRESS    :=      1
  

diff --cc plat/allwinner/common/sunxi_common.c
Simple merge