GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some more misuses of ifdef/if defined 

Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6515 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2011-04-19 01:18:54 +00:00 committed by Stefan Reinauer
parent 432461ec7f
commit 582748fbb3
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cpu/x86/smm/smmrelocate.S
View File

@ -22,17 +22,18 @@
// Make sure no stage 2 code is included:
#define __PRE_RAM__
#if !defined(CONFIG_NORTHBRIDGE_AMD_AMDK8) && !defined(CONFIG_NORTHBRIDGE_AMD_FAM10)
/* On AMD's platforms we can set SMBASE by writing an MSR */
#if !CONFIG_NORTHBRIDGE_AMD_AMDK8 && !CONFIG_NORTHBRIDGE_AMD_AMDFAM10
// FIXME: Is this piece of code southbridge specific, or
// can it be cleaned up so this include is not required?
// It's needed right now because we get our DEFAULT_PMBASE from
// here.
#if defined(CONFIG_SOUTHBRIDGE_INTEL_I82801GX)
#if CONFIG_SOUTHBRIDGE_INTEL_I82801GX
#include "../../../southbridge/intel/i82801gx/i82801gx.h"
#elif defined(CONFIG_SOUTHBRIDGE_INTEL_I82801DX)
#elif CONFIG_SOUTHBRIDGE_INTEL_I82801DX
#include "../../../southbridge/intel/i82801dx/i82801dx.h"
#elif defined(CONFIG_SOUTHBRIDGE_INTEL_SCH)
#elif CONFIG_SOUTHBRIDGE_INTEL_SCH
#include "../../../southbridge/intel/sch/sch.h"
#else
#error "Southbridge needs SMM handler support."
@ -152,7 +153,7 @@ smm_relocate:
/* End of southbridge specific section. */
#if defined(CONFIG_DEBUG_SMM_RELOCATION) && CONFIG_DEBUG_SMM_RELOCATION
#if CONFIG_DEBUG_SMM_RELOCATION
/* print [SMM-x] so we can determine if CPUx went to SMM */
movw $CONFIG_TTYS0_BASE, %dx
mov $'[', %al

2
src/southbridge/amd/sb700/sb700.c
View File

@ -226,7 +226,7 @@ void sb7xx_51xx_enable(device_t dev)
}
}
#ifdef CONFIG_SOUTHBRIDGE_AMD_SP5100
#if CONFIG_SOUTHBRIDGE_AMD_SP5100
struct chip_operations southbridge_amd_sp5100_ops = {
CHIP_NAME("ATI SP5100")
.enable_dev = sb7xx_51xx_enable,