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

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>
This commit is contained in:
Kyösti Mälkki 2019-09-12 21:37:53 +03:00
parent cf49dec4de
commit 505e3f7e85
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/x86/include/arch/acpi.h
View File

@ -974,7 +974,7 @@ static inline int acpi_s3_resume_allowed(void)
#if CONFIG(HAVE_ACPI_RESUME) #if CONFIG(HAVE_ACPI_RESUME)
#ifdef __PRE_RAM__ #if ENV_ROMSTAGE_OR_BEFORE
static inline int acpi_is_wakeup_s3(void) static inline int acpi_is_wakeup_s3(void)
{ {
return (acpi_get_sleep_type() == ACPI_S3); return (acpi_get_sleep_type() == ACPI_S3);

2
src/include/cpu/amd/mtrr.h
View File

@ -38,7 +38,7 @@
#define TOP_MEM_MASK 0x007fffff #define TOP_MEM_MASK 0x007fffff
#define TOP_MEM_MASK_KB (TOP_MEM_MASK >> 10) #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> #include <cpu/x86/msr.h>

2
src/include/cpu/x86/cache.h
View File

@ -84,9 +84,7 @@ static __always_inline void disable_cache(void)
wbinvd(); wbinvd();
} }
#if !defined(__PRE_RAM__)
void x86_enable_cache(void); void x86_enable_cache(void);
#endif
#endif /* !__ASSEMBLER__ */ #endif /* !__ASSEMBLER__ */
#endif /* CPU_X86_CACHE */ #endif /* CPU_X86_CACHE */

4
src/include/cpu/x86/lapic.h
View File

@ -58,8 +58,6 @@ static __always_inline void stop_this_cpu(void)
void stop_this_cpu(void); void stop_this_cpu(void);
#endif #endif
#if !defined(__PRE_RAM__)
#define xchg(ptr, v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v), (ptr), \ #define xchg(ptr, v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v), (ptr), \
sizeof(*(ptr)))) sizeof(*(ptr))))
@ -132,6 +130,4 @@ static inline void setup_lapic(void)
struct device; struct device;
int start_cpu(struct device *cpu); int start_cpu(struct device *cpu);
#endif /* !__PRE_RAM__ */
#endif /* CPU_X86_LAPIC_H */ #endif /* CPU_X86_LAPIC_H */