diff options
| author | Marc Jones <marcj303@gmail.com> | 2017-04-20 22:42:29 -0600 |
|---|---|---|
| committer | Marc Jones <marc@marcjonesconsulting.com> | 2017-04-25 22:39:05 +0200 |
| commit | 4aad421e8194db9805db4441245db13ae66853ee (patch) | |
| tree | 281a1b3ae021381c1804e454378a74f85b21c41c /src/include/cpu | |
| parent | d06c51895e9c3e7af20054bf57464c38d8adeb16 (diff) | |
AMD Geode: Move conflicting mainboard_romstage_entry()
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>
Diffstat (limited to 'src/include/cpu')
| -rw-r--r-- | src/include/cpu/amd/car.h | 2 | ||||
| -rw-r--r-- | src/include/cpu/amd/gx2def.h | 1 | ||||
| -rw-r--r-- | src/include/cpu/amd/lxdef.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/include/cpu/amd/car.h b/src/include/cpu/amd/car.h index df035137dc..b4fbd60f74 100644 --- a/src/include/cpu/amd/car.h +++ b/src/include/cpu/amd/car.h @@ -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); diff --git a/src/include/cpu/amd/gx2def.h b/src/include/cpu/amd/gx2def.h index 330da8526e..195d584e05 100644 --- a/src/include/cpu/amd/gx2def.h +++ b/src/include/cpu/amd/gx2def.h @@ -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 diff --git a/src/include/cpu/amd/lxdef.h b/src/include/cpu/amd/lxdef.h index 95fa53fe1f..135ee43ffa 100644 --- a/src/include/cpu/amd/lxdef.h +++ b/src/include/cpu/amd/lxdef.h @@ -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 |