diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-03-07 11:10:55 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-03-08 03:19:46 +0100 |
| commit | 8e1f908ce07563a9c1c60dd4515892a47a2b0104 (patch) | |
| tree | 184be469aa4e53699802160335b454adcfcbb981 /src/include/cpu | |
| parent | 07bc9f76bc0d6130d1fe1f12fe57684262ad7384 (diff) | |
| download | coreboot-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/include/cpu')
| -rw-r--r-- | src/include/cpu/amd/car.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/include/cpu/amd/car.h b/src/include/cpu/amd/car.h index 6950a38db3..a9c9aa0f4e 100644 --- a/src/include/cpu/amd/car.h +++ b/src/include/cpu/amd/car.h @@ -1,7 +1,9 @@ #ifndef _CPU_AMD_CAR_H #define _CPU_AMD_CAR_H -void main(unsigned long bist); +#include <arch/cpu.h> + +void asmlinkage mainboard_romstage_entry(unsigned long bist); void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx); void done_cache_as_ram_main(void); |