commit b4a6056f87914167d7c6b98c46618eb53b26d6e3
author Madhukar Pappireddy <madhukar.pappireddy@arm.com> Mon Jul 19 02:58:05 2021 +0200
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Mon Jul 19 02:58:05 2021 +0200
tree 27c2ae5049c97c1d41a041d62fe437532b3e619e
parent ee6588c12a5d789991807104ac078b0416afe6fe
parent 041c7029ea18dbdd04173ed4347568f00b248182

Merge "fix(plat/marvell/a3k): fix printing info messages on output" into integration

docs/about/maintainers.rst

diff --git a/docs/about/maintainers.rst b/docs/about/maintainers.rst
index d014fbd..97e1fa8 100644
--- a/docs/about/maintainers.rst
+++ b/docs/about/maintainers.rst
@@ -594,6 +594,8 @@
 :|G|: `rockchip-linux`_
 :|M|: Heiko Stuebner <heiko@sntech.de>
 :|G|: `mmind`_
+:|M|: Julius Werner <jwerner@chromium.org>
+:|G|: `jwerner-chromium`_
 :|F|: plat/rockchip/
 
 STM32MP1 platform port

plat/rockchip/rk3399/drivers/dram/dram.h

diff --git a/plat/rockchip/rk3399/drivers/dram/dram.h b/plat/rockchip/rk3399/drivers/dram/dram.h
index 0eb12cf..5572b16 100644
--- a/plat/rockchip/rk3399/drivers/dram/dram.h
+++ b/plat/rockchip/rk3399/drivers/dram/dram.h
@@ -149,7 +149,7 @@
 	uint32_t rx_cal_dqs[2][4];
 };
 
-extern __sramdata struct rk3399_sdram_params sdram_config;
+extern struct rk3399_sdram_params sdram_config;
 
 void dram_init(void);