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>

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);

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

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

src/mainboard/aaeon/pfm-540i_revb/romstage.c

@@ -25,7 +25,6 @@
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
 #include <southbridge/amd/cs5536/cs5536.h>
 #include <spd.h>

src/mainboard/amd/db800/romstage.c

@@ -22,7 +22,6 @@
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
 #include <southbridge/amd/cs5536/cs5536.h>
 #include <spd.h>

src/mainboard/amd/f2950/romstage.c

@@ -22,7 +22,6 @@
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
 #include <southbridge/amd/cs5536/cs5536.h>
 #include <spd.h>

src/mainboard/amd/norwich/romstage.c

@@ -22,7 +22,6 @@
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
 #include <southbridge/amd/cs5536/cs5536.h>
 #include <spd.h>

src/mainboard/amd/rumba/romstage.c

@@ -20,7 +20,6 @@
 #include <superio/winbond/w83627hf/w83627hf.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/gx2def.h>
 #include <spd.h>
 #include "southbridge/amd/cs5536/early_smbus.c"

src/mainboard/artecgroup/dbe61/romstage.c

@@ -22,7 +22,6 @@
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
 #include <southbridge/amd/cs5536/cs5536.h>
 #include "spd_table.h"

src/mainboard/digitallogic/msm800sev/romstage.c

@@ -21,7 +21,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
-#include <cpu/amd/car.h>
 #include <southbridge/amd/cs5536/cs5536.h>
 #include <spd.h>
 #include "southbridge/amd/cs5536/early_smbus.c"

src/mainboard/iei/pm-lx-800-r11/romstage.c

@@ -23,7 +23,6 @@
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
 #include <southbridge/amd/cs5536/cs5536.h>
 #include <southbridge/amd/cs5536/early_smbus.c>

src/mainboard/lippert/frontrunner/romstage.c

@@ -8,7 +8,6 @@
 #include <superio/winbond/w83627hf/w83627hf.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/gx2def.h>
 #include <southbridge/amd/cs5535/cs5535.h>
 #include "southbridge/amd/cs5535/early_smbus.c"

src/mainboard/lippert/hurricane-lx/romstage.c

@@ -25,7 +25,6 @@
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
 #include <southbridge/amd/cs5536/cs5536.h>
 #include <spd.h>

src/mainboard/lippert/literunner-lx/romstage.c

@@ -26,7 +26,6 @@
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
 #include <southbridge/amd/cs5536/cs5536.h>
 #include "southbridge/amd/cs5536/early_smbus.c"

src/mainboard/lippert/roadrunner-lx/romstage.c

@@ -25,7 +25,6 @@
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
 #include <southbridge/amd/cs5536/cs5536.h>
 #include <spd.h>

src/mainboard/lippert/spacerunner-lx/romstage.c

@@ -26,7 +26,6 @@
 #include <console/console.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
 #include <southbridge/amd/cs5536/cs5536.h>
 #include "southbridge/amd/cs5536/early_smbus.c"

src/mainboard/pcengines/alix1c/romstage.c

@@ -23,7 +23,6 @@
 #include <lib.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
 #include <cpu/amd/car.h>
 #include <southbridge/amd/cs5536/cs5536.h>

src/mainboard/pcengines/alix2d/romstage.c

@@ -23,7 +23,6 @@
 #include <lib.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
 #include <cpu/amd/car.h>
 #include <southbridge/amd/cs5536/cs5536.h>

src/mainboard/traverse/geos/romstage.c

@@ -23,7 +23,6 @@
 #include <lib.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
 #include <southbridge/amd/cs5536/cs5536.h>
 #include <spd.h>

src/mainboard/winent/pl6064/romstage.c

@@ -24,7 +24,6 @@
 #include <lib.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/lxdef.h>
 #include <southbridge/amd/cs5536/cs5536.h>
 #include <spd.h>

src/mainboard/wyse/s50/romstage.c

@@ -22,7 +22,6 @@
 #include <lib.h>
 #include <cpu/x86/bist.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/car.h>
 #include <cpu/amd/gx2def.h>
 #include <spd.h>
 #include "southbridge/amd/cs5536/early_smbus.c"