summaryrefslogtreecommitdiff
path: root/src/cpu
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/cpu
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/cpu')
-rw-r--r--src/cpu/amd/geode_gx2/cache_as_ram.inc3
-rw-r--r--src/cpu/amd/geode_lx/cache_as_ram.inc3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/cpu/amd/geode_gx2/cache_as_ram.inc b/src/cpu/amd/geode_gx2/cache_as_ram.inc
index c31b95d91c..049d077353 100644
--- a/src/cpu/amd/geode_gx2/cache_as_ram.inc
+++ b/src/cpu/amd/geode_gx2/cache_as_ram.inc
@@ -156,7 +156,8 @@ DCacheSetupGood:
post_code(0x23)
/* Call romstage.c main function */
- call main
+ call mainboard_romstage_entry
+
done_cache_as_ram_main:
/* We now run over the stack-in-cache, copying it back to itself to invalidate the cache */
diff --git a/src/cpu/amd/geode_lx/cache_as_ram.inc b/src/cpu/amd/geode_lx/cache_as_ram.inc
index d48f0e836c..8250d729b4 100644
--- a/src/cpu/amd/geode_lx/cache_as_ram.inc
+++ b/src/cpu/amd/geode_lx/cache_as_ram.inc
@@ -181,7 +181,8 @@ DCacheSetupGood:
post_code(0x23)
/* Call romstage.c main function */
- call main
+ call mainboard_romstage_entry
+
.global done_cache_as_ram_main
done_cache_as_ram_main: