nehalem: Small cleanup to raminit RE bindings

Change-Id: Ifd3f172a1c8a108909d1a7dae94f926b2778c2b1
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/4633
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Vladimir Serbinenko 2014-01-09 10:59:38 +01:00
parent 1cd937b48c
commit f62669c966
1 changed files with 4 additions and 27 deletions

View File

@ -1990,8 +1990,6 @@ static int have_match_ranks(struct raminfo *info, int channel, int ranks)
return 1; return 1;
} }
#define WTF1 1
static void read_4090(struct raminfo *info) static void read_4090(struct raminfo *info)
{ {
int i, channel, slot, rank, lane; int i, channel, slot, rank, lane;
@ -3763,6 +3761,7 @@ static void dmi_setup(void)
} }
#endif #endif
#if REAL
static void static void
set_fsb_frequency (void) set_fsb_frequency (void)
{ {
@ -3774,21 +3773,13 @@ set_fsb_frequency (void)
smbus_block_write(0x69, 0, 5, block); smbus_block_write(0x69, 0, 5, block);
} }
#if REAL
void raminit(const int s3resume)
#else
void raminit(int s3resume)
#endif #endif
void raminit(const int s3resume)
{ {
unsigned channel, slot, lane, rank; unsigned channel, slot, lane, rank;
int i; int i;
struct raminfo info; struct raminfo info;
#if !REAL
pre_raminit1();
#endif
if (s3resume) { if (s3resume) {
read_mchbar32(0x1e8); read_mchbar32(0x1e8);
write_mchbar32(0x1e8, 0x6); write_mchbar32(0x1e8, 0x6);
@ -3796,9 +3787,6 @@ void raminit(int s3resume)
write_mchbar32(0x1e8, 0x4); write_mchbar32(0x1e8, 0x4);
} }
#if !REAL
pre_raminit_2();
#endif
u8 x2ca8; u8 x2ca8;
gav(x2ca8 = read_mchbar8(0x2ca8)); gav(x2ca8 = read_mchbar8(0x2ca8));
@ -3819,10 +3807,7 @@ void raminit(int s3resume)
if (!s3resume) { if (!s3resume) {
pre_raminit_3(x2ca8); pre_raminit_3(x2ca8);
} }
#endif pre_raminit_4a(x2ca8);
#if !REAL
pre_raminit_4a();
#endif #endif
dmi_setup(); dmi_setup();
@ -5009,11 +4994,3 @@ unsigned long get_top_of_ram(void)
return (unsigned long)tom; return (unsigned long)tom;
} }
#endif #endif
#if !REAL
int main(void)
{
raminit(0);
return 0;
}
#endif