summaryrefslogtreecommitdiff
path: root/src/include/cpu/cpu.h
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2013-03-21 11:51:41 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2013-03-22 00:00:09 +0100
commit24d1d4b47274eb82893e6726472a991a36fce0aa (patch)
tree57126316330f6f9d407f605fa831ce530650f069 /src/include/cpu/cpu.h
parent55ed3106556a9bcbe36d3389dc5230d4a4ee2a40 (diff)
downloadcoreboot-24d1d4b47274eb82893e6726472a991a36fce0aa.tar.xz
x86: Unify arch/io.h and arch/romcc_io.h
Here's the great news: From now on you don't have to worry about hitting the right io.h include anymore. Just forget about romcc_io.h and use io.h instead. This cleanup has a number of advantages, like you don't have to guard device/ includes for SMM and pre RAM anymore. This allows to get rid of a number of ifdefs and will generally make the code more readable and understandable. Potentially in the future some of the code in the io.h __PRE_RAM__ path should move to device.h or other device/ includes instead, but that's another incremental change. Change-Id: I356f06110e2e355e9a5b4b08c132591f36fec7d9 Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/2872 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/include/cpu/cpu.h')
-rw-r--r--src/include/cpu/cpu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h
index cf2d38997d..bed77de017 100644
--- a/src/include/cpu/cpu.h
+++ b/src/include/cpu/cpu.h
@@ -3,7 +3,7 @@
#include <arch/cpu.h>
-#if !defined(__ROMCC__)
+#if !defined(__PRE_RAM__) && !defined(__SMM__)
void cpu_initialize(unsigned int cpu_index);
struct bus;
void initialize_cpus(struct bus *cpu_bus);
@@ -20,6 +20,6 @@ void smm_setup_structures(void *gnvs, void *tcg, void *smi1);
extern struct cpu_driver cpu_drivers[];
/** end of compile time generated pci driver array */
extern struct cpu_driver ecpu_drivers[];
-#endif /* !__ROMCC__ */
+#endif /* !__PRE_RAM__ && !__SMM__ */
#endif /* CPU_CPU_H */