summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niewöhner <foss@mniewoehner.de>2019-11-04 22:07:29 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-11-11 10:33:51 +0000
commit6754dcda744c7ff7850024b4da1990475b0dfa7f (patch)
tree97eee9f9811513864e41c2638a0f180f583a7177
parent97012bd019896c589a4b736f17f5c1ad8f378924 (diff)
soc/intel/quark: make use of common cbmem_top_chipset
This replaces quark's own implementation of cbmem_top_chipset and selects the common code one. Change-Id: I445c471b654abfa922b20215e52a2794529be120 Signed-off-by: Michael Niewöhner <foss@mniewoehner.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36621 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Nico Huber <nico.h@gmx.de>
-rw-r--r--src/soc/intel/quark/Kconfig2
-rw-r--r--src/soc/intel/quark/memmap.c17
2 files changed, 2 insertions, 17 deletions
diff --git a/src/soc/intel/quark/Kconfig b/src/soc/intel/quark/Kconfig
index 461d230371..6938431728 100644
--- a/src/soc/intel/quark/Kconfig
+++ b/src/soc/intel/quark/Kconfig
@@ -32,6 +32,8 @@ config CPU_SPECIFIC_OPTIONS
select PLATFORM_USES_FSP2_0
select SOC_INTEL_COMMON
select SOC_INTEL_COMMON_RESET
+ select SOC_INTEL_COMMON_BLOCK
+ select SOC_INTEL_COMMON_BLOCK_SA_FSP_TOLUM
select SOC_SETS_MSRS
select SPI_FLASH
select UART_OVERRIDE_REFCLK
diff --git a/src/soc/intel/quark/memmap.c b/src/soc/intel/quark/memmap.c
index 9ccaf55a1f..6cd2c9a73c 100644
--- a/src/soc/intel/quark/memmap.c
+++ b/src/soc/intel/quark/memmap.c
@@ -18,23 +18,6 @@
#include <cbmem.h>
#include <soc/reg_access.h>
-void *cbmem_top_chipset(void)
-{
- uint32_t top_of_memory;
-
- /* Determine the TSEG base */
- top_of_memory = reg_host_bridge_unit_read(QNC_MSG_FSBIC_REG_HSMMC);
- top_of_memory &= SMM_START_MASK;
- top_of_memory <<= 16;
-
- /* Reserve 64 KiB for RMU firmware */
- if (top_of_memory)
- top_of_memory -= 0x10000;
-
- /* Return the top of memory */
- return (void *)top_of_memory;
-}
-
void fill_postcar_frame(struct postcar_frame *pcf)
{
uintptr_t top_of_ram;