summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/a-trend/atc-6220/romstage.c2
-rw-r--r--src/mainboard/a-trend/atc-6240/romstage.c2
-rw-r--r--src/mainboard/abit/be6-ii_v2_0/romstage.c2
-rw-r--r--src/mainboard/advantech/pcm-5820/romstage.c2
-rw-r--r--src/mainboard/amd/db800/romstage.c2
-rw-r--r--src/mainboard/amd/dbm690t/romstage.c2
-rw-r--r--src/mainboard/amd/mahogany/romstage.c2
-rw-r--r--src/mainboard/amd/mahogany_fam10/romstage.c2
-rw-r--r--src/mainboard/amd/pistachio/romstage.c2
-rw-r--r--src/mainboard/amd/rumba/romstage.c2
-rw-r--r--src/mainboard/amd/serengeti_cheetah/romstage.c2
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/romstage.c2
-rw-r--r--src/mainboard/arima/hdama/romstage.c2
-rw-r--r--src/mainboard/artecgroup/dbe61/romstage.c2
-rw-r--r--src/mainboard/asi/mb_5blgp/romstage.c2
-rw-r--r--src/mainboard/asi/mb_5blmp/romstage.c2
-rw-r--r--src/mainboard/asus/a8n_e/romstage.c2
-rw-r--r--src/mainboard/asus/a8v-e_se/romstage.c2
-rw-r--r--src/mainboard/asus/m2v-mx_se/romstage.c2
-rw-r--r--src/mainboard/asus/mew-am/romstage.c2
-rw-r--r--src/mainboard/asus/mew-vm/romstage.c2
-rw-r--r--src/mainboard/asus/p2b-d/romstage.c2
-rw-r--r--src/mainboard/asus/p2b-ds/romstage.c2
-rw-r--r--src/mainboard/asus/p2b-f/romstage.c2
-rw-r--r--src/mainboard/asus/p2b-ls/romstage.c2
-rw-r--r--src/mainboard/asus/p2b/romstage.c2
-rw-r--r--src/mainboard/asus/p3b-f/romstage.c2
-rw-r--r--src/mainboard/axus/tc320/romstage.c2
-rw-r--r--src/mainboard/azza/pt-6ibd/romstage.c2
-rw-r--r--src/mainboard/bcom/winnet100/romstage.c2
-rw-r--r--src/mainboard/bcom/winnetp680/romstage.c2
-rw-r--r--src/mainboard/biostar/m6tba/romstage.c2
-rw-r--r--src/mainboard/broadcom/blast/romstage.c2
-rw-r--r--src/mainboard/compaq/deskpro_en_sff_p600/romstage.c2
-rw-r--r--src/mainboard/dell/s1850/romstage.c2
-rw-r--r--src/mainboard/digitallogic/adl855pc/romstage.c2
-rw-r--r--src/mainboard/digitallogic/msm586seg/romstage.c2
-rw-r--r--src/mainboard/digitallogic/msm800sev/romstage.c2
-rw-r--r--src/mainboard/eaglelion/5bcm/romstage.c2
-rw-r--r--src/mainboard/emulation/qemu-x86/romstage.c2
-rw-r--r--src/mainboard/gigabyte/ga-6bxc/romstage.c2
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/romstage.c2
-rw-r--r--src/mainboard/gigabyte/m57sli/romstage.c2
-rw-r--r--src/mainboard/hp/dl145_g3/romstage.c2
-rw-r--r--src/mainboard/hp/e_vectra_p2706t/romstage.c2
-rw-r--r--src/mainboard/ibm/e325/romstage.c2
-rw-r--r--src/mainboard/ibm/e326/romstage.c2
-rw-r--r--src/mainboard/iei/juki-511p/romstage.c2
-rw-r--r--src/mainboard/iei/nova4899r/romstage.c2
-rw-r--r--src/mainboard/iei/pcisa-lx-800-r10/romstage.c2
-rw-r--r--src/mainboard/intel/d945gclf/romstage.c2
-rw-r--r--src/mainboard/intel/eagleheights/romstage.c2
-rw-r--r--src/mainboard/intel/jarrell/romstage.c2
-rw-r--r--src/mainboard/intel/mtarvon/romstage.c2
-rw-r--r--src/mainboard/intel/truxton/romstage.c2
-rw-r--r--src/mainboard/intel/xe7501devkit/romstage.c2
-rw-r--r--src/mainboard/iwill/dk8_htx/romstage.c2
-rw-r--r--src/mainboard/iwill/dk8s2/romstage.c2
-rw-r--r--src/mainboard/iwill/dk8x/romstage.c2
-rw-r--r--src/mainboard/jetway/j7f24/romstage.c2
-rw-r--r--src/mainboard/kontron/986lcd-m/romstage.c2
-rw-r--r--src/mainboard/kontron/kt690/romstage.c2
-rw-r--r--src/mainboard/lippert/frontrunner/romstage.c2
-rw-r--r--src/mainboard/lippert/roadrunner-lx/romstage.c2
-rw-r--r--src/mainboard/lippert/spacerunner-lx/romstage.c2
-rw-r--r--src/mainboard/mitac/6513wu/romstage.c2
-rw-r--r--src/mainboard/msi/ms6119/romstage.c2
-rw-r--r--src/mainboard/msi/ms6147/romstage.c2
-rw-r--r--src/mainboard/msi/ms6156/romstage.c2
-rw-r--r--src/mainboard/msi/ms6178/romstage.c2
-rw-r--r--src/mainboard/msi/ms7135/romstage.c2
-rw-r--r--src/mainboard/msi/ms7260/romstage.c2
-rw-r--r--src/mainboard/msi/ms9185/romstage.c2
-rw-r--r--src/mainboard/msi/ms9282/romstage.c2
-rw-r--r--src/mainboard/msi/ms9652_fam10/romstage.c2
-rw-r--r--src/mainboard/nec/powermate2000/romstage.c2
-rw-r--r--src/mainboard/newisys/khepri/romstage.c2
-rw-r--r--src/mainboard/nvidia/l1_2pvv/romstage.c2
-rw-r--r--src/mainboard/olpc/btest/romstage.c2
-rw-r--r--src/mainboard/olpc/rev_a/romstage.c2
-rw-r--r--src/mainboard/pcengines/alix1c/romstage.c2
-rw-r--r--src/mainboard/rca/rm4100/romstage.c2
-rw-r--r--src/mainboard/roda/rk886ex/romstage.c2
-rw-r--r--src/mainboard/soyo/sy-6ba-plus-iii/romstage.c2
-rw-r--r--src/mainboard/sunw/ultra40/romstage.c2
-rw-r--r--src/mainboard/supermicro/h8dme/romstage.c2
-rw-r--r--src/mainboard/supermicro/h8dmr/romstage.c2
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/romstage.c2
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/romstage.c2
-rw-r--r--src/mainboard/supermicro/x6dai_g/romstage.c2
-rw-r--r--src/mainboard/supermicro/x6dhe_g/romstage.c2
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/romstage.c2
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/romstage.c2
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/romstage.c2
-rw-r--r--src/mainboard/technexion/tim5690/romstage.c2
-rw-r--r--src/mainboard/technexion/tim8690/romstage.c2
-rw-r--r--src/mainboard/technologic/ts5300/romstage.c2
-rw-r--r--src/mainboard/televideo/tc7020/romstage.c2
-rw-r--r--src/mainboard/thomson/ip1000/romstage.c4
-rw-r--r--src/mainboard/tyan/s1846/romstage.c2
-rw-r--r--src/mainboard/tyan/s2735/romstage.c2
-rw-r--r--src/mainboard/tyan/s2850/romstage.c2
-rw-r--r--src/mainboard/tyan/s2875/romstage.c2
-rw-r--r--src/mainboard/tyan/s2880/romstage.c2
-rw-r--r--src/mainboard/tyan/s2881/romstage.c2
-rw-r--r--src/mainboard/tyan/s2882/romstage.c2
-rw-r--r--src/mainboard/tyan/s2885/romstage.c2
-rw-r--r--src/mainboard/tyan/s2891/romstage.c2
-rw-r--r--src/mainboard/tyan/s2892/romstage.c2
-rw-r--r--src/mainboard/tyan/s2895/romstage.c2
-rw-r--r--src/mainboard/tyan/s2912/romstage.c2
-rw-r--r--src/mainboard/tyan/s2912_fam10/romstage.c2
-rw-r--r--src/mainboard/tyan/s4880/romstage.c2
-rw-r--r--src/mainboard/tyan/s4882/romstage.c2
-rw-r--r--src/mainboard/via/epia-cn/romstage.c2
-rw-r--r--src/mainboard/via/epia-m/romstage.c2
-rw-r--r--src/mainboard/via/epia-m700/romstage.c2
-rw-r--r--src/mainboard/via/epia-n/romstage.c2
-rw-r--r--src/mainboard/via/epia/romstage.c2
-rw-r--r--src/mainboard/via/pc2500e/romstage.c2
-rw-r--r--src/mainboard/via/vt8454c/romstage.c2
-rw-r--r--src/mainboard/winent/pl6064/romstage.c2
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 5fe11bc1973c..393cdcf0ad9d 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 752f1a19d034..fbceb6fdd50a 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 bdd0ffee2fd7..f3082892f17f 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 6c9abe2903ef..3bcb063a2dd3 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 c18b0bb154d3..640dc4984f2c 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 df960e49fb43..872cb2f0a3fe 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 7a09aa70d88e..0c25cf6b77d3 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 5198a638b320..f9259cd43a10 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 8184cb29a23e..e38c63916c0c 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 1dce42548e36..ea3ec908fa71 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 e29af87505b2..d4d3c46c0ca0 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 fa65000b8900..e62830444500 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 0c6faf76c36c..ae9e3db666e0 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 76cbacd8911a..fea9925d373e 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 b4b82fc65a59..b7641d8fe04d 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 96e91c0fe26f..a494b582db06 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 6cf71b0b4008..54aedc7ba387 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 a535caaadfa9..91a430b4e900 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 4f4b481b8ab6..9bb4c8d1b3ba 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 8751e0ec288a..e21a7c6db5f2 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 703cd87de5a0..9d429db86487 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 0d928fe7ecbf..a4a37c942a42 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 f01182472737..b8df5f66db5a 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 e9cede41f1ee..21a49e1703e4 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 8578fdd9b76f..a40d39a73899 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 62ac87381d17..52cdf81f1eff 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 306b03f5bc65..e161ef109fe3 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 9cbd13c4b3d4..94564d004c27 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 6f0b0581a996..9f7bbe51bf92 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 5c4bbe2d37a9..669329d97d30 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 dd66d3025e12..3b76de1617c9 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 8234df136fd7..b3b07ae596af 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 d7796f80dd1e..11d5bb4cf5b8 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 c465c16781c7..9c08d1b62875 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 108805659ed6..4c04ecfaee9c 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 890387605704..b7d8fd0f1011 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 8f1756b99993..918aef59c2dd 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 03f9fae57b1f..c7dde03ef0af 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 22e73462769d..fe41cce3e7ee 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 273f6b9d019f..f9da1b518812 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 1b440a759e8b..af3f873bc1c3 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 e1b048ac5a57..915122f8796c 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 2073b9897145..fe5b30169b98 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 33e720730410..c9020c5944a4 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 f2c643c8540f..09e3680ee734 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 07e808a163b4..8af9cffd0c98 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 7ad4824c9103..751b20b56f98 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 655959fac491..bb649322c3b4 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 0b15c3f40bba..69e2a28c3861 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 24a350b92bb0..7af5d8c1587d 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 073ca8efdb1d..ab3576c94447 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 75c4d7375c8a..6d3673689afd 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 d7b1bf40c706..4660b136dc38 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 6524ea217ca9..7ff8ed9494e5 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 834c53e53bed..0559ecb4f487 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 0bedaf943160..157a9f4719a2 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 ca080e6d937b..1eb98fc4ce6a 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 eb29d10a2102..f04e3eac86db 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 6128e0cd2e7c..c46bdebef402 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 82a90dbb8a46..b37b305d48a1 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 f5e9f6e55c8d..c7f1ee9b0445 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 cff33f97f3d9..6d80c237c34d 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 b0ffcc9d63d7..1ea608f73537 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 e8cfee55bb8b..c288fc334282 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 54d7113a5e29..692c5a75e035 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 daa2e9660c9a..fc60ad21cce5 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 942fdfb6d666..0d65058d1f95 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 5aec34a96d3f..570a360d9359 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 78d133b5bf2f..e3e3e2ef5570 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 976d24a56cb2..0441630ca7cb 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 66a29b9fc66d..e4372e41db96 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 c28df63d5cfd..725f0f6bd330 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 e403bdfb0228..d0b7ebde7750 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 a02ae6cb03ac..41f18e2fc8da 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 abafff972242..270034c32429 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 c923f9943a88..f612e03ba514 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 61c226a4585a..65af0ae1e543 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 edc289fbac07..40a2df74482f 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 fa75b20c1d76..12ff739a4e89 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 fa75b20c1d76..12ff739a4e89 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 321426b210b3..5d83cad394e6 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 8b70d9ffc78d..9e4915f75311 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 da196a9d5dee..151e6ccea24e 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 48d18f666709..424d31608370 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 4b181efd861b..56ccd76336c6 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 fba33155412b..f341678339ad 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 432ff9563761..0aed8b9c755d 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 51c29d4e0437..1221f38f5c7c 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 7014713601f4..a9af4b57f4b1 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 c9289d96da24..8fc496773e29 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 086dd52b908b..9d5d8af506da 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 f38f4e9b07ac..0f1041013dcb 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 0fd77d3a560b..4c4f2f19acf4 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 7a9b696198fd..8e46e928fe7f 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 a707affa4715..a222a1a243bd 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 d9ebaf65303f..1abb97c77588 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 31a75183d70b..a5c76fd03700 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 5c4bbe2d37a9..669329d97d30 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 362f04e99237..f8ad96350b60 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 be6e43b0e65f..af9e582639f5 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 c4450ebb386c..c339740bdee2 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 211e23f787c2..cf0b71edccc0 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 da9da07485ea..26c291cfd56a 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 ed3109ef79de..b5565fb35a4a 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 f3171608feb0..bbe6d68e0a77 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 d566f0dfd17f..3d27fce4cfc9 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 b52c951aafdc..3dd5fb719433 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 07d0dd72cf57..bc0ccb9db793 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 b482e95a3ee5..7ccffc076a4a 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 542a1ec9df02..2d38b635d437 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 88e759db1b87..1e2f725198d4 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 bdcb9fd0cd26..caf6c18dac57 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 07a102020164..49f7f16a190c 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 9338584726c6..a3ee6cd641b2 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 c03cb1668981..57bc0dec189f 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 8b8a96aa9384..10d665fda6cb 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 fa4de9c4cc9c..f182c73cc562 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 9f05325b2ab7..c98a663c6117 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 a40a9b22f888..8d3978415f87 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 489730668cb4..0b2425950220 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 e2065095c1c0..52b93fdc224c 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 68cf6bb1568d..c9730b0ad73b 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>