sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In 2007 Adrian Reber suggested that we drop ASSEMBLY in favor of __ASSEMBLER__.

Browse Source 
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:
Stefan Reinauer
2011-04-10 04:15:23 +00:00
committed by Stefan Reinauer
parent df6fd566ba
commit 61aee5f4b1
23 changed files with 17 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -511,7 +511,7 @@
#define PMLogic_BASE (0x9D00)
#if !defined(__ROMCC__) && !defined(ASSEMBLY)
#if !defined(__ROMCC__) && !defined(__ASSEMBLER__)
#if defined(__PRE_RAM__)
void cpuRegInit(void);
void SystemPreInit(void);

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

@@ -630,7 +630,7 @@
#define DELAY_UPPER_DISABLE_CLK135 (1 << 23)
#define DELAY_LOWER_STATUS_MASK 0x7C0
#if !defined(__ROMCC__) && !defined(ASSEMBLY)
#if !defined(__ROMCC__) && !defined(__ASSEMBLER__)
#if defined(__PRE_RAM__)
void cpuRegInit(int debug_clock_disable, u8 dimm0, u8 dimm1, int terminated);
void SystemPreInit(void);

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

@@ -33,7 +33,7 @@
#define TOP_MEM_MASK 0x007fffff
#define TOP_MEM_MASK_KB (TOP_MEM_MASK >> 10)
#if !defined(__PRE_RAM__) && !defined(ASSEMBLY)
#if !defined(__PRE_RAM__) && !defined(__ASSEMBLER__)
void amd_setup_mtrrs(void);
#endif

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

@@ -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;

4
src/include/fallback.h
View File

@@ -1,12 +1,12 @@
#ifndef FALLBACK_H
#define FALLBACK_H
#if !defined(ASSEMBLY) && !defined(__PRE_RAM__)
#if !defined(__ASSEMBLER__) && !defined(__PRE_RAM__)
void set_boot_successful(void);
void boot_successful(void);
#endif /* ASSEMBLY */
#endif /* __ASSEMBLER__ */
#define RTC_BOOT_BYTE 48