[coreboot-gerrit] New patch to review for coreboot: intel/i945: Use "IS_ENABLED" for fsbclk & memclk

[HAOUAS Elyes (ehaouas@noos.fr)]

HAOUAS Elyes (ehaouas at noos.fr) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16958

-gerrit

commit 407753284498c17f89fa2b35fa9bf1a9d1f97b21
Author: Elyes HAOUAS <ehaouas at noos.fr>
Date:   Sun Oct 9 20:24:20 2016 +0200

    intel/i945: Use "IS_ENABLED" for fsbclk & memclk
    
    Change-Id: I3213a8664955239b10bcf1784ce1ba5e0d95688b
    Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
 3rdparty/arm-trusted-firmware        |  2 +-
 src/northbridge/intel/i945/raminit.c | 22 ++++------------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/3rdparty/arm-trusted-firmware b/3rdparty/arm-trusted-firmware
index bfd9251..a5a4231 160000
--- a/3rdparty/arm-trusted-firmware
+++ b/3rdparty/arm-trusted-firmware
@@ -1 +1 @@
-Subproject commit bfd925139fdbc2e87979849907b34843aa326994
+Subproject commit a5a423100822c4b8c9982024c333460f0d019d82
diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c
index 0b9e95c..5148377 100644
--- a/src/northbridge/intel/i945/raminit.c
+++ b/src/northbridge/intel/i945/raminit.c
@@ -106,10 +106,8 @@ void sdram_dump_mchbar_registers(void)
 
 static int memclk(void)
 {
-	int offset = 0;
-#if CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM
-	offset++;
-#endif
+	int offset = IS_ENABLED(CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM) ? 1 : 0;
+
 	switch (((MCHBAR32(CLKCFG) >> 4) & 7) - offset) {
 	case 1: return 400;
 	case 2: return 533;
@@ -119,29 +117,17 @@ static int memclk(void)
 	return -1;
 }
 
-#if CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM
-static u16 fsbclk(void)
-{
-	switch (MCHBAR32(CLKCFG) & 7) {
-	case 0: return 400;
-	case 1: return 533;
-	case 3: return 667;
-	default: printk(BIOS_DEBUG, "fsbclk: unknown register value %x\n", MCHBAR32(CLKCFG) & 7);
-	}
-	return 0xffff;
-}
-#elif CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GC
 static u16 fsbclk(void)
 {
 	switch (MCHBAR32(CLKCFG) & 7) {
-	case 0: return 1066;
+	case 0: return IS_ENABLED(CONFIG_NORTHBRIDGE_INTEL_SUBTYPE_I945GM) ? 400 : 1066;
 	case 1: return 533;
 	case 2: return 800;
+	case 3: return 667;
 	default: printk(BIOS_DEBUG, "fsbclk: unknown register value %x\n", MCHBAR32(CLKCFG) & 7);
 	}
 	return 0xffff;
 }
-#endif
 
 static int sdram_capabilities_max_supported_memory_frequency(void)
 {