From 19eb7509d380fd5d9e6d083ad0d2633820c8db4b Mon Sep 17 00:00:00 2001 From: Lin Huang Date: Sat, 26 Mar 2016 11:50:05 +0800 Subject: rockchip: make sure sdram top does not spill into MMIO space The base address of MMIO space is different for different Rockchip SOCs. Define them in the appropriate address map files and use the definition in common code. BRANCH=none BUG=chrome-os-partner:51537 TEST=emerge-kevin coreboot Change-Id: I615f3cadd6d5d994b7dd1defbd10d02ad5c994da Signed-off-by: Patrick Georgi Original-Commit-Id: 24f941e960e4a2cfb9fc26415f56e240de3d00d9 Original-Change-Id: Ia48d75e7de546b17636cde7829ee09837b9d7ac9 Original-Signed-off-by: Lin Huang Original-Reviewed-on: https://chromium-review.googlesource.com/337190 Original-Commit-Ready: Vadim Bendebury Original-Tested-by: Vadim Bendebury Original-Reviewed-by: Vadim Bendebury Reviewed-on: https://review.coreboot.org/14717 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/soc/rockchip/common/cbmem.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/soc/rockchip/common') diff --git a/src/soc/rockchip/common/cbmem.c b/src/soc/rockchip/common/cbmem.c index d06b292424..401f8b2a65 100644 --- a/src/soc/rockchip/common/cbmem.c +++ b/src/soc/rockchip/common/cbmem.c @@ -14,11 +14,13 @@ */ #include -#include -#include +#include #include +#include +#include void *cbmem_top(void) { - return _dram + sdram_size_mb()*MiB; + return (void *)min((uintptr_t)_dram + sdram_size_mb() * MiB, + MAX_DRAM_ADDRESS); } -- cgit v1.2.3