__PRE_RAM__ is now correctly specified in the Makefile. No need to hack it into

romstage.c anymore

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5315 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

122 files changed, 122 insertions, 124 deletions

diff --git a/src/mainboard/a-trend/atc-6220/romstage.c b/src/mainboard/a-trend/atc-6220/romstage.c
index 5fe11bc197..393cdcf0ad 100644
--- a/src/mainboard/a-trend/atc-6220/romstage.c
+++ b/src/mainboard/a-trend/atc-6220/romstage.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define __PRE_RAM__
+
 #define ASSEMBLY 1
 
 #include <stdint.h>
diff --git a/src/mainboard/a-trend/atc-6240/romstage.c b/src/mainboard/a-trend/atc-6240/romstage.c
index 752f1a19d0..fbceb6fdd5 100644
--- a/src/mainboard/a-trend/atc-6240/romstage.c
+++ b/src/mainboard/a-trend/atc-6240/romstage.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define __PRE_RAM__
+
 #define ASSEMBLY 1
 
 #include <stdint.h>
diff --git a/src/mainboard/abit/be6-ii_v2_0/romstage.c b/src/mainboard/abit/be6-ii_v2_0/romstage.c
index bdd0ffee2f..f3082892f1 100644
--- a/src/mainboard/abit/be6-ii_v2_0/romstage.c
+++ b/src/mainboard/abit/be6-ii_v2_0/romstage.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define __PRE_RAM__
+
 #define ASSEMBLY 1
 
 #include <stdint.h>
diff --git a/src/mainboard/advantech/pcm-5820/romstage.c b/src/mainboard/advantech/pcm-5820/romstage.c
index 6c9abe2903..3bcb063a2d 100644
--- a/src/mainboard/advantech/pcm-5820/romstage.c
+++ b/src/mainboard/advantech/pcm-5820/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <arch/io.h>
diff --git a/src/mainboard/amd/db800/romstage.c b/src/mainboard/amd/db800/romstage.c
index c18b0bb154..640dc4984f 100644
--- a/src/mainboard/amd/db800/romstage.c
+++ b/src/mainboard/amd/db800/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/amd/dbm690t/romstage.c b/src/mainboard/amd/dbm690t/romstage.c
index df960e49fb..872cb2f0a3 100644
--- a/src/mainboard/amd/dbm690t/romstage.c
+++ b/src/mainboard/amd/dbm690t/romstage.c
@@ -18,7 +18,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 #define K8_SET_FIDVID 1
diff --git a/src/mainboard/amd/mahogany/romstage.c b/src/mainboard/amd/mahogany/romstage.c
index 7a09aa70d8..0c25cf6b77 100644
--- a/src/mainboard/amd/mahogany/romstage.c
+++ b/src/mainboard/amd/mahogany/romstage.c
@@ -18,7 +18,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 #define K8_SET_FIDVID 1
diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c
index 5198a638b3..f9259cd43a 100644
--- a/src/mainboard/amd/mahogany_fam10/romstage.c
+++ b/src/mainboard/amd/mahogany_fam10/romstage.c
@@ -19,7 +19,7 @@
 
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 //#define SYSTEM_TYPE 0	/* SERVER */
 #define SYSTEM_TYPE 1	/* DESKTOP */
diff --git a/src/mainboard/amd/pistachio/romstage.c b/src/mainboard/amd/pistachio/romstage.c
index 8184cb29a2..e38c63916c 100644
--- a/src/mainboard/amd/pistachio/romstage.c
+++ b/src/mainboard/amd/pistachio/romstage.c
@@ -18,7 +18,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 #define K8_SET_FIDVID 1
diff --git a/src/mainboard/amd/rumba/romstage.c b/src/mainboard/amd/rumba/romstage.c
index 1dce42548e..ea3ec908fa 100644
--- a/src/mainboard/amd/rumba/romstage.c
+++ b/src/mainboard/amd/rumba/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/amd/serengeti_cheetah/romstage.c b/src/mainboard/amd/serengeti_cheetah/romstage.c
index e29af87505..d4d3c46c0c 100644
--- a/src/mainboard/amd/serengeti_cheetah/romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 #define CACHE_AS_RAM_ADDRESS_DEBUG 0
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
index fa65000b89..e628304445 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
@@ -19,7 +19,7 @@
 
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define SYSTEM_TYPE 0	/* SERVER */
 //#define SYSTEM_TYPE 1	/* DESKTOP */
diff --git a/src/mainboard/arima/hdama/romstage.c b/src/mainboard/arima/hdama/romstage.c
index 0c6faf76c3..ae9e3db666 100644
--- a/src/mainboard/arima/hdama/romstage.c
+++ b/src/mainboard/arima/hdama/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/artecgroup/dbe61/romstage.c b/src/mainboard/artecgroup/dbe61/romstage.c
index 76cbacd891..fea9925d37 100644
--- a/src/mainboard/artecgroup/dbe61/romstage.c
+++ b/src/mainboard/artecgroup/dbe61/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/asi/mb_5blgp/romstage.c b/src/mainboard/asi/mb_5blgp/romstage.c
index b4b82fc65a..b7641d8fe0 100644
--- a/src/mainboard/asi/mb_5blgp/romstage.c
+++ b/src/mainboard/asi/mb_5blgp/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <arch/io.h>
diff --git a/src/mainboard/asi/mb_5blmp/romstage.c b/src/mainboard/asi/mb_5blmp/romstage.c
index 96e91c0fe2..a494b582db 100644
--- a/src/mainboard/asi/mb_5blmp/romstage.c
+++ b/src/mainboard/asi/mb_5blmp/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/asus/a8n_e/romstage.c b/src/mainboard/asus/a8n_e/romstage.c
index 6cf71b0b40..54aedc7ba3 100644
--- a/src/mainboard/asus/a8n_e/romstage.c
+++ b/src/mainboard/asus/a8n_e/romstage.c
@@ -22,7 +22,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 /* Used by it8712f_enable_serial(). */
 #define SERIAL_DEV PNP_DEV(0x2e, IT8712F_SP1)
diff --git a/src/mainboard/asus/a8v-e_se/romstage.c b/src/mainboard/asus/a8v-e_se/romstage.c
index a535caaadf..91a430b4e9 100644
--- a/src/mainboard/asus/a8v-e_se/romstage.c
+++ b/src/mainboard/asus/a8v-e_se/romstage.c
@@ -23,7 +23,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 
diff --git a/src/mainboard/asus/m2v-mx_se/romstage.c b/src/mainboard/asus/m2v-mx_se/romstage.c
index 4f4b481b8a..9bb4c8d1b3 100644
--- a/src/mainboard/asus/m2v-mx_se/romstage.c
+++ b/src/mainboard/asus/m2v-mx_se/romstage.c
@@ -23,7 +23,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 
diff --git a/src/mainboard/asus/mew-am/romstage.c b/src/mainboard/asus/mew-am/romstage.c
index 8751e0ec28..e21a7c6db5 100644
--- a/src/mainboard/asus/mew-am/romstage.c
+++ b/src/mainboard/asus/mew-am/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/asus/mew-vm/romstage.c b/src/mainboard/asus/mew-vm/romstage.c
index 703cd87de5..9d429db864 100644
--- a/src/mainboard/asus/mew-vm/romstage.c
+++ b/src/mainboard/asus/mew-vm/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/asus/p2b-d/romstage.c b/src/mainboard/asus/p2b-d/romstage.c
index 0d928fe7ec..a4a37c942a 100644
--- a/src/mainboard/asus/p2b-d/romstage.c
+++ b/src/mainboard/asus/p2b-d/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/asus/p2b-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c
index f011824727..b8df5f66db 100644
--- a/src/mainboard/asus/p2b-ds/romstage.c
+++ b/src/mainboard/asus/p2b-ds/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/asus/p2b-f/romstage.c b/src/mainboard/asus/p2b-f/romstage.c
index e9cede41f1..21a49e1703 100644
--- a/src/mainboard/asus/p2b-f/romstage.c
+++ b/src/mainboard/asus/p2b-f/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/asus/p2b-ls/romstage.c b/src/mainboard/asus/p2b-ls/romstage.c
index 8578fdd9b7..a40d39a738 100644
--- a/src/mainboard/asus/p2b-ls/romstage.c
+++ b/src/mainboard/asus/p2b-ls/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/romstage.c
index 62ac87381d..52cdf81f1e 100644
--- a/src/mainboard/asus/p2b/romstage.c
+++ b/src/mainboard/asus/p2b/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p3b-f/romstage.c
index 306b03f5bc..e161ef109f 100644
--- a/src/mainboard/asus/p3b-f/romstage.c
+++ b/src/mainboard/asus/p3b-f/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/axus/tc320/romstage.c b/src/mainboard/axus/tc320/romstage.c
index 9cbd13c4b3..94564d004c 100644
--- a/src/mainboard/axus/tc320/romstage.c
+++ b/src/mainboard/axus/tc320/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/azza/pt-6ibd/romstage.c b/src/mainboard/azza/pt-6ibd/romstage.c
index 6f0b0581a9..9f7bbe51bf 100644
--- a/src/mainboard/azza/pt-6ibd/romstage.c
+++ b/src/mainboard/azza/pt-6ibd/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/bcom/winnet100/romstage.c b/src/mainboard/bcom/winnet100/romstage.c
index 5c4bbe2d37..669329d97d 100644
--- a/src/mainboard/bcom/winnet100/romstage.c
+++ b/src/mainboard/bcom/winnet100/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/bcom/winnetp680/romstage.c b/src/mainboard/bcom/winnetp680/romstage.c
index dd66d3025e..3b76de1617 100644
--- a/src/mainboard/bcom/winnetp680/romstage.c
+++ b/src/mainboard/bcom/winnetp680/romstage.c
@@ -20,7 +20,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/biostar/m6tba/romstage.c b/src/mainboard/biostar/m6tba/romstage.c
index 8234df136f..b3b07ae596 100644
--- a/src/mainboard/biostar/m6tba/romstage.c
+++ b/src/mainboard/biostar/m6tba/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/broadcom/blast/romstage.c b/src/mainboard/broadcom/blast/romstage.c
index d7796f80dd..11d5bb4cf5 100644
--- a/src/mainboard/broadcom/blast/romstage.c
+++ b/src/mainboard/broadcom/blast/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define QRANK_DIMM_SUPPORT 1
 
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
index c465c16781..9c08d1b628 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/dell/s1850/romstage.c b/src/mainboard/dell/s1850/romstage.c
index 108805659e..4c04ecfaee 100644
--- a/src/mainboard/dell/s1850/romstage.c
+++ b/src/mainboard/dell/s1850/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
diff --git a/src/mainboard/digitallogic/adl855pc/romstage.c b/src/mainboard/digitallogic/adl855pc/romstage.c
index 8903876057..b7d8fd0f10 100644
--- a/src/mainboard/digitallogic/adl855pc/romstage.c
+++ b/src/mainboard/digitallogic/adl855pc/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 #define ASM_CONSOLE_LOGLEVEL 8
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/digitallogic/msm586seg/romstage.c b/src/mainboard/digitallogic/msm586seg/romstage.c
index 8f1756b999..918aef59c2 100644
--- a/src/mainboard/digitallogic/msm586seg/romstage.c
+++ b/src/mainboard/digitallogic/msm586seg/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 #define ASM_CONSOLE_LOGLEVEL 8
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/digitallogic/msm800sev/romstage.c b/src/mainboard/digitallogic/msm800sev/romstage.c
index 03f9fae57b..c7dde03ef0 100644
--- a/src/mainboard/digitallogic/msm800sev/romstage.c
+++ b/src/mainboard/digitallogic/msm800sev/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/eaglelion/5bcm/romstage.c b/src/mainboard/eaglelion/5bcm/romstage.c
index 22e7346276..fe41cce3e7 100644
--- a/src/mainboard/eaglelion/5bcm/romstage.c
+++ b/src/mainboard/eaglelion/5bcm/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/emulation/qemu-x86/romstage.c b/src/mainboard/emulation/qemu-x86/romstage.c
index 273f6b9d01..f9da1b5188 100644
--- a/src/mainboard/emulation/qemu-x86/romstage.c
+++ b/src/mainboard/emulation/qemu-x86/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/gigabyte/ga-6bxc/romstage.c b/src/mainboard/gigabyte/ga-6bxc/romstage.c
index 1b440a759e..af3f873bc1 100644
--- a/src/mainboard/gigabyte/ga-6bxc/romstage.c
+++ b/src/mainboard/gigabyte/ga-6bxc/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
index e1b048ac5a..915122f879 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
@@ -22,7 +22,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 
diff --git a/src/mainboard/gigabyte/m57sli/romstage.c b/src/mainboard/gigabyte/m57sli/romstage.c
index 2073b98971..fe5b30169b 100644
--- a/src/mainboard/gigabyte/m57sli/romstage.c
+++ b/src/mainboard/gigabyte/m57sli/romstage.c
@@ -20,7 +20,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 
diff --git a/src/mainboard/hp/dl145_g3/romstage.c b/src/mainboard/hp/dl145_g3/romstage.c
index 33e7207304..c9020c5944 100644
--- a/src/mainboard/hp/dl145_g3/romstage.c
+++ b/src/mainboard/hp/dl145_g3/romstage.c
@@ -26,7 +26,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 
diff --git a/src/mainboard/hp/e_vectra_p2706t/romstage.c b/src/mainboard/hp/e_vectra_p2706t/romstage.c
index f2c643c854..09e3680ee7 100644
--- a/src/mainboard/hp/e_vectra_p2706t/romstage.c
+++ b/src/mainboard/hp/e_vectra_p2706t/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/ibm/e325/romstage.c b/src/mainboard/ibm/e325/romstage.c
index 07e808a163..8af9cffd0c 100644
--- a/src/mainboard/ibm/e325/romstage.c
+++ b/src/mainboard/ibm/e325/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
  
 #include <stdint.h>
 #include <string.h>
diff --git a/src/mainboard/ibm/e326/romstage.c b/src/mainboard/ibm/e326/romstage.c
index 7ad4824c91..751b20b56f 100644
--- a/src/mainboard/ibm/e326/romstage.c
+++ b/src/mainboard/ibm/e326/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
  
 #include <stdint.h>
 #include <string.h>
diff --git a/src/mainboard/iei/juki-511p/romstage.c b/src/mainboard/iei/juki-511p/romstage.c
index 655959fac4..bb649322c3 100644
--- a/src/mainboard/iei/juki-511p/romstage.c
+++ b/src/mainboard/iei/juki-511p/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/iei/nova4899r/romstage.c b/src/mainboard/iei/nova4899r/romstage.c
index 0b15c3f40b..69e2a28c38 100644
--- a/src/mainboard/iei/nova4899r/romstage.c
+++ b/src/mainboard/iei/nova4899r/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c
index 24a350b92b..7af5d8c158 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c
+++ b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/intel/d945gclf/romstage.c b/src/mainboard/intel/d945gclf/romstage.c
index 073ca8efdb..ab3576c944 100644
--- a/src/mainboard/intel/d945gclf/romstage.c
+++ b/src/mainboard/intel/d945gclf/romstage.c
@@ -18,7 +18,7 @@
  */
 
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
-#define __PRE_RAM__
+
 
 /* Configuration of the i945 driver */
 #define CHIPSET_I945GC 1
diff --git a/src/mainboard/intel/eagleheights/romstage.c b/src/mainboard/intel/eagleheights/romstage.c
index 75c4d7375c..6d3673689a 100644
--- a/src/mainboard/intel/eagleheights/romstage.c
+++ b/src/mainboard/intel/eagleheights/romstage.c
@@ -20,7 +20,7 @@
  * MA 02110-1301 USA
  */
 
-#define __PRE_RAM__
+
 
 #include <delay.h>
 
diff --git a/src/mainboard/intel/jarrell/romstage.c b/src/mainboard/intel/jarrell/romstage.c
index d7b1bf40c7..4660b136dc 100644
--- a/src/mainboard/intel/jarrell/romstage.c
+++ b/src/mainboard/intel/jarrell/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
diff --git a/src/mainboard/intel/mtarvon/romstage.c b/src/mainboard/intel/mtarvon/romstage.c
index 6524ea217c..7ff8ed9494 100644
--- a/src/mainboard/intel/mtarvon/romstage.c
+++ b/src/mainboard/intel/mtarvon/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/intel/truxton/romstage.c b/src/mainboard/intel/truxton/romstage.c
index 834c53e53b..0559ecb4f4 100644
--- a/src/mainboard/intel/truxton/romstage.c
+++ b/src/mainboard/intel/truxton/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/intel/xe7501devkit/romstage.c b/src/mainboard/intel/xe7501devkit/romstage.c
index 0bedaf9431..157a9f4719 100644
--- a/src/mainboard/intel/xe7501devkit/romstage.c
+++ b/src/mainboard/intel/xe7501devkit/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/iwill/dk8_htx/romstage.c b/src/mainboard/iwill/dk8_htx/romstage.c
index ca080e6d93..1eb98fc4ce 100644
--- a/src/mainboard/iwill/dk8_htx/romstage.c
+++ b/src/mainboard/iwill/dk8_htx/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 #define CACHE_AS_RAM_ADDRESS_DEBUG 0
diff --git a/src/mainboard/iwill/dk8s2/romstage.c b/src/mainboard/iwill/dk8s2/romstage.c
index eb29d10a21..f04e3eac86 100644
--- a/src/mainboard/iwill/dk8s2/romstage.c
+++ b/src/mainboard/iwill/dk8s2/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 #define CACHE_AS_RAM_ADDRESS_DEBUG 0
diff --git a/src/mainboard/iwill/dk8x/romstage.c b/src/mainboard/iwill/dk8x/romstage.c
index 6128e0cd2e..c46bdebef4 100644
--- a/src/mainboard/iwill/dk8x/romstage.c
+++ b/src/mainboard/iwill/dk8x/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 #define CACHE_AS_RAM_ADDRESS_DEBUG 0
diff --git a/src/mainboard/jetway/j7f24/romstage.c b/src/mainboard/jetway/j7f24/romstage.c
index 82a90dbb8a..b37b305d48 100644
--- a/src/mainboard/jetway/j7f24/romstage.c
+++ b/src/mainboard/jetway/j7f24/romstage.c
@@ -20,7 +20,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/kontron/986lcd-m/romstage.c b/src/mainboard/kontron/986lcd-m/romstage.c
index f5e9f6e55c..c7f1ee9b04 100644
--- a/src/mainboard/kontron/986lcd-m/romstage.c
+++ b/src/mainboard/kontron/986lcd-m/romstage.c
@@ -18,7 +18,7 @@
  */
 
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
-#define __PRE_RAM__
+
 
 /* Configuration of the i945 driver */
 #define CHIPSET_I945GM 1
diff --git a/src/mainboard/kontron/kt690/romstage.c b/src/mainboard/kontron/kt690/romstage.c
index cff33f97f3..6d80c237c3 100644
--- a/src/mainboard/kontron/kt690/romstage.c
+++ b/src/mainboard/kontron/kt690/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 #define K8_SET_FIDVID 1
diff --git a/src/mainboard/lippert/frontrunner/romstage.c b/src/mainboard/lippert/frontrunner/romstage.c
index b0ffcc9d63..1ea608f735 100644
--- a/src/mainboard/lippert/frontrunner/romstage.c
+++ b/src/mainboard/lippert/frontrunner/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/lippert/roadrunner-lx/romstage.c b/src/mainboard/lippert/roadrunner-lx/romstage.c
index e8cfee55bb..c288fc3342 100644
--- a/src/mainboard/lippert/roadrunner-lx/romstage.c
+++ b/src/mainboard/lippert/roadrunner-lx/romstage.c
@@ -22,7 +22,7 @@
 /* Based on romstage.c from AMD's DB800 and DBM690T mainboards. */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/src/mainboard/lippert/spacerunner-lx/romstage.c b/src/mainboard/lippert/spacerunner-lx/romstage.c
index 54d7113a5e..692c5a75e0 100644
--- a/src/mainboard/lippert/spacerunner-lx/romstage.c
+++ b/src/mainboard/lippert/spacerunner-lx/romstage.c
@@ -22,7 +22,7 @@
 /* Based on romstage.c from AMD's DB800 and DBM690T mainboards. */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/src/mainboard/mitac/6513wu/romstage.c b/src/mainboard/mitac/6513wu/romstage.c
index daa2e9660c..fc60ad21cc 100644
--- a/src/mainboard/mitac/6513wu/romstage.c
+++ b/src/mainboard/mitac/6513wu/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/msi/ms6119/romstage.c b/src/mainboard/msi/ms6119/romstage.c
index 942fdfb6d6..0d65058d1f 100644
--- a/src/mainboard/msi/ms6119/romstage.c
+++ b/src/mainboard/msi/ms6119/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/msi/ms6147/romstage.c b/src/mainboard/msi/ms6147/romstage.c
index 5aec34a96d..570a360d93 100644
--- a/src/mainboard/msi/ms6147/romstage.c
+++ b/src/mainboard/msi/ms6147/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/msi/ms6156/romstage.c b/src/mainboard/msi/ms6156/romstage.c
index 78d133b5bf..e3e3e2ef55 100644
--- a/src/mainboard/msi/ms6156/romstage.c
+++ b/src/mainboard/msi/ms6156/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/msi/ms6178/romstage.c b/src/mainboard/msi/ms6178/romstage.c
index 976d24a56c..0441630ca7 100644
--- a/src/mainboard/msi/ms6178/romstage.c
+++ b/src/mainboard/msi/ms6178/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/msi/ms7135/romstage.c b/src/mainboard/msi/ms7135/romstage.c
index 66a29b9fc6..e4372e41db 100644
--- a/src/mainboard/msi/ms7135/romstage.c
+++ b/src/mainboard/msi/ms7135/romstage.c
@@ -23,7 +23,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define SERIAL_DEV PNP_DEV(0x4e, W83627HF_SP1)
 
diff --git a/src/mainboard/msi/ms7260/romstage.c b/src/mainboard/msi/ms7260/romstage.c
index c28df63d5c..725f0f6bd3 100644
--- a/src/mainboard/msi/ms7260/romstage.c
+++ b/src/mainboard/msi/ms7260/romstage.c
@@ -21,7 +21,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 // #define CACHE_AS_RAM_ADDRESS_DEBUG 1
 // #define RAM_TIMING_DEBUG 1
diff --git a/src/mainboard/msi/ms9185/romstage.c b/src/mainboard/msi/ms9185/romstage.c
index e403bdfb02..d0b7ebde77 100644
--- a/src/mainboard/msi/ms9185/romstage.c
+++ b/src/mainboard/msi/ms9185/romstage.c
@@ -24,7 +24,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 #define CACHE_AS_RAM_ADDRESS_DEBUG 0
diff --git a/src/mainboard/msi/ms9282/romstage.c b/src/mainboard/msi/ms9282/romstage.c
index a02ae6cb03..41f18e2fc8 100644
--- a/src/mainboard/msi/ms9282/romstage.c
+++ b/src/mainboard/msi/ms9282/romstage.c
@@ -23,7 +23,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 #define CACHE_AS_RAM_ADDRESS_DEBUG 0
diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c
index abafff9722..270034c324 100644
--- a/src/mainboard/msi/ms9652_fam10/romstage.c
+++ b/src/mainboard/msi/ms9652_fam10/romstage.c
@@ -20,7 +20,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 
diff --git a/src/mainboard/nec/powermate2000/romstage.c b/src/mainboard/nec/powermate2000/romstage.c
index c923f9943a..f612e03ba5 100644
--- a/src/mainboard/nec/powermate2000/romstage.c
+++ b/src/mainboard/nec/powermate2000/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/newisys/khepri/romstage.c b/src/mainboard/newisys/khepri/romstage.c
index 61c226a458..65af0ae1e5 100644
--- a/src/mainboard/newisys/khepri/romstage.c
+++ b/src/mainboard/newisys/khepri/romstage.c
@@ -4,7 +4,7 @@
  * Additional (C) 2007 coresystems GmbH 
  */
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
  
 #include <stdint.h>
 #include <string.h>
diff --git a/src/mainboard/nvidia/l1_2pvv/romstage.c b/src/mainboard/nvidia/l1_2pvv/romstage.c
index edc289fbac..40a2df7448 100644
--- a/src/mainboard/nvidia/l1_2pvv/romstage.c
+++ b/src/mainboard/nvidia/l1_2pvv/romstage.c
@@ -20,7 +20,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 
diff --git a/src/mainboard/olpc/btest/romstage.c b/src/mainboard/olpc/btest/romstage.c
index fa75b20c1d..12ff739a4e 100644
--- a/src/mainboard/olpc/btest/romstage.c
+++ b/src/mainboard/olpc/btest/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/olpc/rev_a/romstage.c b/src/mainboard/olpc/rev_a/romstage.c
index fa75b20c1d..12ff739a4e 100644
--- a/src/mainboard/olpc/rev_a/romstage.c
+++ b/src/mainboard/olpc/rev_a/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/pcengines/alix1c/romstage.c b/src/mainboard/pcengines/alix1c/romstage.c
index 321426b210..5d83cad394 100644
--- a/src/mainboard/pcengines/alix1c/romstage.c
+++ b/src/mainboard/pcengines/alix1c/romstage.c
@@ -18,7 +18,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <spd.h>
diff --git a/src/mainboard/rca/rm4100/romstage.c b/src/mainboard/rca/rm4100/romstage.c
index 8b70d9ffc7..9e4915f753 100644
--- a/src/mainboard/rca/rm4100/romstage.c
+++ b/src/mainboard/rca/rm4100/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index da196a9d5d..151e6ccea2 100644
--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@@ -20,7 +20,7 @@
  */
 
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
-#define __PRE_RAM__
+
 
 /* Configuration of the i945 driver */
 #define CHIPSET_I945GM 1
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
index 48d18f6667..424d316083 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/sunw/ultra40/romstage.c b/src/mainboard/sunw/ultra40/romstage.c
index 4b181efd86..56ccd76336 100644
--- a/src/mainboard/sunw/ultra40/romstage.c
+++ b/src/mainboard/sunw/ultra40/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 
 #define K8_ALLOCATE_IO_RANGE 1
diff --git a/src/mainboard/supermicro/h8dme/romstage.c b/src/mainboard/supermicro/h8dme/romstage.c
index fba3315541..f341678339 100644
--- a/src/mainboard/supermicro/h8dme/romstage.c
+++ b/src/mainboard/supermicro/h8dme/romstage.c
@@ -17,7 +17,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 
diff --git a/src/mainboard/supermicro/h8dmr/romstage.c b/src/mainboard/supermicro/h8dmr/romstage.c
index 432ff95637..0aed8b9c75 100644
--- a/src/mainboard/supermicro/h8dmr/romstage.c
+++ b/src/mainboard/supermicro/h8dmr/romstage.c
@@ -20,7 +20,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 
diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
index 51c29d4e04..1221f38f5c 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
@@ -20,7 +20,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 
diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c
index 7014713601..a9af4b57f4 100644
--- a/src/mainboard/supermicro/h8qme_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c
@@ -20,7 +20,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 
diff --git a/src/mainboard/supermicro/x6dai_g/romstage.c b/src/mainboard/supermicro/x6dai_g/romstage.c
index c9289d96da..8fc496773e 100644
--- a/src/mainboard/supermicro/x6dai_g/romstage.c
+++ b/src/mainboard/supermicro/x6dai_g/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
diff --git a/src/mainboard/supermicro/x6dhe_g/romstage.c b/src/mainboard/supermicro/x6dhe_g/romstage.c
index 086dd52b90..9d5d8af506 100644
--- a/src/mainboard/supermicro/x6dhe_g/romstage.c
+++ b/src/mainboard/supermicro/x6dhe_g/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
diff --git a/src/mainboard/supermicro/x6dhe_g2/romstage.c b/src/mainboard/supermicro/x6dhe_g2/romstage.c
index f38f4e9b07..0f1041013d 100644
--- a/src/mainboard/supermicro/x6dhe_g2/romstage.c
+++ b/src/mainboard/supermicro/x6dhe_g2/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
diff --git a/src/mainboard/supermicro/x6dhr_ig/romstage.c b/src/mainboard/supermicro/x6dhr_ig/romstage.c
index 0fd77d3a56..4c4f2f19ac 100644
--- a/src/mainboard/supermicro/x6dhr_ig/romstage.c
+++ b/src/mainboard/supermicro/x6dhr_ig/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
diff --git a/src/mainboard/supermicro/x6dhr_ig2/romstage.c b/src/mainboard/supermicro/x6dhr_ig2/romstage.c
index 7a9b696198..8e46e928fe 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/romstage.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
diff --git a/src/mainboard/technexion/tim5690/romstage.c b/src/mainboard/technexion/tim5690/romstage.c
index a707affa47..a222a1a243 100644
--- a/src/mainboard/technexion/tim5690/romstage.c
+++ b/src/mainboard/technexion/tim5690/romstage.c
@@ -18,7 +18,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 #define K8_SET_FIDVID 1
diff --git a/src/mainboard/technexion/tim8690/romstage.c b/src/mainboard/technexion/tim8690/romstage.c
index d9ebaf6530..1abb97c775 100644
--- a/src/mainboard/technexion/tim8690/romstage.c
+++ b/src/mainboard/technexion/tim8690/romstage.c
@@ -18,7 +18,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 #define K8_SET_FIDVID 1
diff --git a/src/mainboard/technologic/ts5300/romstage.c b/src/mainboard/technologic/ts5300/romstage.c
index 31a75183d7..a5c76fd037 100644
--- a/src/mainboard/technologic/ts5300/romstage.c
+++ b/src/mainboard/technologic/ts5300/romstage.c
@@ -5,7 +5,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 #define ASM_CONSOLE_LOGLEVEL 6
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/televideo/tc7020/romstage.c b/src/mainboard/televideo/tc7020/romstage.c
index 5c4bbe2d37..669329d97d 100644
--- a/src/mainboard/televideo/tc7020/romstage.c
+++ b/src/mainboard/televideo/tc7020/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/thomson/ip1000/romstage.c b/src/mainboard/thomson/ip1000/romstage.c
index 362f04e992..f8ad96350b 100644
--- a/src/mainboard/thomson/ip1000/romstage.c
+++ b/src/mainboard/thomson/ip1000/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -96,8 +96,6 @@ static void mb_early_setup(void)
 	pci_write_config32(PCI_DEV(0, 0x1f, 0), PMBASE, (PMBASE_ADDR | 1)); 
 	/* Enable the SMBUS */
 	enable_smbus();
-	/* ACPI base address and disable Resource Indicator */
-	pci_write_config32(PCI_DEV(0, 0x1f, 0), PMBASE, (PMBASE_ADDR)); 
 	/*  ACPI Enable */
 	pci_write_config8(PCI_DEV(0, 0x1f, 0), ACPI_CNTL, 0x10);
 }
diff --git a/src/mainboard/tyan/s1846/romstage.c b/src/mainboard/tyan/s1846/romstage.c
index be6e43b0e6..af9e582639 100644
--- a/src/mainboard/tyan/s1846/romstage.c
+++ b/src/mainboard/tyan/s1846/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/tyan/s2735/romstage.c b/src/mainboard/tyan/s2735/romstage.c
index c4450ebb38..c339740bde 100644
--- a/src/mainboard/tyan/s2735/romstage.c
+++ b/src/mainboard/tyan/s2735/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
  
 #include <stdint.h>
 #include <string.h>
diff --git a/src/mainboard/tyan/s2850/romstage.c b/src/mainboard/tyan/s2850/romstage.c
index 211e23f787..cf0b71edcc 100644
--- a/src/mainboard/tyan/s2850/romstage.c
+++ b/src/mainboard/tyan/s2850/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
  
 #include <stdint.h>
 #include <string.h>
diff --git a/src/mainboard/tyan/s2875/romstage.c b/src/mainboard/tyan/s2875/romstage.c
index da9da07485..26c291cfd5 100644
--- a/src/mainboard/tyan/s2875/romstage.c
+++ b/src/mainboard/tyan/s2875/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
  
 #include <stdint.h>
 #include <string.h>
diff --git a/src/mainboard/tyan/s2880/romstage.c b/src/mainboard/tyan/s2880/romstage.c
index ed3109ef79..b5565fb35a 100644
--- a/src/mainboard/tyan/s2880/romstage.c
+++ b/src/mainboard/tyan/s2880/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
  
 #include <stdint.h>
 #include <string.h>
diff --git a/src/mainboard/tyan/s2881/romstage.c b/src/mainboard/tyan/s2881/romstage.c
index f3171608fe..bbe6d68e0a 100644
--- a/src/mainboard/tyan/s2881/romstage.c
+++ b/src/mainboard/tyan/s2881/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define QRANK_DIMM_SUPPORT 1
 
diff --git a/src/mainboard/tyan/s2882/romstage.c b/src/mainboard/tyan/s2882/romstage.c
index d566f0dfd1..3d27fce4cf 100644
--- a/src/mainboard/tyan/s2882/romstage.c
+++ b/src/mainboard/tyan/s2882/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
  
 #include <stdint.h>
 #include <string.h>
diff --git a/src/mainboard/tyan/s2885/romstage.c b/src/mainboard/tyan/s2885/romstage.c
index b52c951aaf..3dd5fb7194 100644
--- a/src/mainboard/tyan/s2885/romstage.c
+++ b/src/mainboard/tyan/s2885/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
  
 #include <stdint.h>
 #include <string.h>
diff --git a/src/mainboard/tyan/s2891/romstage.c b/src/mainboard/tyan/s2891/romstage.c
index 07d0dd72cf..bc0ccb9db7 100644
--- a/src/mainboard/tyan/s2891/romstage.c
+++ b/src/mainboard/tyan/s2891/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 //used by raminit
 #define QRANK_DIMM_SUPPORT 1
diff --git a/src/mainboard/tyan/s2892/romstage.c b/src/mainboard/tyan/s2892/romstage.c
index b482e95a3e..7ccffc076a 100644
--- a/src/mainboard/tyan/s2892/romstage.c
+++ b/src/mainboard/tyan/s2892/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define QRANK_DIMM_SUPPORT 1
 
diff --git a/src/mainboard/tyan/s2895/romstage.c b/src/mainboard/tyan/s2895/romstage.c
index 542a1ec9df..2d38b635d4 100644
--- a/src/mainboard/tyan/s2895/romstage.c
+++ b/src/mainboard/tyan/s2895/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define K8_ALLOCATE_IO_RANGE 1
 
diff --git a/src/mainboard/tyan/s2912/romstage.c b/src/mainboard/tyan/s2912/romstage.c
index 88e759db1b..1e2f725198 100644
--- a/src/mainboard/tyan/s2912/romstage.c
+++ b/src/mainboard/tyan/s2912/romstage.c
@@ -20,7 +20,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 
diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c
index bdcb9fd0cd..caf6c18dac 100644
--- a/src/mainboard/tyan/s2912_fam10/romstage.c
+++ b/src/mainboard/tyan/s2912_fam10/romstage.c
@@ -20,7 +20,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #define RAMINIT_SYSINFO 1
 
diff --git a/src/mainboard/tyan/s4880/romstage.c b/src/mainboard/tyan/s4880/romstage.c
index 07a1020201..49f7f16a19 100644
--- a/src/mainboard/tyan/s4880/romstage.c
+++ b/src/mainboard/tyan/s4880/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
  
 #include <stdint.h>
 #include <string.h>
diff --git a/src/mainboard/tyan/s4882/romstage.c b/src/mainboard/tyan/s4882/romstage.c
index 9338584726..a3ee6cd641 100644
--- a/src/mainboard/tyan/s4882/romstage.c
+++ b/src/mainboard/tyan/s4882/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
  
 #include <stdint.h>
 #include <string.h>
diff --git a/src/mainboard/via/epia-cn/romstage.c b/src/mainboard/via/epia-cn/romstage.c
index c03cb16689..57bc0dec18 100644
--- a/src/mainboard/via/epia-cn/romstage.c
+++ b/src/mainboard/via/epia-cn/romstage.c
@@ -20,7 +20,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/via/epia-m/romstage.c b/src/mainboard/via/epia-m/romstage.c
index 8b8a96aa93..10d665fda6 100644
--- a/src/mainboard/via/epia-m/romstage.c
+++ b/src/mainboard/via/epia-m/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/via/epia-m700/romstage.c b/src/mainboard/via/epia-m700/romstage.c
index fa4de9c4cc..f182c73cc5 100644
--- a/src/mainboard/via/epia-m700/romstage.c
+++ b/src/mainboard/via/epia-m700/romstage.c
@@ -23,7 +23,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 #define RAMINIT_SYSINFO 1
 #define CACHE_AS_RAM_ADDRESS_DEBUG 0
 
diff --git a/src/mainboard/via/epia-n/romstage.c b/src/mainboard/via/epia-n/romstage.c
index 9f05325b2a..c98a663c61 100644
--- a/src/mainboard/via/epia-n/romstage.c
+++ b/src/mainboard/via/epia-n/romstage.c
@@ -20,7 +20,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/via/epia/romstage.c b/src/mainboard/via/epia/romstage.c
index a40a9b22f8..8d3978415f 100644
--- a/src/mainboard/via/epia/romstage.c
+++ b/src/mainboard/via/epia/romstage.c
@@ -1,5 +1,5 @@
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/via/pc2500e/romstage.c b/src/mainboard/via/pc2500e/romstage.c
index 489730668c..0b24259502 100644
--- a/src/mainboard/via/pc2500e/romstage.c
+++ b/src/mainboard/via/pc2500e/romstage.c
@@ -19,7 +19,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/via/vt8454c/romstage.c b/src/mainboard/via/vt8454c/romstage.c
index e2065095c1..52b93fdc22 100644
--- a/src/mainboard/via/vt8454c/romstage.c
+++ b/src/mainboard/via/vt8454c/romstage.c
@@ -20,7 +20,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/winent/pl6064/romstage.c b/src/mainboard/winent/pl6064/romstage.c
index 68cf6bb156..c9730b0ad7 100644
--- a/src/mainboard/winent/pl6064/romstage.c
+++ b/src/mainboard/winent/pl6064/romstage.c
@@ -20,7 +20,7 @@
  */
 
 #define ASSEMBLY 1
-#define __PRE_RAM__
+
 
 #include <stdint.h>
 #include <device/pci_def.h>