diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2018-02-12 15:12:34 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-02-22 10:07:53 +0000 |
| commit | fc31e44e47751a7cbffea19920f1f5ef34c6bc13 (patch) | |
| tree | 45acf31505bf59ae0c055818640775886114e970 /src/northbridge | |
| parent | 13089b008ff6a3700b9343902fa7b17890a63d92 (diff) | |
device/ddr2,ddr3: Rename and move a few things
In order for ddr2.h and ddr3.h to be included in the same file it
cannot have conflicting definitions, therefore rename a few things and
move some things to a common header.
Change-Id: I6056148872076048e055f1d20a60ac31afd7cde6
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/23717
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Diffstat (limited to 'src/northbridge')
| -rw-r--r-- | src/northbridge/intel/i945/raminit.c | 2 | ||||
| -rw-r--r-- | src/northbridge/intel/x4x/raminit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c index b350b67fb7..b2348f5c07 100644 --- a/src/northbridge/intel/i945/raminit.c +++ b/src/northbridge/intel/i945/raminit.c @@ -362,7 +362,7 @@ static void gather_common_timing(struct sys_info *sysinfo, for (i = 0; i < (2 * DIMM_SOCKETS); i++) { int device = get_dimm_spd_address(sysinfo, i), bytes_read; - struct dimm_attr_st dimm_info; + struct dimm_attr_ddr2_st dimm_info; /* Initialize the socket information with a sane value */ sysinfo->dimm[i] = SYSINFO_DIMM_NOT_POPULATED; diff --git a/src/northbridge/intel/x4x/raminit.c b/src/northbridge/intel/x4x/raminit.c index cd786bb266..7bb5f2b48b 100644 --- a/src/northbridge/intel/x4x/raminit.c +++ b/src/northbridge/intel/x4x/raminit.c @@ -119,7 +119,7 @@ static void mchinfo_ddr2(struct sysinfo *s) static int ddr2_save_dimminfo(u8 dimm_idx, u8 *raw_spd, struct abs_timings *saved_timings, struct sysinfo *s) { - struct dimm_attr_st decoded_dimm; + struct dimm_attr_ddr2_st decoded_dimm; int i; if (spd_decode_ddr2(&decoded_dimm, raw_spd) != SPD_STATUS_OK) { |