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>
This commit is contained in:
@@ -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 */
|
||||
|
@@ -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:
|
||||
|
||||
|
@@ -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);
|
||||
|
@@ -50,7 +50,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
|
||||
#include "cpu/amd/geode_lx/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}}
|
||||
|
@@ -45,7 +45,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
|
||||
#include "cpu/amd/geode_lx/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[] = {
|
||||
|
@@ -48,7 +48,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
|
||||
#include "cpu/amd/geode_lx/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[] = {
|
||||
|
@@ -41,7 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
|
||||
#include "cpu/amd/geode_lx/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[] = {
|
||||
|
@@ -44,7 +44,7 @@ static inline int spd_read_byte(unsigned device, unsigned 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}}
|
||||
|
@@ -53,7 +53,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
|
||||
#include "cpu/amd/geode_lx/syspreinit.c"
|
||||
#include "cpu/amd/geode_lx/msrinit.c"
|
||||
|
||||
void main(unsigned long bist)
|
||||
void asmlinkage mainboard_romstage_entry(unsigned long bist)
|
||||
{
|
||||
|
||||
msr_t msr;
|
||||
|
@@ -42,7 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
|
||||
#include "cpu/amd/geode_lx/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}}
|
||||
|
@@ -43,7 +43,7 @@ int spd_read_byte(unsigned device, unsigned address)
|
||||
#include "cpu/amd/geode_lx/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 [] = {
|
||||
|
@@ -45,7 +45,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
|
||||
#include "cpu/amd/geode_lx/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[] = {
|
||||
|
@@ -49,7 +49,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
|
||||
#include <cpu/amd/geode_lx/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}}
|
||||
|
@@ -49,7 +49,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
|
||||
#include <cpu/amd/geode_lx/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}}
|
||||
|
@@ -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}}
|
||||
|
@@ -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[] = {
|
||||
|
@@ -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;
|
||||
|
||||
|
@@ -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[] = {
|
||||
|
@@ -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;
|
||||
|
||||
|
@@ -99,7 +99,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
|
||||
#include "cpu/amd/geode_lx/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}},
|
||||
|
@@ -122,7 +122,7 @@ static void mb_gpio_init(void)
|
||||
outl(1 << 11, GPIO_IO_BASE + GPIOH_OUTPUT_VALUE); /* Led 3 disabled */
|
||||
}
|
||||
|
||||
void main(unsigned long bist)
|
||||
void asmlinkage mainboard_romstage_entry(unsigned long bist)
|
||||
{
|
||||
static const struct mem_controller memctrl[] = {
|
||||
{.channel0 = {DIMM0}},
|
||||
|
@@ -42,7 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
|
||||
#include "cpu/amd/geode_lx/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}}
|
||||
|
@@ -47,7 +47,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
|
||||
#include "cpu/amd/geode_lx/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[] = {
|
||||
|
@@ -44,7 +44,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}}
|
||||
|
Reference in New Issue
Block a user