Hi,
attached patch renames 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 patrick.georgi@coresystems.de
Index: src/southbridge/intel/esb6300/esb6300_lpc.c =================================================================== --- src/southbridge/intel/esb6300/esb6300_lpc.c (revision 4441) +++ src/southbridge/intel/esb6300/esb6300_lpc.c (working copy) @@ -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); Index: src/southbridge/intel/i82801gx/i82801gx_lpc.c =================================================================== --- src/southbridge/intel/i82801gx/i82801gx_lpc.c (revision 4441) +++ src/southbridge/intel/i82801gx/i82801gx_lpc.c (working copy) @@ -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 Index: src/include/x86emu/fpu_regs.h =================================================================== --- src/include/x86emu/fpu_regs.h (revision 4441) +++ src/include/x86emu/fpu_regs.h (working copy) @@ -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