From 85a94f66b2c72a0ea4530de2b412a7cba98ad736 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 20 Jul 2009 19:34:47 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4442 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/include/x86emu/fpu_regs.h | 2 +- src/southbridge/intel/esb6300/esb6300_lpc.c | 6 +++--- src/southbridge/intel/i82801gx/i82801gx_lpc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/include/x86emu/fpu_regs.h b/src/include/x86emu/fpu_regs.h index dbdb67b618..f6e229456b 100644 --- a/src/include/x86emu/fpu_regs.h +++ b/src/include/x86emu/fpu_regs.h @@ -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 diff --git a/src/southbridge/intel/esb6300/esb6300_lpc.c b/src/southbridge/intel/esb6300/esb6300_lpc.c index 95e888fc50..bae9e715d5 100644 --- a/src/southbridge/intel/esb6300/esb6300_lpc.c +++ b/src/southbridge/intel/esb6300/esb6300_lpc.c @@ -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 @@ static void lpc_init(struct device *dev) { 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); diff --git a/src/southbridge/intel/i82801gx/i82801gx_lpc.c b/src/southbridge/intel/i82801gx/i82801gx_lpc.c index 73cd29e94f..ca2b409321 100644 --- a/src/southbridge/intel/i82801gx/i82801gx_lpc.c +++ b/src/southbridge/intel/i82801gx/i82801gx_lpc.c @@ -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