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

AMD Geode: Move conflicting mainboard_romstage_entry()

Browse source 
The silicon specific mainboard_romstage_entry() in amd/cpu/car.h,
which is used by all AMD silicon car code, caused a conflict.
Move the silicon specific defines to silicon header files. Also,
no longer include car.h in the romstage file.

Change-Id: Icfc759c4c93c8dfff76f5ef9a1a985dd704cfe94
Signed-off-by: Marc Jones <marcj303@gmail.com>
Reviewed-on: https://review.coreboot.org/18769
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Marc Jones 2017-04-20 22:42:29 -06:00 • committed by Marc Jones
commit 4aad421e81
21 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/include/cpu/amd/car.h
View file

@ -3,8 +3,6 @@
#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);
void post_cache_as_ram(void);

1
src/include/cpu/amd/gx2def.h
View file

@ -528,6 +528,7 @@
#if defined(__PRE_RAM__)
void cpuRegInit(void);
void SystemPreInit(void);
void asmlinkage mainboard_romstage_entry(unsigned long bist);
#endif
void cpubug(void);
#endif

1
src/include/cpu/amd/lxdef.h
View file

@ -647,6 +647,7 @@
#if defined(__PRE_RAM__)
void cpuRegInit(int debug_clock_disable, u8 dimm0, u8 dimm1, int terminated);
void SystemPreInit(void);
void asmlinkage mainboard_romstage_entry(unsigned long bist);
#endif
void cpubug(void);
#endif