UPSTREAM: 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.

BUG=none
BRANCH=none
TEST=none

Change-Id: I1b0d54a7697be3c985693020078200705f08d1b9
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 4aad421e81
Original-Change-Id: Icfc759c4c93c8dfff76f5ef9a1a985dd704cfe94
Original-Signed-off-by: Marc Jones <marcj303@gmail.com>
Original-Reviewed-on: https://review.coreboot.org/18769
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://chromium-review.googlesource.com/488054

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