summaryrefslogtreecommitdiff
path: root/src/mainboard/lippert
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2017-03-07 11:10:55 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2017-03-08 03:19:46 +0100
commit8e1f908ce07563a9c1c60dd4515892a47a2b0104 (patch)
tree184be469aa4e53699802160335b454adcfcbb981 /src/mainboard/lippert
parent07bc9f76bc0d6130d1fe1f12fe57684262ad7384 (diff)
downloadcoreboot-8e1f908ce07563a9c1c60dd4515892a47a2b0104.tar.xz
AMD geode: Avoid conflicting main() declaration
Declaration of main in cpu/amd/car.h conflicts with the definition of main required for x86/postcar.c in main_decl.h. Change-Id: I19507b89a1e2ecf88ca574c560d4a9e9a3756f37 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/18615 Tested-by: build bot (Jenkins) Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard/lippert')
-rw-r--r--src/mainboard/lippert/frontrunner/romstage.c2
-rw-r--r--src/mainboard/lippert/hurricane-lx/romstage.c2
-rw-r--r--src/mainboard/lippert/literunner-lx/romstage.c2
-rw-r--r--src/mainboard/lippert/roadrunner-lx/romstage.c2
-rw-r--r--src/mainboard/lippert/spacerunner-lx/romstage.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/mainboard/lippert/frontrunner/romstage.c b/src/mainboard/lippert/frontrunner/romstage.c
index 8120704814..58d3364ecd 100644
--- a/src/mainboard/lippert/frontrunner/romstage.c
+++ b/src/mainboard/lippert/frontrunner/romstage.c
@@ -70,7 +70,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 asmlinkage mainboard_romstage_entry(unsigned long bist)
{
static const struct mem_controller memctrl [] = {
{.channel0 = {DIMM0, DIMM1}}
diff --git a/src/mainboard/lippert/hurricane-lx/romstage.c b/src/mainboard/lippert/hurricane-lx/romstage.c
index 7e3288f81e..4d2c7336ff 100644
--- a/src/mainboard/lippert/hurricane-lx/romstage.c
+++ b/src/mainboard/lippert/hurricane-lx/romstage.c
@@ -106,7 +106,7 @@ static void mb_gpio_init(void)
}
}
-void main(unsigned long bist)
+void asmlinkage mainboard_romstage_entry(unsigned long bist)
{
static const struct mem_controller memctrl[] = {
diff --git a/src/mainboard/lippert/literunner-lx/romstage.c b/src/mainboard/lippert/literunner-lx/romstage.c
index 2f6aa469a0..168f833daf 100644
--- a/src/mainboard/lippert/literunner-lx/romstage.c
+++ b/src/mainboard/lippert/literunner-lx/romstage.c
@@ -146,7 +146,7 @@ static void mb_gpio_init(void)
}
}
-void main(unsigned long bist)
+void asmlinkage mainboard_romstage_entry(unsigned long bist)
{
int err;
diff --git a/src/mainboard/lippert/roadrunner-lx/romstage.c b/src/mainboard/lippert/roadrunner-lx/romstage.c
index 7e0e2a5e01..3ad89444df 100644
--- a/src/mainboard/lippert/roadrunner-lx/romstage.c
+++ b/src/mainboard/lippert/roadrunner-lx/romstage.c
@@ -81,7 +81,7 @@ static void mb_gpio_init(void)
}
}
-void main(unsigned long bist)
+void asmlinkage mainboard_romstage_entry(unsigned long bist)
{
static const struct mem_controller memctrl[] = {
diff --git a/src/mainboard/lippert/spacerunner-lx/romstage.c b/src/mainboard/lippert/spacerunner-lx/romstage.c
index 85503c547d..83e45d1ca0 100644
--- a/src/mainboard/lippert/spacerunner-lx/romstage.c
+++ b/src/mainboard/lippert/spacerunner-lx/romstage.c
@@ -144,7 +144,7 @@ static void mb_gpio_init(void)
}
}
-void main(unsigned long bist)
+void asmlinkage mainboard_romstage_entry(unsigned long bist)
{
int err;