* Explicitly add __PRE_RAM__ where it should be added.

* Don't implicitly add __PRE_RAM__ in romcc. 

Fixes intel/xe7501devkit

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4998 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2010-01-05 13:03:02 +00:00 committed by Stefan Reinauer
parent 1f807fd42f
commit a0c68f864e
76 changed files with 80 additions and 6 deletions

View File

@ -1,3 +1,4 @@
#define __PRE_RAM__
#if CONFIG_LOGICAL_CPUS && \
(defined(CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT) || defined(CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT))
#include <cpu/x86/lapic/boot_cpu.c>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <arch/io.h>
#include "arch/romcc_io.h"

View File

@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define __PRE_RAM__
#define ASSEMBLY 1
#include <stdint.h>

View File

@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define __PRE_RAM__
#define ASSEMBLY 1
#include <stdint.h>

View File

@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define __PRE_RAM__
#define ASSEMBLY 1
#include <stdint.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <arch/io.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <arch/io.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <stdlib.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -20,6 +20,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <arch/io.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#define ASM_CONSOLE_LOGLEVEL 8
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#define ASM_CONSOLE_LOGLEVEL 8
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,3 +1,4 @@
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <arch/io.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <stdlib.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <stdlib.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>

View File

@ -20,6 +20,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <stdlib.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <stdlib.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <stdlib.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <stdlib.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <stdlib.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <arch/io.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <arch/io.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <arch/io.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <arch/io.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <arch/io.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>

View File

@ -5,6 +5,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#define ASM_CONSOLE_LOGLEVEL 6
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <stdlib.h>

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -20,6 +20,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>

View File

@ -20,6 +20,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>

View File

@ -1,4 +1,5 @@
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>
@ -45,11 +46,11 @@ static void enable_mainboard_devices(void)
pci_write_config8(dev, 0x51, 0xff);
#if 0
// This early setup switches IDE into compatibility mode before PCI gets
// // a chance to assign I/Os
// movl $CONFIG_ADDR(0, 0x89, 0x42), %eax
// // movb $0x09, %dl
// movb $0x00, %dl
// PCI_WRITE_CONFIG_BYTE
// a chance to assign I/Os
// movl $CONFIG_ADDR(0, 0x89, 0x42), %eax
// movb $0x09, %dl
// movb $0x00, %dl
// PCI_WRITE_CONFIG_BYTE
//
#endif
/* we do this here as in V2, we can not yet do raw operations

View File

@ -19,6 +19,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -20,6 +20,7 @@
*/
#define ASSEMBLY 1
#define __PRE_RAM__
#include <stdint.h>
#include <device/pci_def.h>

View File

@ -3616,7 +3616,6 @@ static void register_builtin_macros(struct compile_state *state)
tm = localtime(&now);
register_builtin_macro(state, "__ROMCC__", VERSION_MAJOR);
register_builtin_macro(state, "__PRE_RAM__", VERSION_MAJOR);
register_builtin_macro(state, "__ROMCC_MINOR__", VERSION_MINOR);
register_builtin_macro(state, "__FILE__", "\"This should be the filename\"");
register_builtin_macro(state, "__LINE__", "54321");