diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2018-06-02 18:38:04 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2018-06-06 12:29:27 +0000 |
| commit | 58d6ff1330542039456bd09c9e689305a588c52e (patch) | |
| tree | 367ed20c0205eb7feedfcb1af50260303a775caf /src | |
| parent | 730df3cc43d76d830f6c88441d8bea75b9047a6c (diff) | |
intel/e7505: Remove ROMCC workaround
Choose codepath as if ROMCC_IF_BUG_FIXED was set.
Change-Id: I74b4fe4a915b70f63ea018035381b64f53af3c7f
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/26771
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src')
| -rw-r--r-- | src/northbridge/intel/e7505/raminit.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/src/northbridge/intel/e7505/raminit.c b/src/northbridge/intel/e7505/raminit.c index 1cbed5ab3d..b289efe3e1 100644 --- a/src/northbridge/intel/e7505/raminit.c +++ b/src/northbridge/intel/e7505/raminit.c @@ -416,19 +416,8 @@ static struct dimm_size sdram_spd_get_width(uint16_t dimm_socket_address) spd_read_byte(dimm_socket_address, SPD_NUM_DIMM_BANKS); die_on_spd_error(value); -#ifdef ROMCC_IF_BUG_FIXED if (value == 2) width.side2 = width.side1; -#else - switch (value) { - case 2: - width.side2 = width.side1; - break; - - default: - break; - } -#endif } return width; @@ -640,25 +629,12 @@ static uint8_t spd_get_supported_dimms(const struct mem_controller *ctrl) } #endif /* VALIDATE_DIMM_COMPATIBILITY */ - // Code around ROMCC bug in optimization of "if" statements -#ifdef ROMCC_IF_BUG_FIXED if (bDualChannel) { - // Made it through all the checks, this DIMM pair is usable - dimm_mask |= ((1 << i) | (1 << (MAX_DIMM_SOCKETS_PER_CHANNEL + i))); + // This DIMM pair is usable + dimm_mask |= 1 << i; + dimm_mask |= 1 << (MAX_DIMM_SOCKETS_PER_CHANNEL + i); } else printk(BIOS_DEBUG, "Skipping un-matched DIMMs - only dual-channel operation supported\n"); -#else - switch (bDualChannel) { - case 0: - printk(BIOS_DEBUG, "Skipping un-matched DIMMs - only dual-channel operation supported\n"); - break; - - default: - // Made it through all the checks, this DIMM pair is usable - dimm_mask |= (1 << i) | (1 << (MAX_DIMM_SOCKETS_PER_CHANNEL + i)); - break; - } -#endif } return dimm_mask; |