erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: AMD geode: Avoid conflicting main() declaration

Browse source 
Declaration of main in cpu/amd/car.h conflicts with the
definition of main required for x86/postcar.c in main_decl.h.

BUG=none
BRANCH=none
TEST=none

Change-Id: Iedbb3818068b7a24d35057537eccd385da58383b
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 8e1f908ce0
Original-Change-Id: I19507b89a1e2ecf88ca574c560d4a9e9a3756f37
Original-Signed-off-by: Kysti Mlkki <kyosti.malkki@gmail.com>
Original-Reviewed-on: https://review.coreboot.org/18615
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Philippe Mathieu-Daud <philippe.mathieu.daude@gmail.com>
Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Original-Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/451429
This commit is contained in:
Kyösti Mälkki 2017-03-07 11:10:55 +02:00 • committed by chrome-bot
commit a05d6a8d01
24 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/cpu/amd/geode_gx2/cache_as_ram.inc
View file

@ -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 */

3
src/cpu/amd/geode_lx/cache_as_ram.inc
View file

@ -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: