[v2] r4442 - in trunk/coreboot-v2/src: include/x86emu southbridge/intel/esb6300 southbridge/intel/i82801gx

Author: oxygene
Date: 2009-07-20 21:34:47 +0200 (Mon, 20 Jul 2009)
New Revision: 4442

Modified:
   trunk/coreboot-v2/src/include/x86emu/fpu_regs.h
   trunk/coreboot-v2/src/southbridge/intel/esb6300/esb6300_lpc.c
   trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c
Log:
Rename some preprocessor symbols. I have no idea why
those symbols were left alone before, after this, they're
somewhat more in line with the rest of the tree.

Signed-off-by: Patrick Georgi 
Acked-by: Stefan Reinauer

Modified: trunk/coreboot-v2/src/include/x86emu/fpu_regs.h
===================================================================
--- trunk/coreboot-v2/src/include/x86emu/fpu_regs.h	2009-07-19 00:18:15 UTC (rev 4441)
+++ trunk/coreboot-v2/src/include/x86emu/fpu_regs.h	2009-07-20 19:34:47 UTC (rev 4442)
@@ -40,7 +40,7 @@
 #define __X86EMU_FPU_REGS_H

-#if defined(CONFIG_DEBUG) && (DEBUG == 0)
+#if defined(CONFIG_DEBUG) && (CONFIG_DEBUG == 0)
 #undef CONFIG_DEBUG
 #endif

Modified: trunk/coreboot-v2/src/southbridge/intel/esb6300/esb6300_lpc.c
===================================================================
--- trunk/coreboot-v2/src/southbridge/intel/esb6300/esb6300_lpc.c	2009-07-19 00:18:15 UTC (rev 4441)
+++ trunk/coreboot-v2/src/southbridge/intel/esb6300/esb6300_lpc.c	2009-07-20 19:34:47 UTC (rev 4442)
@@ -18,8 +18,8 @@
 #define MAINBOARD_POWER_OFF 0
 #define MAINBOARD_POWER_ON  1

-#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

#define ALL		(0xff << 24)
@@ -277,7 +277,7 @@
 {
    uint8_t byte;
    uint32_t value;
-	int pwr_on=MAINBOARD_POWER_ON_AFTER_FAIL;
+	int pwr_on=CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL;

/* sata settings */
    pci_write_config32(dev, 0x58, 0x00001181);

Modified: trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c
===================================================================
--- trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c	2009-07-19 00:18:15 UTC (rev 4441)
+++ trunk/coreboot-v2/src/southbridge/intel/i82801gx/i82801gx_lpc.c	2009-07-20 19:34:47 UTC (rev 4442)
@@ -33,8 +33,8 @@
 #define MAINBOARD_POWER_OFF 0
 #define MAINBOARD_POWER_ON  1

-#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

#define NMI_OFF 0