From f62669c966bb52701005477198e35302e611b3d8 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Thu, 9 Jan 2014 10:59:38 +0100 Subject: [PATCH] nehalem: Small cleanup to raminit RE bindings Change-Id: Ifd3f172a1c8a108909d1a7dae94f926b2778c2b1 Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/4633 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/northbridge/intel/nehalem/raminit.c | 31 ++++--------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/src/northbridge/intel/nehalem/raminit.c b/src/northbridge/intel/nehalem/raminit.c index c7acd477bd..581bf5f017 100644 --- a/src/northbridge/intel/nehalem/raminit.c +++ b/src/northbridge/intel/nehalem/raminit.c @@ -1990,8 +1990,6 @@ static int have_match_ranks(struct raminfo *info, int channel, int ranks) return 1; } -#define WTF1 1 - static void read_4090(struct raminfo *info) { int i, channel, slot, rank, lane; @@ -3763,6 +3761,7 @@ static void dmi_setup(void) } #endif +#if REAL static void set_fsb_frequency (void) { @@ -3774,21 +3773,13 @@ set_fsb_frequency (void) smbus_block_write(0x69, 0, 5, block); } - -#if REAL -void raminit(const int s3resume) -#else -void raminit(int s3resume) #endif + +void raminit(const int s3resume) { unsigned channel, slot, lane, rank; int i; struct raminfo info; - -#if !REAL - pre_raminit1(); -#endif - if (s3resume) { read_mchbar32(0x1e8); write_mchbar32(0x1e8, 0x6); @@ -3796,9 +3787,6 @@ void raminit(int s3resume) write_mchbar32(0x1e8, 0x4); } -#if !REAL - pre_raminit_2(); -#endif u8 x2ca8; gav(x2ca8 = read_mchbar8(0x2ca8)); @@ -3819,10 +3807,7 @@ void raminit(int s3resume) if (!s3resume) { pre_raminit_3(x2ca8); } -#endif - -#if !REAL - pre_raminit_4a(); + pre_raminit_4a(x2ca8); #endif dmi_setup(); @@ -5009,11 +4994,3 @@ unsigned long get_top_of_ram(void) return (unsigned long)tom; } #endif - -#if !REAL -int main(void) -{ - raminit(0); - return 0; -} -#endif