summaryrefslogtreecommitdiff
path: root/src/mainboard
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
parentd06c51895e9c3e7af20054bf57464c38d8adeb16 (diff)
downloadcoreboot-4aad421e8194db9805db4441245db13ae66853ee.tar.xz
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')
-rw-r--r--src/mainboard/aaeon/pfm-540i_revb/romstage.c1
-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
-rw-r--r--src/mainboard/artecgroup/dbe61/romstage.c1
-rw-r--r--src/mainboard/digitallogic/msm800sev/romstage.c1
-rw-r--r--src/mainboard/iei/pm-lx-800-r11/romstage.c1
-rw-r--r--src/mainboard/lippert/frontrunner/romstage.c1
-rw-r--r--src/mainboard/lippert/hurricane-lx/romstage.c1
-rw-r--r--src/mainboard/lippert/literunner-lx/romstage.c1
-rw-r--r--src/mainboard/lippert/roadrunner-lx/romstage.c1
-rw-r--r--src/mainboard/lippert/spacerunner-lx/romstage.c1
-rw-r--r--src/mainboard/pcengines/alix1c/romstage.c1
-rw-r--r--src/mainboard/pcengines/alix2d/romstage.c1
-rw-r--r--src/mainboard/traverse/geos/romstage.c1
-rw-r--r--src/mainboard/winent/pl6064/romstage.c1
-rw-r--r--src/mainboard/wyse/s50/romstage.c1
18 files changed, 0 insertions, 18 deletions
diff --git a/src/mainboard/aaeon/pfm-540i_revb/romstage.c b/src/mainboard/aaeon/pfm-540i_revb/romstage.c
index d8d45b6cc8..c35a68d6fe 100644
--- a/src/mainboard/aaeon/pfm-540i_revb/romstage.c
+++ b/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>
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"
diff --git a/src/mainboard/artecgroup/dbe61/romstage.c b/src/mainboard/artecgroup/dbe61/romstage.c
index e210f9b0a2..1e7d680747 100644
--- a/src/mainboard/artecgroup/dbe61/romstage.c
+++ b/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"
diff --git a/src/mainboard/digitallogic/msm800sev/romstage.c b/src/mainboard/digitallogic/msm800sev/romstage.c
index df8a75e73c..dee326d5cf 100644
--- a/src/mainboard/digitallogic/msm800sev/romstage.c
+++ b/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"
diff --git a/src/mainboard/iei/pm-lx-800-r11/romstage.c b/src/mainboard/iei/pm-lx-800-r11/romstage.c
index e0366f585c..e6cf98ae67 100644
--- a/src/mainboard/iei/pm-lx-800-r11/romstage.c
+++ b/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>
diff --git a/src/mainboard/lippert/frontrunner/romstage.c b/src/mainboard/lippert/frontrunner/romstage.c
index 58d3364ecd..d44cbf3259 100644
--- a/src/mainboard/lippert/frontrunner/romstage.c
+++ b/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"
diff --git a/src/mainboard/lippert/hurricane-lx/romstage.c b/src/mainboard/lippert/hurricane-lx/romstage.c
index 4d2c7336ff..b76960f95f 100644
--- a/src/mainboard/lippert/hurricane-lx/romstage.c
+++ b/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>
diff --git a/src/mainboard/lippert/literunner-lx/romstage.c b/src/mainboard/lippert/literunner-lx/romstage.c
index 168f833daf..e83924cb71 100644
--- a/src/mainboard/lippert/literunner-lx/romstage.c
+++ b/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"
diff --git a/src/mainboard/lippert/roadrunner-lx/romstage.c b/src/mainboard/lippert/roadrunner-lx/romstage.c
index 3ad89444df..6ba90d7773 100644
--- a/src/mainboard/lippert/roadrunner-lx/romstage.c
+++ b/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>
diff --git a/src/mainboard/lippert/spacerunner-lx/romstage.c b/src/mainboard/lippert/spacerunner-lx/romstage.c
index 83e45d1ca0..c77d82f813 100644
--- a/src/mainboard/lippert/spacerunner-lx/romstage.c
+++ b/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"
diff --git a/src/mainboard/pcengines/alix1c/romstage.c b/src/mainboard/pcengines/alix1c/romstage.c
index 36b968fb62..1d43069df4 100644
--- a/src/mainboard/pcengines/alix1c/romstage.c
+++ b/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>
diff --git a/src/mainboard/pcengines/alix2d/romstage.c b/src/mainboard/pcengines/alix2d/romstage.c
index 1966b5c81e..ab96dd2486 100644
--- a/src/mainboard/pcengines/alix2d/romstage.c
+++ b/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>
diff --git a/src/mainboard/traverse/geos/romstage.c b/src/mainboard/traverse/geos/romstage.c
index 56a0a5e080..abf2ec94be 100644
--- a/src/mainboard/traverse/geos/romstage.c
+++ b/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>
diff --git a/src/mainboard/winent/pl6064/romstage.c b/src/mainboard/winent/pl6064/romstage.c
index dfecb1f577..3399fc3833 100644
--- a/src/mainboard/winent/pl6064/romstage.c
+++ b/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>
diff --git a/src/mainboard/wyse/s50/romstage.c b/src/mainboard/wyse/s50/romstage.c
index a9b584c9e3..3ebd40628b 100644
--- a/src/mainboard/wyse/s50/romstage.c
+++ b/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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 17:18:41 +0000