From 8e1f908ce07563a9c1c60dd4515892a47a2b0104 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Tue, 7 Mar 2017 11:10:55 +0200 Subject: AMD geode: Avoid conflicting main() declaration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/18615 Tested-by: build bot (Jenkins) Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Paul Menzel Reviewed-by: Patrick Georgi --- src/cpu/amd/geode_gx2/cache_as_ram.inc | 3 ++- src/cpu/amd/geode_lx/cache_as_ram.inc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/cpu') 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: -- cgit v1.2.3