Patch set updated for coreboot: 00d4ad3 mainboard: -ffreestanding so 'main' is not necessarily entry

[Edward O'Callaghan]

Edward O'Callaghan ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5836

-gerrit

commit 00d4ad3c36c4105a4282bbdcffca65cc10cc293e
Author: Edward O'Callaghan 
Date:   Sat May 24 07:51:34 2014 +1000

mainboard: -ffreestanding so 'main' is not necessarily entry

From the C specification in 5.1.2.1 Freestanding environment;

"In a freestanding environment (in which C program execution may take
    place without any benefit of an operating system), the name and type of
    the function called at program startup are implementation-defined."

Clang complains about these being missing as Clang is somewhat more
    strict about the spec than GNU/GCC is.

Change-Id: I33c8c6ae80e54ef318dbf9899b2f32a4ab7d0856
    Signed-off-by: Edward O'Callaghan 
---
 src/mainboard/a-trend/atc-6220/romstage.c           | 1 +
 src/mainboard/a-trend/atc-6240/romstage.c           | 1 +
 src/mainboard/aaeon/pfm-540i_revb/romstage.c        | 1 +
 src/mainboard/abit/be6-ii_v2_0/romstage.c           | 1 +
 src/mainboard/advantech/pcm-5820/romstage.c         | 1 +
 src/mainboard/amd/db800/romstage.c                  | 1 +
 src/mainboard/amd/norwich/romstage.c                | 1 +
 src/mainboard/amd/rumba/romstage.c                  | 1 +
 src/mainboard/aopen/dxplplusu/romstage.c            | 1 +
 src/mainboard/artecgroup/dbe61/romstage.c           | 1 +
 src/mainboard/asi/mb_5blgp/romstage.c               | 1 +
 src/mainboard/asi/mb_5blmp/romstage.c               | 1 +
 src/mainboard/asus/dsbf/romstage.c                  | 1 +
 src/mainboard/asus/mew-am/romstage.c                | 1 +
 src/mainboard/asus/mew-vm/romstage.c                | 1 +
 src/mainboard/asus/p2b-d/romstage.c                 | 1 +
 src/mainboard/asus/p2b-ds/romstage.c                | 1 +
 src/mainboard/asus/p2b-f/romstage.c                 | 1 +
 src/mainboard/asus/p2b-ls/romstage.c                | 1 +
 src/mainboard/asus/p2b/romstage.c                   | 1 +
 src/mainboard/asus/p3b-f/romstage.c                 | 1 +
 src/mainboard/axus/tc320/romstage.c                 | 1 +
 src/mainboard/azza/pt-6ibd/romstage.c               | 1 +
 src/mainboard/bachmann/ot200/romstage.c             | 1 +
 src/mainboard/bcom/winnet100/romstage.c             | 1 +
 src/mainboard/bcom/winnetp680/romstage.c            | 1 +
 src/mainboard/biostar/m6tba/romstage.c              | 1 +
 src/mainboard/compaq/deskpro_en_sff_p600/romstage.c | 1 +
 src/mainboard/digitallogic/adl855pc/romstage.c      | 1 +
 src/mainboard/digitallogic/msm586seg/romstage.c     | 1 +
 src/mainboard/digitallogic/msm800sev/romstage.c     | 1 +
 src/mainboard/dmp/vortex86ex/romstage.c             | 1 +
 src/mainboard/eaglelion/5bcm/romstage.c             | 1 +
 src/mainboard/ecs/p6iwp-fe/romstage.c               | 1 +
 src/mainboard/emulation/qemu-q35/romstage.c         | 1 +
 src/mainboard/getac/p470/romstage.c                 | 1 +
 src/mainboard/gigabyte/ga-6bxc/romstage.c           | 1 +
 src/mainboard/gigabyte/ga-6bxe/romstage.c           | 1 +
 src/mainboard/google/butterfly/romstage.c           | 1 +
 src/mainboard/google/link/romstage.c                | 1 +
 src/mainboard/google/parrot/romstage.c              | 1 +
 src/mainboard/google/stout/romstage.c               | 1 +
 src/mainboard/hp/e_vectra_p2706t/romstage.c         | 1 +
 src/mainboard/ibase/mb899/romstage.c                | 1 +
 src/mainboard/iei/juki-511p/romstage.c              | 1 +
 src/mainboard/iei/nova4899r/romstage.c              | 1 +
 src/mainboard/iei/pcisa-lx-800-r10/romstage.c       | 1 +
 src/mainboard/iei/pm-lx-800-r11/romstage.c          | 1 +
 src/mainboard/iei/pm-lx2-800-r10/romstage.c         | 1 +
 src/mainboard/intel/d810e2cb/romstage.c             | 1 +
 src/mainboard/intel/d945gclf/romstage.c             | 1 +
 src/mainboard/intel/eagleheights/romstage.c         | 1 +
 src/mainboard/intel/emeraldlake2/romstage.c         | 1 +
 src/mainboard/intel/jarrell/romstage.c              | 1 +
 src/mainboard/intel/mtarvon/romstage.c              | 1 +
 src/mainboard/intel/truxton/romstage.c              | 1 +
 src/mainboard/intel/xe7501devkit/romstage.c         | 1 +
 src/mainboard/iwave/iWRainbowG6/romstage.c          | 1 +
 src/mainboard/jetway/j7f2/romstage.c                | 1 +
 src/mainboard/kontron/986lcd-m/romstage.c           | 1 +
 src/mainboard/kontron/ktqm77/romstage.c             | 1 +
 src/mainboard/lanner/em8510/romstage.c              | 1 +
 src/mainboard/lenovo/t520/romstage.c                | 1 +
 src/mainboard/lenovo/t530/romstage.c                | 1 +
 src/mainboard/lenovo/t60/romstage.c                 | 1 +
 src/mainboard/lenovo/x201/romstage.c                | 1 +
 src/mainboard/lenovo/x230/romstage.c                | 1 +
 src/mainboard/lenovo/x60/romstage.c                 | 1 +
 src/mainboard/lippert/frontrunner/romstage.c        | 1 +
 src/mainboard/lippert/hurricane-lx/romstage.c       | 1 +
 src/mainboard/lippert/literunner-lx/romstage.c      | 1 +
 src/mainboard/lippert/roadrunner-lx/romstage.c      | 1 +
 src/mainboard/lippert/spacerunner-lx/romstage.c     | 1 +
 src/mainboard/mitac/6513wu/romstage.c               | 1 +
 src/mainboard/msi/ms6119/romstage.c                 | 1 +
 src/mainboard/msi/ms6147/romstage.c                 | 1 +
 src/mainboard/msi/ms6156/romstage.c                 | 1 +
 src/mainboard/msi/ms6178/romstage.c                 | 1 +
 src/mainboard/nec/powermate2000/romstage.c          | 1 +
 src/mainboard/nokia/ip530/romstage.c                | 1 +
 src/mainboard/packardbell/ms2290/romstage.c         | 1 +
 src/mainboard/pcengines/alix1c/romstage.c           | 1 +
 src/mainboard/pcengines/alix2d/romstage.c           | 1 +
 src/mainboard/rca/rm4100/romstage.c                 | 1 +
 src/mainboard/roda/rk886ex/romstage.c               | 1 +
 src/mainboard/roda/rk9/romstage.c                   | 1 +
 src/mainboard/samsung/lumpy/romstage.c              | 1 +
 src/mainboard/samsung/stumpy/romstage.c             | 1 +
 src/mainboard/soyo/sy-6ba-plus-iii/romstage.c       | 1 +
 src/mainboard/supermicro/x6dai_g/romstage.c         | 1 +
 src/mainboard/supermicro/x6dhe_g/romstage.c         | 1 +
 src/mainboard/supermicro/x6dhe_g2/romstage.c        | 1 +
 src/mainboard/supermicro/x6dhr_ig/romstage.c        | 1 +
 src/mainboard/supermicro/x6dhr_ig2/romstage.c       | 1 +
 src/mainboard/supermicro/x7db8/romstage.c           | 1 +
 src/mainboard/technologic/ts5300/romstage.c         | 1 +
 src/mainboard/televideo/tc7020/romstage.c           | 1 +
 src/mainboard/thomson/ip1000/romstage.c             | 1 +
 src/mainboard/traverse/geos/romstage.c              | 1 +
 src/mainboard/tyan/s1846/romstage.c                 | 1 +
 src/mainboard/tyan/s2735/romstage.c                 | 1 +
 src/mainboard/via/epia-cn/romstage.c                | 1 +
 src/mainboard/via/epia-m/romstage.c                 | 1 +
 src/mainboard/via/epia-m700/romstage.c              | 1 +
 src/mainboard/via/epia-m850/romstage.c              | 1 +
 src/mainboard/via/epia-n/romstage.c                 | 1 +
 src/mainboard/via/epia/romstage.c                   | 1 +
 src/mainboard/via/pc2500e/romstage.c                | 1 +
 src/mainboard/via/vt8454c/romstage.c                | 1 +
 src/mainboard/winent/pl6064/romstage.c              | 1 +
 src/mainboard/wyse/s50/romstage.c                   | 1 +
 111 files changed, 111 insertions(+)

diff --git a/src/mainboard/a-trend/atc-6220/romstage.c b/src/mainboard/a-trend/atc-6220/romstage.c
index 63d34b2..eef9e10 100644
--- a/src/mainboard/a-trend/atc-6220/romstage.c
+++ b/src/mainboard/a-trend/atc-6220/romstage.c
@@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/a-trend/atc-6240/romstage.c b/src/mainboard/a-trend/atc-6240/romstage.c
index 41d5d2a..af5bba3 100644
--- a/src/mainboard/a-trend/atc-6240/romstage.c
+++ b/src/mainboard/a-trend/atc-6240/romstage.c
@@ -41,6 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/aaeon/pfm-540i_revb/romstage.c b/src/mainboard/aaeon/pfm-540i_revb/romstage.c
index 2c2e22e..4111ce0 100644
--- a/src/mainboard/aaeon/pfm-540i_revb/romstage.c
+++ b/src/mainboard/aaeon/pfm-540i_revb/romstage.c
@@ -54,6 +54,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
 #include "cpu/amd/geode_lx/syspreinit.c"
 #include "cpu/amd/geode_lx/msrinit.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    static const struct mem_controller memctrl[] = {
diff --git a/src/mainboard/abit/be6-ii_v2_0/romstage.c b/src/mainboard/abit/be6-ii_v2_0/romstage.c
index 74f8404..5cdd1ee 100644
--- a/src/mainboard/abit/be6-ii_v2_0/romstage.c
+++ b/src/mainboard/abit/be6-ii_v2_0/romstage.c
@@ -42,6 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    /* FIXME: It's a Winbond W83977EF, actually. */
diff --git a/src/mainboard/advantech/pcm-5820/romstage.c b/src/mainboard/advantech/pcm-5820/romstage.c
index b710aad..69a252d 100644
--- a/src/mainboard/advantech/pcm-5820/romstage.c
+++ b/src/mainboard/advantech/pcm-5820/romstage.c
@@ -30,6 +30,7 @@

#define SERIAL_DEV PNP_DEV(0x3f0, W83977F_SP1)

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    w83977f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/amd/db800/romstage.c b/src/mainboard/amd/db800/romstage.c
index 564380e..cb00149 100644
--- a/src/mainboard/amd/db800/romstage.c
+++ b/src/mainboard/amd/db800/romstage.c
@@ -49,6 +49,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
 #include "cpu/amd/geode_lx/syspreinit.c"
 #include "cpu/amd/geode_lx/msrinit.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {

diff --git a/src/mainboard/amd/norwich/romstage.c b/src/mainboard/amd/norwich/romstage.c
index 9322508..7c75f19 100644
--- a/src/mainboard/amd/norwich/romstage.c
+++ b/src/mainboard/amd/norwich/romstage.c
@@ -45,6 +45,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
 #include "cpu/amd/geode_lx/syspreinit.c"
 #include "cpu/amd/geode_lx/msrinit.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {

diff --git a/src/mainboard/amd/rumba/romstage.c b/src/mainboard/amd/rumba/romstage.c
index c5a3fc3..7dbcbb1 100644
--- a/src/mainboard/amd/rumba/romstage.c
+++ b/src/mainboard/amd/rumba/romstage.c
@@ -31,6 +31,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 #include "cpu/amd/geode_gx2/syspreinit.c"
 #include "cpu/amd/geode_lx/msrinit.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    static const struct mem_controller memctrl [] = {
diff --git a/src/mainboard/aopen/dxplplusu/romstage.c b/src/mainboard/aopen/dxplplusu/romstage.c
index 94546b1..1051d9e 100644
--- a/src/mainboard/aopen/dxplplusu/romstage.c
+++ b/src/mainboard/aopen/dxplplusu/romstage.c
@@ -39,6 +39,7 @@ int spd_read_byte(unsigned device, unsigned address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    static const struct mem_controller memctrl[] = {
diff --git a/src/mainboard/artecgroup/dbe61/romstage.c b/src/mainboard/artecgroup/dbe61/romstage.c
index 073d2b8..50adc67 100644
--- a/src/mainboard/artecgroup/dbe61/romstage.c
+++ b/src/mainboard/artecgroup/dbe61/romstage.c
@@ -57,6 +57,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
 #include "cpu/amd/geode_lx/syspreinit.c"
 #include "cpu/amd/geode_lx/msrinit.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {

diff --git a/src/mainboard/asi/mb_5blgp/romstage.c b/src/mainboard/asi/mb_5blgp/romstage.c
index d661387..e8f577b 100644
--- a/src/mainboard/asi/mb_5blgp/romstage.c
+++ b/src/mainboard/asi/mb_5blgp/romstage.c
@@ -30,6 +30,7 @@

#define SERIAL_DEV PNP_DEV(0x2e, PC87351_SP1)

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    pc87351_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/asi/mb_5blmp/romstage.c b/src/mainboard/asi/mb_5blmp/romstage.c
index e8befe4..2c7181d 100644
--- a/src/mainboard/asi/mb_5blmp/romstage.c
+++ b/src/mainboard/asi/mb_5blmp/romstage.c
@@ -31,6 +31,7 @@

#define SERIAL_DEV PNP_DEV(0x2e, PC87351_SP1)

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    pc87351_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/asus/dsbf/romstage.c b/src/mainboard/asus/dsbf/romstage.c
index e013371..c70ffaa 100644
--- a/src/mainboard/asus/dsbf/romstage.c
+++ b/src/mainboard/asus/dsbf/romstage.c
@@ -110,6 +110,7 @@ int mainboard_set_fbd_clock(int speed)
    }
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    if (bist == 0)
diff --git a/src/mainboard/asus/mew-am/romstage.c b/src/mainboard/asus/mew-am/romstage.c
index 7f301cb..d80064c 100644
--- a/src/mainboard/asus/mew-am/romstage.c
+++ b/src/mainboard/asus/mew-am/romstage.c
@@ -34,6 +34,7 @@

#define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1)

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/asus/mew-vm/romstage.c b/src/mainboard/asus/mew-vm/romstage.c
index 5962aab..98fa406 100644
--- a/src/mainboard/asus/mew-vm/romstage.c
+++ b/src/mainboard/asus/mew-vm/romstage.c
@@ -34,6 +34,7 @@

#define SERIAL_DEV PNP_DEV(0x2e, LPC47B272_SP1)

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    lpc47b272_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/asus/p2b-d/romstage.c b/src/mainboard/asus/p2b-d/romstage.c
index 213120d..3b66867 100644
--- a/src/mainboard/asus/p2b-d/romstage.c
+++ b/src/mainboard/asus/p2b-d/romstage.c
@@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/asus/p2b-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c
index 20c4b3f..8c99a9c 100644
--- a/src/mainboard/asus/p2b-ds/romstage.c
+++ b/src/mainboard/asus/p2b-ds/romstage.c
@@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/asus/p2b-f/romstage.c b/src/mainboard/asus/p2b-f/romstage.c
index 93849c2..8e6730c 100644
--- a/src/mainboard/asus/p2b-f/romstage.c
+++ b/src/mainboard/asus/p2b-f/romstage.c
@@ -42,6 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    /* FIXME: The ASUS P2B-F has a Winbond W83977EF, actually. */
diff --git a/src/mainboard/asus/p2b-ls/romstage.c b/src/mainboard/asus/p2b-ls/romstage.c
index f6daa5e..8889808 100644
--- a/src/mainboard/asus/p2b-ls/romstage.c
+++ b/src/mainboard/asus/p2b-ls/romstage.c
@@ -41,6 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    /* FIXME: The ASUS P2B-LS has a Winbond W83977EF, actually. */
diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/romstage.c
index 63d34b2..eef9e10 100644
--- a/src/mainboard/asus/p2b/romstage.c
+++ b/src/mainboard/asus/p2b/romstage.c
@@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p3b-f/romstage.c
index 3762948..64589c5 100644
--- a/src/mainboard/asus/p3b-f/romstage.c
+++ b/src/mainboard/asus/p3b-f/romstage.c
@@ -73,6 +73,7 @@ static void disable_spd(void)
    outb(0x67, PM_IO_BASE + 0x37);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    /* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */
diff --git a/src/mainboard/axus/tc320/romstage.c b/src/mainboard/axus/tc320/romstage.c
index 053da17..c53d3a1 100644
--- a/src/mainboard/axus/tc320/romstage.c
+++ b/src/mainboard/axus/tc320/romstage.c
@@ -31,6 +31,7 @@

#define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1)

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/azza/pt-6ibd/romstage.c b/src/mainboard/azza/pt-6ibd/romstage.c
index c138d00..7d67c39 100644
--- a/src/mainboard/azza/pt-6ibd/romstage.c
+++ b/src/mainboard/azza/pt-6ibd/romstage.c
@@ -42,6 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    /* FIXME: It's a Winbond W83977EF, actually. */
diff --git a/src/mainboard/bachmann/ot200/romstage.c b/src/mainboard/bachmann/ot200/romstage.c
index 39385c7..690275c 100644
--- a/src/mainboard/bachmann/ot200/romstage.c
+++ b/src/mainboard/bachmann/ot200/romstage.c
@@ -46,6 +46,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
 #include "cpu/amd/geode_lx/syspreinit.c"
 #include "cpu/amd/geode_lx/msrinit.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    static const struct mem_controller memctrl[] = {
diff --git a/src/mainboard/bcom/winnet100/romstage.c b/src/mainboard/bcom/winnet100/romstage.c
index 053da17..c53d3a1 100644
--- a/src/mainboard/bcom/winnet100/romstage.c
+++ b/src/mainboard/bcom/winnet100/romstage.c
@@ -31,6 +31,7 @@

#define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1)

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/bcom/winnetp680/romstage.c b/src/mainboard/bcom/winnetp680/romstage.c
index a252e00..a4bd8f2 100644
--- a/src/mainboard/bcom/winnetp680/romstage.c
+++ b/src/mainboard/bcom/winnetp680/romstage.c
@@ -81,6 +81,7 @@ static const struct mem_controller ctrl = {
    .channel0 = { DIMM0 },
 };

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    /* Enable multifunction for northbridge. */
diff --git a/src/mainboard/biostar/m6tba/romstage.c b/src/mainboard/biostar/m6tba/romstage.c
index 029e21b..077e05d 100644
--- a/src/mainboard/biostar/m6tba/romstage.c
+++ b/src/mainboard/biostar/m6tba/romstage.c
@@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
index 37b28df..bd92d31 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
@@ -42,6 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    /* FIXME: Should be PC97307! */
diff --git a/src/mainboard/digitallogic/adl855pc/romstage.c b/src/mainboard/digitallogic/adl855pc/romstage.c
index 5935af2..72958cd 100644
--- a/src/mainboard/digitallogic/adl855pc/romstage.c
+++ b/src/mainboard/digitallogic/adl855pc/romstage.c
@@ -26,6 +26,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 #include "northbridge/intel/i855/raminit.c"
 #include "northbridge/intel/i855/reset_test.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    if (bist == 0) {
diff --git a/src/mainboard/digitallogic/msm586seg/romstage.c b/src/mainboard/digitallogic/msm586seg/romstage.c
index e67ec68..6a0f8c3 100644
--- a/src/mainboard/digitallogic/msm586seg/romstage.c
+++ b/src/mainboard/digitallogic/msm586seg/romstage.c
@@ -154,6 +154,7 @@ static inline void irqinit(void){
 #endif
 }

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
     volatile int i;
diff --git a/src/mainboard/digitallogic/msm800sev/romstage.c b/src/mainboard/digitallogic/msm800sev/romstage.c
index 986e918..9507c50 100644
--- a/src/mainboard/digitallogic/msm800sev/romstage.c
+++ b/src/mainboard/digitallogic/msm800sev/romstage.c
@@ -30,6 +30,7 @@ int spd_read_byte(unsigned device, unsigned address)
 #include "cpu/amd/geode_lx/syspreinit.c"
 #include "cpu/amd/geode_lx/msrinit.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {

diff --git a/src/mainboard/dmp/vortex86ex/romstage.c b/src/mainboard/dmp/vortex86ex/romstage.c
index 8889015..f675aa3 100644
--- a/src/mainboard/dmp/vortex86ex/romstage.c
+++ b/src/mainboard/dmp/vortex86ex/romstage.c
@@ -300,6 +300,7 @@ static void enable_l2_cache(void)
    pci_write_config8(NB1, 0xe8, reg_nb_f1_e8);
 }

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    device_t dev;
diff --git a/src/mainboard/eaglelion/5bcm/romstage.c b/src/mainboard/eaglelion/5bcm/romstage.c
index 2f803aa..4d24e6a 100644
--- a/src/mainboard/eaglelion/5bcm/romstage.c
+++ b/src/mainboard/eaglelion/5bcm/romstage.c
@@ -12,6 +12,7 @@

#define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1)

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/ecs/p6iwp-fe/romstage.c b/src/mainboard/ecs/p6iwp-fe/romstage.c
index c014c57..cceb1fd 100644
--- a/src/mainboard/ecs/p6iwp-fe/romstage.c
+++ b/src/mainboard/ecs/p6iwp-fe/romstage.c
@@ -37,6 +37,7 @@
 #define SERIAL_DEV PNP_DEV(0x2e, IT8712F_SP1)
 #define CLKIN_DEV PNP_DEV(0x2e, IT8712F_GPIO)

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    ite_conf_clkin(CLKIN_DEV, ITE_UART_CLK_PREDIVIDE_24);
diff --git a/src/mainboard/emulation/qemu-q35/romstage.c b/src/mainboard/emulation/qemu-q35/romstage.c
index 190c775..d911f91 100644
--- a/src/mainboard/emulation/qemu-q35/romstage.c
+++ b/src/mainboard/emulation/qemu-q35/romstage.c
@@ -34,6 +34,7 @@

#include "../qemu-i440fx/memory.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int cbmem_was_initted;
diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c
index a081a8a..ff328e2 100644
--- a/src/mainboard/getac/p470/romstage.c
+++ b/src/mainboard/getac/p470/romstage.c
@@ -264,6 +264,7 @@ static void early_ich7_init(void)
    RCBA32(0x2034) = reg32;
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    u32 reg32;
diff --git a/src/mainboard/gigabyte/ga-6bxc/romstage.c b/src/mainboard/gigabyte/ga-6bxc/romstage.c
index 1b2e29b..8e82206 100644
--- a/src/mainboard/gigabyte/ga-6bxc/romstage.c
+++ b/src/mainboard/gigabyte/ga-6bxc/romstage.c
@@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    it8671f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/gigabyte/ga-6bxe/romstage.c b/src/mainboard/gigabyte/ga-6bxe/romstage.c
index c3926f0..f3db12e 100644
--- a/src/mainboard/gigabyte/ga-6bxe/romstage.c
+++ b/src/mainboard/gigabyte/ga-6bxe/romstage.c
@@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    it8671f_48mhz_clkin();
diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/romstage.c
index d32f3f0..e76aa41 100644
--- a/src/mainboard/google/butterfly/romstage.c
+++ b/src/mainboard/google/butterfly/romstage.c
@@ -111,6 +111,7 @@ static void rcba_config(void)
    RCBA32(FD) = reg32;
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int boot_mode = 0;
diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c
index 2f17880..764e461 100644
--- a/src/mainboard/google/link/romstage.c
+++ b/src/mainboard/google/link/romstage.c
@@ -149,6 +149,7 @@ static void copy_spd(struct pei_data *peid)
           sizeof(peid->spd_data[0]));
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int boot_mode = 0;
diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c
index 1799aec..5c9fadd 100644
--- a/src/mainboard/google/parrot/romstage.c
+++ b/src/mainboard/google/parrot/romstage.c
@@ -112,6 +112,7 @@ static void rcba_config(void)
    RCBA32(FD) = reg32;
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int boot_mode = 0;
diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c
index f53c07d..a90bacc 100644
--- a/src/mainboard/google/stout/romstage.c
+++ b/src/mainboard/google/stout/romstage.c
@@ -153,6 +153,7 @@ static void early_ec_init(void)
    }
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int boot_mode = 0;
diff --git a/src/mainboard/hp/e_vectra_p2706t/romstage.c b/src/mainboard/hp/e_vectra_p2706t/romstage.c
index 81e1ad2..a9583fc 100644
--- a/src/mainboard/hp/e_vectra_p2706t/romstage.c
+++ b/src/mainboard/hp/e_vectra_p2706t/romstage.c
@@ -37,6 +37,7 @@
 /* TODO: It's a PC87364 actually! */
 #define SERIAL_DEV PNP_DEV(0x2e, PC87360_SP1)

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    /* TODO: It's a PC87364 actually! */
diff --git a/src/mainboard/ibase/mb899/romstage.c b/src/mainboard/ibase/mb899/romstage.c
index 0957795..0fd6028 100644
--- a/src/mainboard/ibase/mb899/romstage.c
+++ b/src/mainboard/ibase/mb899/romstage.c
@@ -222,6 +222,7 @@ static void early_ich7_init(void)
    RCBA32(0x2034) = reg32;
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    u32 reg32;
diff --git a/src/mainboard/iei/juki-511p/romstage.c b/src/mainboard/iei/juki-511p/romstage.c
index 8b26b40..eed864d 100644
--- a/src/mainboard/iei/juki-511p/romstage.c
+++ b/src/mainboard/iei/juki-511p/romstage.c
@@ -32,6 +32,7 @@

#define SERIAL_DEV PNP_DEV(0x3f0, W83977F_SP1)

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    w83977f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/iei/nova4899r/romstage.c b/src/mainboard/iei/nova4899r/romstage.c
index 174953d..0bf7e56 100644
--- a/src/mainboard/iei/nova4899r/romstage.c
+++ b/src/mainboard/iei/nova4899r/romstage.c
@@ -32,6 +32,7 @@

#include "northbridge/amd/gx1/raminit.c"

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c
index a75691c..d426e87 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c
+++ b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c
@@ -49,6 +49,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
 #include "cpu/amd/geode_lx/syspreinit.c"
 #include "cpu/amd/geode_lx/msrinit.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {

diff --git a/src/mainboard/iei/pm-lx-800-r11/romstage.c b/src/mainboard/iei/pm-lx-800-r11/romstage.c
index bf34e9a..af33330 100644
--- a/src/mainboard/iei/pm-lx-800-r11/romstage.c
+++ b/src/mainboard/iei/pm-lx-800-r11/romstage.c
@@ -53,6 +53,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
 #include <cpu/amd/geode_lx/syspreinit.c>
 #include <cpu/amd/geode_lx/msrinit.c>

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    static const struct mem_controller memctrl[] = {
diff --git a/src/mainboard/iei/pm-lx2-800-r10/romstage.c b/src/mainboard/iei/pm-lx2-800-r10/romstage.c
index f998f18..d4da053 100644
--- a/src/mainboard/iei/pm-lx2-800-r10/romstage.c
+++ b/src/mainboard/iei/pm-lx2-800-r10/romstage.c
@@ -53,6 +53,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
 #include <cpu/amd/geode_lx/syspreinit.c>
 #include <cpu/amd/geode_lx/msrinit.c>

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    static const struct mem_controller memctrl[] = {
diff --git a/src/mainboard/intel/d810e2cb/romstage.c b/src/mainboard/intel/d810e2cb/romstage.c
index 4394377..e4bbd1a 100644
--- a/src/mainboard/intel/d810e2cb/romstage.c
+++ b/src/mainboard/intel/d810e2cb/romstage.c
@@ -35,6 +35,7 @@

#define SERIAL_DEV PNP_DEV(0x4e, SMSCSUPERIO_SP1)

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    /* Set southbridge and Super I/O GPIOs. */
diff --git a/src/mainboard/intel/d945gclf/romstage.c b/src/mainboard/intel/d945gclf/romstage.c
index 69d4232..0e57591 100644
--- a/src/mainboard/intel/d945gclf/romstage.c
+++ b/src/mainboard/intel/d945gclf/romstage.c
@@ -183,6 +183,7 @@ static void early_ich7_init(void)
    RCBA32(0x2034) = reg32;
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    u32 reg32;
diff --git a/src/mainboard/intel/eagleheights/romstage.c b/src/mainboard/intel/eagleheights/romstage.c
index 3aeb71c..d6ffb1b 100644
--- a/src/mainboard/intel/eagleheights/romstage.c
+++ b/src/mainboard/intel/eagleheights/romstage.c
@@ -120,6 +120,7 @@ static void early_config(void)
    pci_write_config8(PCI_DEV(0, 0x1F, 2), SATA_MAP, (SATA_MODE_AHCI << 6) | (0 << 0));
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    /* int boot_mode = 0; */
diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/romstage.c
index a7ab482..825c813 100644
--- a/src/mainboard/intel/emeraldlake2/romstage.c
+++ b/src/mainboard/intel/emeraldlake2/romstage.c
@@ -161,6 +161,7 @@ static void setup_sio_gpios(void)
    outb(0xaa, port);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int boot_mode = 0;
diff --git a/src/mainboard/intel/jarrell/romstage.c b/src/mainboard/intel/jarrell/romstage.c
index bddb34a..86a29e7 100644
--- a/src/mainboard/intel/jarrell/romstage.c
+++ b/src/mainboard/intel/jarrell/romstage.c
@@ -38,6 +38,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 #include "debug.c"
 #include "arch/x86/lib/stages.c"

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    static const struct mem_controller mch[] = {
diff --git a/src/mainboard/intel/mtarvon/romstage.c b/src/mainboard/intel/mtarvon/romstage.c
index 0cab9bd..237ca24 100644
--- a/src/mainboard/intel/mtarvon/romstage.c
+++ b/src/mainboard/intel/mtarvon/romstage.c
@@ -51,6 +51,7 @@ static inline int spd_read_byte(u16 device, u8 address)
 #include "arch/x86/lib/stages.c"
 #endif

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    msr_t msr;
diff --git a/src/mainboard/intel/truxton/romstage.c b/src/mainboard/intel/truxton/romstage.c
index 71c5f38..fcfd606 100644
--- a/src/mainboard/intel/truxton/romstage.c
+++ b/src/mainboard/intel/truxton/romstage.c
@@ -51,6 +51,7 @@ static inline int spd_read_byte(u16 device, u8 address)

#define SERIAL_DEV PNP_DEV(0x4e, I3100_SP1)

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    msr_t msr;
diff --git a/src/mainboard/intel/xe7501devkit/romstage.c b/src/mainboard/intel/xe7501devkit/romstage.c
index 342e6f1..686fa1b 100644
--- a/src/mainboard/intel/xe7501devkit/romstage.c
+++ b/src/mainboard/intel/xe7501devkit/romstage.c
@@ -33,6 +33,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 #include "lib/generic_sdram.c"

// This function MUST appear last (ROMCC limitation)
+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    static const struct mem_controller memctrl[] = {
diff --git a/src/mainboard/iwave/iWRainbowG6/romstage.c b/src/mainboard/iwave/iWRainbowG6/romstage.c
index 39fce07..ccc6061 100644
--- a/src/mainboard/iwave/iWRainbowG6/romstage.c
+++ b/src/mainboard/iwave/iWRainbowG6/romstage.c
@@ -332,6 +332,7 @@ static void poulsbo_setup_Stage2Regs(void)
    printk(BIOS_DEBUG, " done.\n");
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int boot_mode = 0;
diff --git a/src/mainboard/jetway/j7f2/romstage.c b/src/mainboard/jetway/j7f2/romstage.c
index 8455610..72a94c1 100644
--- a/src/mainboard/jetway/j7f2/romstage.c
+++ b/src/mainboard/jetway/j7f2/romstage.c
@@ -86,6 +86,7 @@ static const struct mem_controller ctrl = {
    .channel0 = { DIMM0 },
 };

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    /* Enable multifunction for northbridge. */
diff --git a/src/mainboard/kontron/986lcd-m/romstage.c b/src/mainboard/kontron/986lcd-m/romstage.c
index 9126889..41d1535 100644
--- a/src/mainboard/kontron/986lcd-m/romstage.c
+++ b/src/mainboard/kontron/986lcd-m/romstage.c
@@ -314,6 +314,7 @@ static void early_ich7_init(void)
    RCBA32(0x2034) = reg32;
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    u32 reg32;
diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/romstage.c
index 7385cd0..370ebc1 100644
--- a/src/mainboard/kontron/ktqm77/romstage.c
+++ b/src/mainboard/kontron/ktqm77/romstage.c
@@ -149,6 +149,7 @@ static void superio_gpio_config(void)
    pnp_exit_ext_func_mode(dev);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int boot_mode = 0;
diff --git a/src/mainboard/lanner/em8510/romstage.c b/src/mainboard/lanner/em8510/romstage.c
index 4ae5c12..30c9002 100644
--- a/src/mainboard/lanner/em8510/romstage.c
+++ b/src/mainboard/lanner/em8510/romstage.c
@@ -48,6 +48,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 #include "northbridge/intel/i855/raminit.c"
 #include "northbridge/intel/i855/reset_test.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    if (bist == 0) {
diff --git a/src/mainboard/lenovo/t520/romstage.c b/src/mainboard/lenovo/t520/romstage.c
index a2c3778..bae3a6f 100644
--- a/src/mainboard/lenovo/t520/romstage.c
+++ b/src/mainboard/lenovo/t520/romstage.c
@@ -107,6 +107,7 @@ static void rcba_config(void)
    RCBA32(BUC) = 0;
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int boot_mode = 0;
diff --git a/src/mainboard/lenovo/t530/romstage.c b/src/mainboard/lenovo/t530/romstage.c
index 96b5205..48b40fc 100644
--- a/src/mainboard/lenovo/t530/romstage.c
+++ b/src/mainboard/lenovo/t530/romstage.c
@@ -108,6 +108,7 @@ static void rcba_config(void)
    RCBA32(BUC) = 0;
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int boot_mode = 0;
diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c
index dae917c..4a80cf6 100644
--- a/src/mainboard/lenovo/t60/romstage.c
+++ b/src/mainboard/lenovo/t60/romstage.c
@@ -205,6 +205,7 @@ static void early_ich7_init(void)
    RCBA32(0x2034) = reg32;
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    u32 reg32;
diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c
index 1237a5c..501cfa0 100644
--- a/src/mainboard/lenovo/x201/romstage.c
+++ b/src/mainboard/lenovo/x201/romstage.c
@@ -214,6 +214,7 @@ static void set_fsb_frequency(void)
    smbus_block_write(0x69, 0, 5, block);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    u32 reg32;
diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/romstage.c
index 6e4e685..957299e 100644
--- a/src/mainboard/lenovo/x230/romstage.c
+++ b/src/mainboard/lenovo/x230/romstage.c
@@ -108,6 +108,7 @@ static void rcba_config(void)
    RCBA32(BUC) = 0;
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int boot_mode = 0;
diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c
index 1198fb2..d8baca1 100644
--- a/src/mainboard/lenovo/x60/romstage.c
+++ b/src/mainboard/lenovo/x60/romstage.c
@@ -212,6 +212,7 @@ static void early_ich7_init(void)
    RCBA32(0x2034) = reg32;
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    u32 reg32;
diff --git a/src/mainboard/lippert/frontrunner/romstage.c b/src/mainboard/lippert/frontrunner/romstage.c
index 92a3a99..27423b4 100644
--- a/src/mainboard/lippert/frontrunner/romstage.c
+++ b/src/mainboard/lippert/frontrunner/romstage.c
@@ -71,6 +71,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address)
 #include "cpu/amd/geode_gx2/syspreinit.c"
 #include "cpu/amd/geode_lx/msrinit.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    static const struct mem_controller memctrl [] = {
diff --git a/src/mainboard/lippert/hurricane-lx/romstage.c b/src/mainboard/lippert/hurricane-lx/romstage.c
index 063721b..5d31c48 100644
--- a/src/mainboard/lippert/hurricane-lx/romstage.c
+++ b/src/mainboard/lippert/hurricane-lx/romstage.c
@@ -110,6 +110,7 @@ static void mb_gpio_init(void)
    }
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {

diff --git a/src/mainboard/lippert/literunner-lx/romstage.c b/src/mainboard/lippert/literunner-lx/romstage.c
index 174620a..4dcecc0 100644
--- a/src/mainboard/lippert/literunner-lx/romstage.c
+++ b/src/mainboard/lippert/literunner-lx/romstage.c
@@ -152,6 +152,7 @@ static void mb_gpio_init(void)
    }
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int err;
diff --git a/src/mainboard/lippert/roadrunner-lx/romstage.c b/src/mainboard/lippert/roadrunner-lx/romstage.c
index 2642373..e1c2996 100644
--- a/src/mainboard/lippert/roadrunner-lx/romstage.c
+++ b/src/mainboard/lippert/roadrunner-lx/romstage.c
@@ -85,6 +85,7 @@ static void mb_gpio_init(void)
    }
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {

diff --git a/src/mainboard/lippert/spacerunner-lx/romstage.c b/src/mainboard/lippert/spacerunner-lx/romstage.c
index 9d5539e..e8f883f 100644
--- a/src/mainboard/lippert/spacerunner-lx/romstage.c
+++ b/src/mainboard/lippert/spacerunner-lx/romstage.c
@@ -149,6 +149,7 @@ static void mb_gpio_init(void)
    }
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int err;
diff --git a/src/mainboard/mitac/6513wu/romstage.c b/src/mainboard/mitac/6513wu/romstage.c
index 52d573e..9f73a3d 100644
--- a/src/mainboard/mitac/6513wu/romstage.c
+++ b/src/mainboard/mitac/6513wu/romstage.c
@@ -35,6 +35,7 @@

#define SERIAL_DEV PNP_DEV(0x4e, SMSCSUPERIO_SP1)

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/msi/ms6119/romstage.c b/src/mainboard/msi/ms6119/romstage.c
index f597b26..492cfec 100644
--- a/src/mainboard/msi/ms6119/romstage.c
+++ b/src/mainboard/msi/ms6119/romstage.c
@@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/msi/ms6147/romstage.c b/src/mainboard/msi/ms6147/romstage.c
index 67fbdc7..9ff4f04 100644
--- a/src/mainboard/msi/ms6147/romstage.c
+++ b/src/mainboard/msi/ms6147/romstage.c
@@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/msi/ms6156/romstage.c b/src/mainboard/msi/ms6156/romstage.c
index f1f4a67..316a453 100644
--- a/src/mainboard/msi/ms6156/romstage.c
+++ b/src/mainboard/msi/ms6156/romstage.c
@@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/msi/ms6178/romstage.c b/src/mainboard/msi/ms6178/romstage.c
index 518944f..f522abd 100644
--- a/src/mainboard/msi/ms6178/romstage.c
+++ b/src/mainboard/msi/ms6178/romstage.c
@@ -35,6 +35,7 @@
 #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
 #define DUMMY_DEV PNP_DEV(0x2e, 0)

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    w83627hf_set_clksel_48(DUMMY_DEV);
diff --git a/src/mainboard/nec/powermate2000/romstage.c b/src/mainboard/nec/powermate2000/romstage.c
index a5cecab..b9d4f92 100644
--- a/src/mainboard/nec/powermate2000/romstage.c
+++ b/src/mainboard/nec/powermate2000/romstage.c
@@ -34,6 +34,7 @@

#define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1)

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/nokia/ip530/romstage.c b/src/mainboard/nokia/ip530/romstage.c
index 627a047..fbe1ef2 100644
--- a/src/mainboard/nokia/ip530/romstage.c
+++ b/src/mainboard/nokia/ip530/romstage.c
@@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/packardbell/ms2290/romstage.c b/src/mainboard/packardbell/ms2290/romstage.c
index 6a18dd6..77276c9 100644
--- a/src/mainboard/packardbell/ms2290/romstage.c
+++ b/src/mainboard/packardbell/ms2290/romstage.c
@@ -197,6 +197,7 @@ static inline u16 read_acpi16(u32 addr)
    return inw(DEFAULT_PMBASE | addr);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    u32 reg32;
diff --git a/src/mainboard/pcengines/alix1c/romstage.c b/src/mainboard/pcengines/alix1c/romstage.c
index 1c4ae09..2444d18 100644
--- a/src/mainboard/pcengines/alix1c/romstage.c
+++ b/src/mainboard/pcengines/alix1c/romstage.c
@@ -106,6 +106,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
 #include "cpu/amd/geode_lx/syspreinit.c"
 #include "cpu/amd/geode_lx/msrinit.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    static const struct mem_controller memctrl[] = {
diff --git a/src/mainboard/pcengines/alix2d/romstage.c b/src/mainboard/pcengines/alix2d/romstage.c
index 18453ac..02fae67 100644
--- a/src/mainboard/pcengines/alix2d/romstage.c
+++ b/src/mainboard/pcengines/alix2d/romstage.c
@@ -130,6 +130,7 @@ static void mb_gpio_init(void)
    outl(1 << 11, GPIO_IO_BASE + GPIOH_OUTPUT_VALUE);       /* Led 3 disabled */
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    static const struct mem_controller memctrl[] = {
diff --git a/src/mainboard/rca/rm4100/romstage.c b/src/mainboard/rca/rm4100/romstage.c
index 705803d..c00c92d 100644
--- a/src/mainboard/rca/rm4100/romstage.c
+++ b/src/mainboard/rca/rm4100/romstage.c
@@ -94,6 +94,7 @@ static void mb_early_setup(void)
    pci_write_config8(PCI_DEV(0, 0x1f, 0), ACPI_CNTL, 0x10);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    if (bist == 0) {
diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index ad323f5..5c21d54 100644
--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@@ -250,6 +250,7 @@ static void init_artec_dongle(void)
    outb(0xf4, 0x88);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    u32 reg32;
diff --git a/src/mainboard/roda/rk9/romstage.c b/src/mainboard/roda/rk9/romstage.c
index 90392b9..44ad309 100644
--- a/src/mainboard/roda/rk9/romstage.c
+++ b/src/mainboard/roda/rk9/romstage.c
@@ -119,6 +119,7 @@ static void default_superio_gpio_setup(void)
    outb(0x10, 0x600 + 0xb + 4); /* GP40 - GP47 */
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    sysinfo_t sysinfo;
diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index ef5a836..4db679e 100644
--- a/src/mainboard/samsung/lumpy/romstage.c
+++ b/src/mainboard/samsung/lumpy/romstage.c
@@ -131,6 +131,7 @@ static void early_pch_init(void)
    pci_write_config8(PCH_LPC_DEV, 0xa4, reg8);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int boot_mode = 0;
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index 0067cb5..d97cba5 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -167,6 +167,7 @@ static void setup_sio_gpios(void)
    it8772f_gpio_setup(6, 0x00, 0x00, 0x00, 0x00, 0x00);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    int boot_mode = 0;
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
index 551c060..75a0f73 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
@@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    it8671f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/supermicro/x6dai_g/romstage.c b/src/mainboard/supermicro/x6dai_g/romstage.c
index f57adaf..f4fcea6 100644
--- a/src/mainboard/supermicro/x6dai_g/romstage.c
+++ b/src/mainboard/supermicro/x6dai_g/romstage.c
@@ -42,6 +42,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 #include "lib/generic_sdram.c"
 #include "arch/x86/lib/stages.c"

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    static const struct mem_controller mch[] = {
diff --git a/src/mainboard/supermicro/x6dhe_g/romstage.c b/src/mainboard/supermicro/x6dhe_g/romstage.c
index 071bb35..8168459 100644
--- a/src/mainboard/supermicro/x6dhe_g/romstage.c
+++ b/src/mainboard/supermicro/x6dhe_g/romstage.c
@@ -46,6 +46,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 #include "lib/generic_sdram.c"
 #include "arch/x86/lib/stages.c"

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    static const struct mem_controller mch[] = {
diff --git a/src/mainboard/supermicro/x6dhe_g2/romstage.c b/src/mainboard/supermicro/x6dhe_g2/romstage.c
index c6350e8..e9fa6a9 100644
--- a/src/mainboard/supermicro/x6dhe_g2/romstage.c
+++ b/src/mainboard/supermicro/x6dhe_g2/romstage.c
@@ -43,6 +43,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 #include "lib/generic_sdram.c"
 #include "arch/x86/lib/stages.c"

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    static const struct mem_controller mch[] = {
diff --git a/src/mainboard/supermicro/x6dhr_ig/romstage.c b/src/mainboard/supermicro/x6dhr_ig/romstage.c
index 9c61d60..fb01ca3 100644
--- a/src/mainboard/supermicro/x6dhr_ig/romstage.c
+++ b/src/mainboard/supermicro/x6dhr_ig/romstage.c
@@ -45,6 +45,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 #include "lib/generic_sdram.c"
 #include "arch/x86/lib/stages.c"

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    static const struct mem_controller mch[] = {
diff --git a/src/mainboard/supermicro/x6dhr_ig2/romstage.c b/src/mainboard/supermicro/x6dhr_ig2/romstage.c
index 4690a0c..38eae3c 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/romstage.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/romstage.c
@@ -45,6 +45,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 #include "lib/generic_sdram.c"
 #include "arch/x86/lib/stages.c"

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    static const struct mem_controller mch[] = {
diff --git a/src/mainboard/supermicro/x7db8/romstage.c b/src/mainboard/supermicro/x7db8/romstage.c
index 791028e..2ec3b02 100644
--- a/src/mainboard/supermicro/x7db8/romstage.c
+++ b/src/mainboard/supermicro/x7db8/romstage.c
@@ -111,6 +111,7 @@ int mainboard_set_fbd_clock(int speed)
    }
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    if (bist == 0)
diff --git a/src/mainboard/technologic/ts5300/romstage.c b/src/mainboard/technologic/ts5300/romstage.c
index 453cecc..3205c5f 100644
--- a/src/mainboard/technologic/ts5300/romstage.c
+++ b/src/mainboard/technologic/ts5300/romstage.c
@@ -136,6 +136,7 @@ static void hard_reset(void)
    while (1) ;
 }

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    volatile int i;
diff --git a/src/mainboard/televideo/tc7020/romstage.c b/src/mainboard/televideo/tc7020/romstage.c
index 053da17..c53d3a1 100644
--- a/src/mainboard/televideo/tc7020/romstage.c
+++ b/src/mainboard/televideo/tc7020/romstage.c
@@ -31,6 +31,7 @@

#define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1)

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/thomson/ip1000/romstage.c b/src/mainboard/thomson/ip1000/romstage.c
index 30ea8bd..2745694 100644
--- a/src/mainboard/thomson/ip1000/romstage.c
+++ b/src/mainboard/thomson/ip1000/romstage.c
@@ -92,6 +92,7 @@ static void mb_early_setup(void)
    pci_write_config8(PCI_DEV(0, 0x1f, 0), ACPI_CNTL, 0x10);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    if (bist == 0) {
diff --git a/src/mainboard/traverse/geos/romstage.c b/src/mainboard/traverse/geos/romstage.c
index 36d55a7..9398dd1 100644
--- a/src/mainboard/traverse/geos/romstage.c
+++ b/src/mainboard/traverse/geos/romstage.c
@@ -46,6 +46,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
 #include "cpu/amd/geode_lx/syspreinit.c"
 #include "cpu/amd/geode_lx/msrinit.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    static const struct mem_controller memctrl[] = {
diff --git a/src/mainboard/tyan/s1846/romstage.c b/src/mainboard/tyan/s1846/romstage.c
index 8e901b2..43db6c6 100644
--- a/src/mainboard/tyan/s1846/romstage.c
+++ b/src/mainboard/tyan/s1846/romstage.c
@@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
    return smbus_read_byte(device, address);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    pc87309_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
diff --git a/src/mainboard/tyan/s2735/romstage.c b/src/mainboard/tyan/s2735/romstage.c
index 600d806..28b6b4d 100644
--- a/src/mainboard/tyan/s2735/romstage.c
+++ b/src/mainboard/tyan/s2735/romstage.c
@@ -34,6 +34,7 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 #include "northbridge/intel/e7501/reset_test.c"
 #include "lib/generic_sdram.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    static const struct mem_controller memctrl[] = {
diff --git a/src/mainboard/via/epia-cn/romstage.c b/src/mainboard/via/epia-cn/romstage.c
index 2d780db..974689b 100644
--- a/src/mainboard/via/epia-cn/romstage.c
+++ b/src/mainboard/via/epia-cn/romstage.c
@@ -79,6 +79,7 @@ static const struct mem_controller ctrl = {
    .channel0 = { DIMM0 },
 };

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    /* Enable multifunction for northbridge. */
diff --git a/src/mainboard/via/epia-m/romstage.c b/src/mainboard/via/epia-m/romstage.c
index ebe6a50..52cf02f 100644
--- a/src/mainboard/via/epia-m/romstage.c
+++ b/src/mainboard/via/epia-m/romstage.c
@@ -66,6 +66,7 @@ static void enable_shadow_ram(void)
    pci_write_config8(dev, 0x63, shadowreg);
 }

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    device_t dev;
diff --git a/src/mainboard/via/epia-m700/romstage.c b/src/mainboard/via/epia-m700/romstage.c
index ef0cef3..a4cce91 100644
--- a/src/mainboard/via/epia-m700/romstage.c
+++ b/src/mainboard/via/epia-m700/romstage.c
@@ -372,6 +372,7 @@ static void EmbedComInit(void)
 #endif

/* cache_as_ram.inc jumps to here. */
+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    u16 boot_mode;
diff --git a/src/mainboard/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c
index 9368028..6a0c0b1 100644
--- a/src/mainboard/via/epia-m850/romstage.c
+++ b/src/mainboard/via/epia-m850/romstage.c
@@ -42,6 +42,7 @@
 #define SERIAL_DEV PNP_DEV(0x4e, F81865F_SP1)

/* cache_as_ram.inc jumps to here. */
+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    u32 tolm;
diff --git a/src/mainboard/via/epia-n/romstage.c b/src/mainboard/via/epia-n/romstage.c
index 568dab5..27f407c 100644
--- a/src/mainboard/via/epia-n/romstage.c
+++ b/src/mainboard/via/epia-n/romstage.c
@@ -101,6 +101,7 @@ static void enable_shadow_ram(void)
    pci_write_config8(ctrl.d0f3, 0x82, shadowreg);
 }

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    unsigned long x;
diff --git a/src/mainboard/via/epia/romstage.c b/src/mainboard/via/epia/romstage.c
index b1e6c54..ee019ab 100644
--- a/src/mainboard/via/epia/romstage.c
+++ b/src/mainboard/via/epia/romstage.c
@@ -69,6 +69,7 @@ static void enable_shadow_ram(void)
    pci_write_config8(dev, 0x63, shadowreg);
 }

+static void main(unsigned long bist);
 static void main(unsigned long bist)
 {
    if (bist == 0)
diff --git a/src/mainboard/via/pc2500e/romstage.c b/src/mainboard/via/pc2500e/romstage.c
index b270350..25a0856 100644
--- a/src/mainboard/via/pc2500e/romstage.c
+++ b/src/mainboard/via/pc2500e/romstage.c
@@ -55,6 +55,7 @@ static const struct mem_controller ctrl = {
    .channel0 = { DIMM0 }, /* TODO: CN700 currently only supports 1 DIMM. */
 };

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    /* Enable multifunction for northbridge. */
diff --git a/src/mainboard/via/vt8454c/romstage.c b/src/mainboard/via/vt8454c/romstage.c
index e1532be..aa0891c 100644
--- a/src/mainboard/via/vt8454c/romstage.c
+++ b/src/mainboard/via/vt8454c/romstage.c
@@ -83,6 +83,7 @@ static void enable_shadow_ram(const struct mem_controller *ctrl)
    pci_write_config8(PCI_DEV(0, 0, 3), 0x83, shadowreg);
 }

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    /* Set statically so it should work with cx700 as well */
diff --git a/src/mainboard/winent/pl6064/romstage.c b/src/mainboard/winent/pl6064/romstage.c
index 124183c..d08e157 100644
--- a/src/mainboard/winent/pl6064/romstage.c
+++ b/src/mainboard/winent/pl6064/romstage.c
@@ -50,6 +50,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
 #include "cpu/amd/geode_lx/syspreinit.c"
 #include "cpu/amd/geode_lx/msrinit.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {

diff --git a/src/mainboard/wyse/s50/romstage.c b/src/mainboard/wyse/s50/romstage.c
index 9e5dd53..dff5198 100644
--- a/src/mainboard/wyse/s50/romstage.c
+++ b/src/mainboard/wyse/s50/romstage.c
@@ -49,6 +49,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address)
 #include "cpu/amd/geode_gx2/syspreinit.c"
 #include "cpu/amd/geode_lx/msrinit.c"

+void main(unsigned long bist);
 void main(unsigned long bist)
 {
    static const struct mem_controller memctrl [] = {