summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-09-12 21:37:53 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-09-14 10:56:46 +0000
commit505e3f7e852a5f3d9a37b702c9095443e6ad7d44 (patch)
treeca5fb8c9e5b9d40da39bf6ae0310bc23338db156
parentcf49dec4deb5c368ad52a68b4ecb25129694751f (diff)
downloadcoreboot-505e3f7e852a5f3d9a37b702c9095443e6ad7d44.tar.xz
arch/x86: Replace some __PRE_RAM__ use
Change-Id: I4d8db430f8cd0bf0f161fc5cef052f153e59e2bc Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/35390 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/arch/x86/include/arch/acpi.h2
-rw-r--r--src/include/cpu/amd/mtrr.h2
-rw-r--r--src/include/cpu/x86/cache.h2
-rw-r--r--src/include/cpu/x86/lapic.h4
4 files changed, 2 insertions, 8 deletions
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 42e45fb32f..6cd4e9fae8 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -974,7 +974,7 @@ static inline int acpi_s3_resume_allowed(void)
#if CONFIG(HAVE_ACPI_RESUME)
-#ifdef __PRE_RAM__
+#if ENV_ROMSTAGE_OR_BEFORE
static inline int acpi_is_wakeup_s3(void)
{
return (acpi_get_sleep_type() == ACPI_S3);
diff --git a/src/include/cpu/amd/mtrr.h b/src/include/cpu/amd/mtrr.h
index f6b213e69d..edbf7bb2aa 100644
--- a/src/include/cpu/amd/mtrr.h
+++ b/src/include/cpu/amd/mtrr.h
@@ -38,7 +38,7 @@
#define TOP_MEM_MASK 0x007fffff
#define TOP_MEM_MASK_KB (TOP_MEM_MASK >> 10)
-#if !defined(__PRE_RAM__) && !defined(__ASSEMBLER__)
+#if !defined(__ROMCC__) && !defined(__ASSEMBLER__)
#include <cpu/x86/msr.h>
diff --git a/src/include/cpu/x86/cache.h b/src/include/cpu/x86/cache.h
index 7f135e5390..713ca323a8 100644
--- a/src/include/cpu/x86/cache.h
+++ b/src/include/cpu/x86/cache.h
@@ -84,9 +84,7 @@ static __always_inline void disable_cache(void)
wbinvd();
}
-#if !defined(__PRE_RAM__)
void x86_enable_cache(void);
-#endif
#endif /* !__ASSEMBLER__ */
#endif /* CPU_X86_CACHE */
diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h
index 2f40742e03..6fd1997e76 100644
--- a/src/include/cpu/x86/lapic.h
+++ b/src/include/cpu/x86/lapic.h
@@ -58,8 +58,6 @@ static __always_inline void stop_this_cpu(void)
void stop_this_cpu(void);
#endif
-#if !defined(__PRE_RAM__)
-
#define xchg(ptr, v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v), (ptr), \
sizeof(*(ptr))))
@@ -132,6 +130,4 @@ static inline void setup_lapic(void)
struct device;
int start_cpu(struct device *cpu);
-#endif /* !__PRE_RAM__ */
-
#endif /* CPU_X86_LAPIC_H */