aboutsummaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2011-04-21 20:45:45 +0000
committerStefan Reinauer <stepan@openbios.org>2011-04-21 20:45:45 +0000
commitd4814bd41c080fb9dda87c762fcaecf4e72fc996 (patch)
tree57a44f8cbfad3642084b8e3d092e230b8f7e7198 /src/include
parent1d888a97849d68a7136da558c3697c7f2a8d898a (diff)
more ifdef -> if fixes
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@6536 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/include')
-rw-r--r--src/include/cpu/cpu.h2
-rw-r--r--src/include/cpu/x86/mtrr.h2
-rw-r--r--src/include/lib.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h
index d33b6da62e..cca2be1b27 100644
--- a/src/include/cpu/cpu.h
+++ b/src/include/cpu/cpu.h
@@ -9,7 +9,7 @@ void cpu_initialize(void);
void initialize_cpus(struct bus *cpu_bus);
void secondary_cpu_init(void);
-#if !defined(CONFIG_WAIT_BEFORE_CPUS_INIT) || CONFIG_WAIT_BEFORE_CPUS_INIT==0
+#if !CONFIG_WAIT_BEFORE_CPUS_INIT
#define cpus_ready_for_init() do {} while(0)
#else
void cpus_ready_for_init(void);
diff --git a/src/include/cpu/x86/mtrr.h b/src/include/cpu/x86/mtrr.h
index 5f0a8f2e4a..44a2223738 100644
--- a/src/include/cpu/x86/mtrr.h
+++ b/src/include/cpu/x86/mtrr.h
@@ -69,7 +69,7 @@ void x86_setup_fixed_mtrrs(void);
#if !defined (__ASSEMBLER__)
#if defined(CONFIG_XIP_ROM_SIZE)
-# if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK
+# if CONFIG_TINY_BOOTBLOCK
extern unsigned long AUTO_XIP_ROM_BASE;
# define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
# else
diff --git a/src/include/lib.h b/src/include/lib.h
index 1acb114dc6..ba9684a0c1 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -40,7 +40,7 @@ void ram_check(unsigned long start, unsigned long stop);
void quick_ram_check(void);
/* Defined in romstage.c */
-#if defined(CONFIG_CPU_AMD_LX) && CONFIG_CPU_AMD_LX
+#if CONFIG_CPU_AMD_LX
void cache_as_ram_main(void);
#else
void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx);