* 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

src/arch/i386/init/bootblock.c

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

src/arch/i386/lib/failover.c

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

src/mainboard/a-trend/atc-6220/auto.c

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

src/mainboard/a-trend/atc-6240/auto.c

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

src/mainboard/abit/be6-ii_v2_0/auto.c

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

src/mainboard/advantech/pcm-5820/auto.c

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

src/mainboard/amd/rumba/auto.c

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

src/mainboard/asi/mb_5blgp/auto.c

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

src/mainboard/asi/mb_5blmp/auto.c

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

src/mainboard/asus/mew-am/auto.c

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

src/mainboard/asus/mew-vm/auto.c

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

src/mainboard/asus/p2b-d/auto.c

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

src/mainboard/asus/p2b-ds/auto.c

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

src/mainboard/asus/p2b-f/auto.c

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

src/mainboard/asus/p2b/auto.c

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

src/mainboard/asus/p3b-f/auto.c

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

src/mainboard/axus/tc320/auto.c

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

src/mainboard/azza/pt-6ibd/auto.c

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

src/mainboard/bcom/winnet100/auto.c

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

src/mainboard/bcom/winnetp680/auto.c

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

src/mainboard/biostar/m6tba/auto.c

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

src/mainboard/compaq/deskpro_en_sff_p600/auto.c

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

src/mainboard/dell/s1850/auto.c

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

src/mainboard/dell/s1850/failover.c

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

src/mainboard/digitallogic/adl855pc/auto.c

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

src/mainboard/digitallogic/msm586seg/auto.c

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

src/mainboard/digitallogic/msm800sev/auto.c

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

src/mainboard/eaglelion/5bcm/auto.c

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

src/mainboard/emulation/qemu-x86/auto.c

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

src/mainboard/emulation/qemu-x86/failover.c

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

src/mainboard/gigabyte/ga-6bxc/auto.c

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

src/mainboard/hp/e_vectra_p2706t/auto.c

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

src/mainboard/iei/juki-511p/auto.c

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

src/mainboard/iei/nova4899r/auto.c

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

src/mainboard/intel/jarrell/auto.c

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

src/mainboard/intel/jarrell/failover.c

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

src/mainboard/intel/mtarvon/auto.c

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

src/mainboard/intel/truxton/auto.c

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

src/mainboard/intel/xe7501devkit/failover.c

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

src/mainboard/jetway/j7f24/auto.c

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

src/mainboard/lippert/frontrunner/auto.c

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

src/mainboard/mitac/6513wu/auto.c

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

src/mainboard/msi/ms6119/auto.c

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

src/mainboard/msi/ms6147/auto.c

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

src/mainboard/msi/ms6156/auto.c

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

src/mainboard/msi/ms6178/auto.c

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

src/mainboard/nec/powermate2000/auto.c

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

src/mainboard/olpc/btest/auto.c

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

src/mainboard/olpc/btest/failover.c

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

src/mainboard/olpc/rev_a/auto.c

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

src/mainboard/olpc/rev_a/failover.c

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

src/mainboard/rca/rm4100/auto.c

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

src/mainboard/soyo/sy-6ba-plus-iii/auto.c

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

src/mainboard/supermicro/x6dai_g/auto.c

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

src/mainboard/supermicro/x6dai_g/failover.c

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

src/mainboard/supermicro/x6dhe_g/auto.c

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

src/mainboard/supermicro/x6dhe_g/failover.c

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

src/mainboard/supermicro/x6dhe_g2/auto.c

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

src/mainboard/supermicro/x6dhe_g2/failover.c

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

src/mainboard/supermicro/x6dhr_ig/auto.c

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

src/mainboard/supermicro/x6dhr_ig/failover.c

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

src/mainboard/supermicro/x6dhr_ig2/auto.c

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

src/mainboard/supermicro/x6dhr_ig2/failover.c

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

src/mainboard/technologic/ts5300/auto.c

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

src/mainboard/televideo/tc7020/auto.c

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

src/mainboard/thomson/ip1000/auto.c

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

src/mainboard/tyan/s1846/auto.c

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

src/mainboard/via/epia-cn/auto.c

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

src/mainboard/via/epia-m/auto.c

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

src/mainboard/via/epia-m/failover.c

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

src/mainboard/via/epia-n/auto.c

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

src/mainboard/via/epia-n/failover.c

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

src/mainboard/via/epia/auto.c

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

src/mainboard/via/pc2500e/auto.c

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

src/mainboard/via/vt8454c/auto.c

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

util/romcc/romcc.c

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