In 2007 Adrian Reber suggested that we drop ASSEMBLY in favor of __ASSEMBLER__.
http://www.coreboot.org/pipermail/coreboot/2007-September/024665.html It's about time we follow this advice. Also move some manually set __PRE_RAM__ defines (ap_romstage.c) to the Makefile and drop unused CPP define Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Acked-by: Patrick Georgi <patrick@georgi-clan.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6482 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
committed by
Stefan Reinauer
parent
df6fd566ba
commit
61aee5f4b1
@@ -36,7 +36,7 @@
|
||||
#define MTRRfix4K_F0000_MSR 0x26e
|
||||
#define MTRRfix4K_F8000_MSR 0x26f
|
||||
|
||||
#if !defined (ASSEMBLY) && !defined(__PRE_RAM__)
|
||||
#if !defined (__ASSEMBLER__) && !defined(__PRE_RAM__)
|
||||
#include <device/device.h>
|
||||
void enable_fixed_mtrr(void);
|
||||
void x86_setup_var_mtrrs(unsigned int address_bits, unsigned int above4gb);
|
||||
@@ -69,7 +69,7 @@ void x86_setup_fixed_mtrrs(void);
|
||||
#endif
|
||||
|
||||
|
||||
#if !defined (ASSEMBLY)
|
||||
#if !defined (__ASSEMBLER__)
|
||||
#if defined(CONFIG_XIP_ROM_SIZE)
|
||||
# if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK
|
||||
extern unsigned long AUTO_XIP_ROM_BASE;
|
||||
|
Reference in New Issue
Block a user