[commit] r5895 - trunk/src/northbridge/intel/i945

[repository service]

Author: oxygene
Date: Fri Oct  1 12:02:33 2010
New Revision: 5895
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5895

Log:
Make i945/raminit.c:fsbclk() return u16 rather than int

This is needed for Gentoo gcc-4.1.2 to build the i945 code. A warning is
thrown because the comparison in the last hunk is between u16 and -1 and
can never be true.

Signed-off-by: Peter Stuge 
Acked-by: Patrick Georgi

Modified:
   trunk/src/northbridge/intel/i945/raminit.c

Modified: trunk/src/northbridge/intel/i945/raminit.c
==============================================================================
--- trunk/src/northbridge/intel/i945/raminit.c	Fri Oct  1 11:58:44 2010	(r5894)
+++ trunk/src/northbridge/intel/i945/raminit.c	Fri Oct  1 12:02:33 2010	(r5895)
@@ -103,7 +103,7 @@
 }

#if defined(CONFIG_NORTHBRIDGE_INTEL_I945GM)
-static int fsbclk(void)
+static u16 fsbclk(void)
 {
    switch (MCHBAR32(CLKCFG) & 7) {
    case 0: return 400;
@@ -111,10 +111,10 @@
    case 3: return 667;
    default: printk(BIOS_DEBUG, "fsbclk: unknown register value %x\n", MCHBAR32(CLKCFG) & 7);
    }
-	return -1;
+	return 0xffff;
 }
 #elif defined(CONFIG_NORTHBRIDGE_INTEL_I945GC)
-static int fsbclk(void)
+static u16 fsbclk(void)
 {
    switch (MCHBAR32(CLKCFG) & 7) {
    case 0: return 1066;
@@ -122,7 +122,7 @@
    case 2: return 800;
    default: printk(BIOS_DEBUG, "fsbclk: unknown register value %x\n", MCHBAR32(CLKCFG) & 7);
    }
-	return -1;
+	return 0xffff;
 }
 #endif

@@ -1929,7 +1929,7 @@
    MCHBAR32(PLLMON) = 0x80800000;

sysinfo->fsb_frequency = fsbclk();
-	if (sysinfo->fsb_frequency == -1)
+	if (sysinfo->fsb_frequency == 0xffff)
    	die("Unsupported FSB speed");

/* Program CPCTL according to FSB speed */