summaryrefslogtreecommitdiff
path: root/src/mainboard/amd
diff options
context:
space:
mode:
authorMarc Jones <marcj303@gmail.com>2017-04-20 22:42:29 -0600
committerMarc Jones <marc@marcjonesconsulting.com>2017-04-25 22:39:05 +0200
commit4aad421e8194db9805db4441245db13ae66853ee (patch)
tree281a1b3ae021381c1804e454378a74f85b21c41c /src/mainboard/amd
parentd06c51895e9c3e7af20054bf57464c38d8adeb16 (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/mainboard/amd')
-rw-r--r--src/mainboard/amd/db800/romstage.c1
-rw-r--r--src/mainboard/amd/f2950/romstage.c1
-rw-r--r--src/mainboard/amd/norwich/romstage.c1
-rw-r--r--src/mainboard/amd/rumba/romstage.c1
4 files changed, 0 insertions, 4 deletions
diff --git a/src/mainboard/amd/db800/romstage.c b/src/mainboard/amd/db800/romstage.c
index 6dd2d80c3c..f9b682ab71 100644
--- a/src/mainboard/amd/db800/romstage.c
+++ b/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>
diff --git a/src/mainboard/amd/f2950/romstage.c b/src/mainboard/amd/f2950/romstage.c
index ea61a0475d..6d59995e94 100644
--- a/src/mainboard/amd/f2950/romstage.c
+++ b/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>
diff --git a/src/mainboard/amd/norwich/romstage.c b/src/mainboard/amd/norwich/romstage.c
index e7276eba5a..52df8561e5 100644
--- a/src/mainboard/amd/norwich/romstage.c
+++ b/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>
diff --git a/src/mainboard/amd/rumba/romstage.c b/src/mainboard/amd/rumba/romstage.c
index 7448e497a6..2568a92b72 100644
--- a/src/mainboard/amd/rumba/romstage.c
+++ b/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"