summaryrefslogtreecommitdiff
path: root/src/northbridge
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2013-10-13 04:15:40 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2013-10-15 13:18:22 +0200
commit697927cc35c80ddbe91d868ba1e41fb68dda815d (patch)
tree3fafbb7f0cc4c42bbbddf073e985d5dc8891d0dd /src/northbridge
parent2644793ef486881f3af36bec69d5f9abf82123ac (diff)
downloadcoreboot-697927cc35c80ddbe91d868ba1e41fb68dda815d.tar.xz
CBMEM: Define cbmem_top() just once for x86
It is expected this will always be a casted get_top_of_ram() call on x86, no reason to do that under chipset. Change-Id: I3a49abe13ca44bf4ca1e26d1b3baf954bc5a29b7 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/3972 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/northbridge')
-rw-r--r--src/northbridge/intel/haswell/northbridge.c4
-rw-r--r--src/northbridge/intel/haswell/raminit.c6
2 files changed, 2 insertions, 8 deletions
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index 9f027343e4..ac61ca47ee 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -535,14 +535,14 @@ static void northbridge_init(struct device *dev)
MCHBAR32(0x5500) = 0x00100001;
}
-void *cbmem_top(void)
+unsigned long get_top_of_ram(void)
{
u32 reg;
/* The top the reserve regions fall just below the TSEG region. */
reg = pci_read_config32(dev_find_slot(0, PCI_DEVFN(0, 0)), TSEG);
- return (void *)(reg & ~((1 << 20) - 1));
+ return (reg & ~((1 << 20) - 1));
}
static void northbridge_enable(device_t dev)
diff --git a/src/northbridge/intel/haswell/raminit.c b/src/northbridge/intel/haswell/raminit.c
index c1095a7eb7..a90b360116 100644
--- a/src/northbridge/intel/haswell/raminit.c
+++ b/src/northbridge/intel/haswell/raminit.c
@@ -202,12 +202,6 @@ void sdram_initialize(struct pei_data *pei_data)
report_memory_config();
}
-void *cbmem_top(void)
-{
- /* Top of cbmem is at lowest usable DRAM address below 4GiB. */
- return (void *)get_top_of_ram();
-}
-
unsigned long get_top_of_ram(void)
{
/*