[coreboot] [v2] r4497 - trunk/coreboot-v2/src/southbridge/intel/i82801gx

[svn at coreboot.org]

Author: oxygene
Date: 2009-08-05 14:24:23 +0200 (Wed, 05 Aug 2009)
New Revision: 4497

Modified:
   trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c
   trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_power.h
   trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_smihandler.c
Log:
Add some more CONFIG_* prefixes that were missing.

Signed-off-by: Patrick Georgi <patrick.georgi at coresystems.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>


Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c
===================================================================
--- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c	2009-08-05 12:16:01 UTC (rev 4496)
+++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c	2009-08-05 12:24:23 UTC (rev 4497)
@@ -273,7 +273,7 @@
 	/* Set up power management block and determine sleep mode */
 	pmbase = pci_read_config16(dev, 0x40) & 0xfffe;
 	reg32 = inl(pmbase + 0x04); // PM1_CNT
-#if HAVE_ACPI_RESUME
+#if CONFIG_HAVE_ACPI_RESUME
 	acpi_slp_type = (((reg32 >> 10) & 7) == 5) ? 3 : 0;
 	printk_debug("PM1_CNT: 0x%08x --> acpi_sleep_type: %x\n", 
 			reg32, acpi_slp_type);

Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_power.h
===================================================================
--- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_power.h	2009-08-05 12:16:01 UTC (rev 4496)
+++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_power.h	2009-08-05 12:24:23 UTC (rev 4497)
@@ -23,7 +23,7 @@
 #define MAINBOARD_POWER_ON	1
 #define MAINBOARD_POWER_KEEP	2
 
-#ifndef MAINBOARD_POWER_ON_AFTER_FAIL
-#define MAINBOARD_POWER_ON_AFTER_FAIL MAINBOARD_POWER_ON
+#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL
+#define CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL MAINBOARD_POWER_ON
 #endif
 

Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_smihandler.c
===================================================================
--- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_smihandler.c	2009-08-05 12:16:01 UTC (rev 4496)
+++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_smihandler.c	2009-08-05 12:24:23 UTC (rev 4497)
@@ -300,7 +300,7 @@
 	 * CMOS or even better from GNVS. Right now it's hard
 	 * coded at compile time.
 	 */
-	u8 s5pwr = MAINBOARD_POWER_ON_AFTER_FAIL;
+	u8 s5pwr = CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL;
 
 	/* First, disable further SMIs */
 	reg8 = inb(pmbase + SMI_EN);