From 52acef175e42374d463214427678e3e7828960c3 Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Wed, 8 Aug 2018 12:46:18 +0200 Subject: soc/cavium/cn81xx: Fix minor things * Move cbmem.c to cn81xx folder * Store CBMEM below 4 GiB * Make sure CBMEM doesn't overlap with ATF scratchpad * Fix ATF scratchpad not marked as reserved due to wrong calculation * The scratchpad is the last 1 MiB at the end of DRAM. Tested on Cavium CN81xx EVB: The ATF scratchpad is now marked reserved and the configuration tables are located below 4 GiB. Linux still boots. Change-Id: Ibbc8b586f04bd6867c045f5546b32a77c057ac74 Signed-off-by: Patrick Rudolph Reviewed-on: https://review.coreboot.org/27955 Reviewed-by: Philipp Deppenwiese Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- src/soc/cavium/common/Makefile.inc | 3 +-- src/soc/cavium/common/cbmem.c | 26 -------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 src/soc/cavium/common/cbmem.c (limited to 'src/soc/cavium/common') diff --git a/src/soc/cavium/common/Makefile.inc b/src/soc/cavium/common/Makefile.inc index 7af8bf58ef..ada8286591 100644 --- a/src/soc/cavium/common/Makefile.inc +++ b/src/soc/cavium/common/Makefile.inc @@ -22,13 +22,12 @@ bootblock-$(CONFIG_BOOTBLOCK_CUSTOM) += bootblock.c ################################################################################ # romstage -romstage-y += cbmem.c romstage-y += bdk-coreboot.c ################################################################################ # ramstage -ramstage-y += cbmem.c +ramstage-y += bdk-coreboot.c CPPFLAGS_common += -Isrc/soc/cavium/common/include diff --git a/src/soc/cavium/common/cbmem.c b/src/soc/cavium/common/cbmem.c deleted file mode 100644 index 401f8b2a65..0000000000 --- a/src/soc/cavium/common/cbmem.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2014 Rockchip Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include -#include - -void *cbmem_top(void) -{ - return (void *)min((uintptr_t)_dram + sdram_size_mb() * MiB, - MAX_DRAM_ADDRESS); -} -- cgit v1.2.3