[commit] r6023 - in trunk/src: mainboard/amd/rumba mainboard/lippert/frontrunner mainboard/wyse/s50 northbridge/amd/gx2

[repository service]

Author: uwe
Date: Fri Nov  5 01:23:11 2010
New Revision: 6023
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6023

Log:
Add Kconfig CPU speed selection to Geode GX2 boards.

This is Abuild and boot tested.

Signed-off-by: Nils Jacobs 
Acked-by: Uwe Hermann

Modified:
   trunk/src/mainboard/amd/rumba/Kconfig
   trunk/src/mainboard/lippert/frontrunner/Kconfig
   trunk/src/mainboard/wyse/s50/Kconfig
   trunk/src/northbridge/amd/gx2/Kconfig
   trunk/src/northbridge/amd/gx2/pll_reset.c

Modified: trunk/src/mainboard/amd/rumba/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/rumba/Kconfig	Fri Nov  5 01:19:21 2010	(r6022)
+++ trunk/src/mainboard/amd/rumba/Kconfig	Fri Nov  5 01:23:11 2010	(r6023)
@@ -28,6 +28,7 @@
    select HAVE_PIRQ_TABLE
    select BOARD_ROMSIZE_KB_256
    select POWER_BUTTON_FORCE_ENABLE
+	select GX2_PROCESSOR_MHZ_366

config MAINBOARD_DIR
    string

Modified: trunk/src/mainboard/lippert/frontrunner/Kconfig
==============================================================================
--- trunk/src/mainboard/lippert/frontrunner/Kconfig	Fri Nov  5 01:19:21 2010	(r6022)
+++ trunk/src/mainboard/lippert/frontrunner/Kconfig	Fri Nov  5 01:23:11 2010	(r6023)
@@ -10,6 +10,7 @@
    select UDELAY_TSC
    select HAVE_PIRQ_TABLE
    select BOARD_ROMSIZE_KB_256
+	select GX2_PROCESSOR_MHZ_366

config MAINBOARD_DIR
    string

Modified: trunk/src/mainboard/wyse/s50/Kconfig
==============================================================================
--- trunk/src/mainboard/wyse/s50/Kconfig	Fri Nov  5 01:19:21 2010	(r6022)
+++ trunk/src/mainboard/wyse/s50/Kconfig	Fri Nov  5 01:23:11 2010	(r6023)
@@ -29,6 +29,7 @@
    select PIRQ_ROUTE
    select BOARD_ROMSIZE_KB_256
    select POWER_BUTTON_FORCE_DISABLE
+	select GX2_PROCESSOR_MHZ_366

config MAINBOARD_DIR
    string

Modified: trunk/src/northbridge/amd/gx2/Kconfig
==============================================================================
--- trunk/src/northbridge/amd/gx2/Kconfig	Fri Nov  5 01:19:21 2010	(r6022)
+++ trunk/src/northbridge/amd/gx2/Kconfig	Fri Nov  5 01:23:11 2010	(r6023)
@@ -21,9 +21,19 @@
    bool
    select GEODE_VSA

-# Valid PROCESSOR_MHZ options: 300/366/400 MHz.
-config PROCESSOR_MHZ
+# The GX2_PROCESSOR_MHZ options let you chose the correct GX2 processor
+# speed in the mainboard's Kconfig file.
+config GX2_PROCESSOR_MHZ_300
+	bool
+config GX2_PROCESSOR_MHZ_366
+	bool
+config GX2_PROCESSOR_MHZ_400
+	bool
+
+# Map the config names to an integer (MHz).
+config GX2_PROCESSOR_MHZ
    int
-	default 366
-	depends on NORTHBRIDGE_AMD_GX2
+	default 300 if GX2_PROCESSOR_MHZ_300
+	default 366 if GX2_PROCESSOR_MHZ_366
+	default 400 if GX2_PROCESSOR_MHZ_400

Modified: trunk/src/northbridge/amd/gx2/pll_reset.c
==============================================================================
--- trunk/src/northbridge/amd/gx2/pll_reset.c	Fri Nov  5 01:19:21 2010	(r6022)
+++ trunk/src/northbridge/amd/gx2/pll_reset.c	Fri Nov  5 01:23:11 2010	(r6023)
@@ -71,14 +71,14 @@
    unsigned SyncBits;			/* store the sync bits in up ebx */
    unsigned DEFAULT_FBDIV;

-	if (CONFIG_PROCESSOR_MHZ == 400) {
+	if (CONFIG_GX2_PROCESSOR_MHZ == 400) {
    	DEFAULT_FBDIV = 24;
-	} else if (CONFIG_PROCESSOR_MHZ == 366) {
+	} else if (CONFIG_GX2_PROCESSOR_MHZ == 366) {
    	DEFAULT_FBDIV = 22;
-	} else if (CONFIG_PROCESSOR_MHZ == 300) {
+	} else if (CONFIG_GX2_PROCESSOR_MHZ == 300) {
    	DEFAULT_FBDIV = 18;
    } else {
-		printk(BIOS_ERR, "Unsupported PROCESSOR_MHZ setting!\n");
+		printk(BIOS_ERR, "Unsupported GX2_PROCESSOR_MHZ setting!\n");
    	post_code(POST_PLL_CPU_VER_FAIL);
    	__asm__ __volatile__("hlt\n");
    }
@@ -195,6 +195,6 @@
 static unsigned int GeodeLinkSpeed(void)
 {
    unsigned geodelinkspeed;
-	geodelinkspeed = ((CONFIG_PROCESSOR_MHZ * DEFAULT_VDIV) / DEFAULT_MDIV);
+	geodelinkspeed = ((CONFIG_GX2_PROCESSOR_MHZ * DEFAULT_VDIV) / DEFAULT_MDIV);
    return (geodelinkspeed);
 }