summaryrefslogtreecommitdiff
path: root/src/mainboard/amd
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/amd')
-rw-r--r--src/mainboard/amd/db800/chip.h4
-rw-r--r--src/mainboard/amd/db800/mainboard.c2
-rw-r--r--src/mainboard/amd/dbm690t/chip.h4
-rw-r--r--src/mainboard/amd/dbm690t/mainboard.c6
-rw-r--r--src/mainboard/amd/norwich/chip.h4
-rw-r--r--src/mainboard/amd/norwich/mainboard.c2
-rw-r--r--src/mainboard/amd/pistachio/chip.h4
-rw-r--r--src/mainboard/amd/pistachio/mainboard.c6
-rw-r--r--src/mainboard/amd/rumba/chip.h4
-rw-r--r--src/mainboard/amd/rumba/mainboard.c4
-rw-r--r--src/mainboard/amd/serengeti_cheetah/chip.h4
-rw-r--r--src/mainboard/amd/serengeti_cheetah/mainboard.c2
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/chip.h4
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c2
14 files changed, 26 insertions, 26 deletions
diff --git a/src/mainboard/amd/db800/chip.h b/src/mainboard/amd/db800/chip.h
index 5a77026f33..fb8c6abe4b 100644
--- a/src/mainboard/amd/db800/chip.h
+++ b/src/mainboard/amd/db800/chip.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-extern struct chip_operations mainboard_amd_db800_ops;
+extern struct chip_operations mainboard_ops;
-struct mainboard_amd_db800_config {
+struct mainboard_config {
int nothing;
};
diff --git a/src/mainboard/amd/db800/mainboard.c b/src/mainboard/amd/db800/mainboard.c
index fab6d81f8b..624c5ad190 100644
--- a/src/mainboard/amd/db800/mainboard.c
+++ b/src/mainboard/amd/db800/mainboard.c
@@ -32,7 +32,7 @@ static void enable_dev(struct device *dev)
dev->ops->init = init;
}
-struct chip_operations mainboard_amd_db800_ops = {
+struct chip_operations mainboard_ops = {
CHIP_NAME("AMD DB800 Mainboard")
.enable_dev = enable_dev,
};
diff --git a/src/mainboard/amd/dbm690t/chip.h b/src/mainboard/amd/dbm690t/chip.h
index 786bc9f4e8..bda7abcf29 100644
--- a/src/mainboard/amd/dbm690t/chip.h
+++ b/src/mainboard/amd/dbm690t/chip.h
@@ -17,9 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-extern struct chip_operations mainboard_amd_dbm690t_ops;
+extern struct chip_operations mainboard_ops;
-struct mainboard_amd_dbm690t_config
+struct mainboard_config
{
u32 uma_size; /* How many UMA should be used in memory for TOP. */
};
diff --git a/src/mainboard/amd/dbm690t/mainboard.c b/src/mainboard/amd/dbm690t/mainboard.c
index d5c7f375c1..ce206b951e 100644
--- a/src/mainboard/amd/dbm690t/mainboard.c
+++ b/src/mainboard/amd/dbm690t/mainboard.c
@@ -199,8 +199,8 @@ static void set_thermal_config()
*************************************************/
void dbm690t_enable(device_t dev)
{
- struct mainboard_amd_dbm690t_config *mainboard =
- (struct mainboard_amd_dbm690t_config *)dev->chip_info;
+ struct mainboard_config *mainboard =
+ (struct mainboard_config *)dev->chip_info;
printk_info("Mainboard DBM690T Enable. dev=0x%x\n", dev);
@@ -266,7 +266,7 @@ int add_mainboard_resources(struct lb_memory *mem)
/*
* CONFIG_CHIP_NAME defined in Option.lb.
*/
-struct chip_operations mainboard_amd_dbm690t_ops = {
+struct chip_operations mainboard_ops = {
CHIP_NAME("AMD DBM690T Mainboard")
.enable_dev = dbm690t_enable,
};
diff --git a/src/mainboard/amd/norwich/chip.h b/src/mainboard/amd/norwich/chip.h
index 8811f41063..fb8c6abe4b 100644
--- a/src/mainboard/amd/norwich/chip.h
+++ b/src/mainboard/amd/norwich/chip.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-extern struct chip_operations mainboard_amd_norwich_ops;
+extern struct chip_operations mainboard_ops;
-struct mainboard_amd_norwich_config {
+struct mainboard_config {
int nothing;
};
diff --git a/src/mainboard/amd/norwich/mainboard.c b/src/mainboard/amd/norwich/mainboard.c
index 89537fda42..e86720672d 100644
--- a/src/mainboard/amd/norwich/mainboard.c
+++ b/src/mainboard/amd/norwich/mainboard.c
@@ -32,7 +32,7 @@ static void enable_dev(struct device *dev)
dev->ops->init = init;
}
-struct chip_operations mainboard_amd_norwich_ops = {
+struct chip_operations mainboard_ops = {
CHIP_NAME("AMD Norwich Mainboard")
.enable_dev = enable_dev,
};
diff --git a/src/mainboard/amd/pistachio/chip.h b/src/mainboard/amd/pistachio/chip.h
index 6cb1b94171..893ff2e88d 100644
--- a/src/mainboard/amd/pistachio/chip.h
+++ b/src/mainboard/amd/pistachio/chip.h
@@ -17,9 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-extern struct chip_operations mainboard_amd_pistachio_ops;
+extern struct chip_operations mainboard_ops;
-struct mainboard_amd_pistachio_config
+struct mainboard_config
{
unsigned long uma_size; /* How many UMA should be used in memory for TOP. */
};
diff --git a/src/mainboard/amd/pistachio/mainboard.c b/src/mainboard/amd/pistachio/mainboard.c
index b72273f4e5..960c74954d 100644
--- a/src/mainboard/amd/pistachio/mainboard.c
+++ b/src/mainboard/amd/pistachio/mainboard.c
@@ -271,8 +271,8 @@ static void set_thermal_config()
*************************************************/
void pistachio_enable(device_t dev)
{
- struct mainboard_amd_pistachio_config *mainboard =
- (struct mainboard_amd_pistachio_config *)dev->chip_info;
+ struct mainboard_config *mainboard =
+ (struct mainboard_config *)dev->chip_info;
printk_info("Mainboard Pistachio Enable. dev=0x%x\n", dev);
@@ -338,7 +338,7 @@ int add_mainboard_resources(struct lb_memory *mem)
/*
* CONFIG_CHIP_NAME defined in Option.lb.
*/
-struct chip_operations mainboard_amd_pistachio_ops = {
+struct chip_operations mainboard_ops = {
CHIP_NAME("AMD Pistachio Mainboard")
.enable_dev = pistachio_enable,
};
diff --git a/src/mainboard/amd/rumba/chip.h b/src/mainboard/amd/rumba/chip.h
index 40efbfa698..2094b2392c 100644
--- a/src/mainboard/amd/rumba/chip.h
+++ b/src/mainboard/amd/rumba/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_amd_rumba_ops;
+extern struct chip_operations mainboard_ops;
-struct mainboard_amd_rumba_config {
+struct mainboard_config {
int nicirq;
};
diff --git a/src/mainboard/amd/rumba/mainboard.c b/src/mainboard/amd/rumba/mainboard.c
index 84c9708b31..843f71b071 100644
--- a/src/mainboard/amd/rumba/mainboard.c
+++ b/src/mainboard/amd/rumba/mainboard.c
@@ -7,7 +7,7 @@
#include "chip.h"
static void init(struct device *dev) {
- struct mainboard_amd_rumba_config *mainboard = (struct mainboard_amd_rumba_config*)dev->chip_info;
+ struct mainboard_config *mainboard = (struct mainboard_config*)dev->chip_info;
device_t nic = NULL;
unsigned bus = 0;
unsigned devfn = PCI_DEVFN(0xd, 0);
@@ -36,7 +36,7 @@ static void enable_dev(struct device *dev)
dev->ops->init = init;
}
-struct chip_operations mainboard_amd_rumba_ops = {
+struct chip_operations mainboard_ops = {
CHIP_NAME("AMD Rumba Mainboard")
.enable_dev = enable_dev,
};
diff --git a/src/mainboard/amd/serengeti_cheetah/chip.h b/src/mainboard/amd/serengeti_cheetah/chip.h
index 258d16de4e..71df35413f 100644
--- a/src/mainboard/amd/serengeti_cheetah/chip.h
+++ b/src/mainboard/amd/serengeti_cheetah/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_amd_serengeti_cheetah_ops;
+extern struct chip_operations mainboard_ops;
-struct mainboard_amd_serengeti_cheetah_config {
+struct mainboard_config {
// int fixup_scsi;
// int fixup_vga;
};
diff --git a/src/mainboard/amd/serengeti_cheetah/mainboard.c b/src/mainboard/amd/serengeti_cheetah/mainboard.c
index 73d962513b..c9ba095029 100644
--- a/src/mainboard/amd/serengeti_cheetah/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah/mainboard.c
@@ -2,7 +2,7 @@
#include "chip.h"
#if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_amd_serengeti_cheetah_ops = {
+struct chip_operations mainboard_ops = {
CHIP_NAME("AMD Serengeti Cheetah Mainboard")
};
#endif
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/chip.h b/src/mainboard/amd/serengeti_cheetah_fam10/chip.h
index e4034c661e..bac5266485 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/chip.h
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/chip.h
@@ -18,9 +18,9 @@
*/
-extern struct chip_operations mainboard_amd_serengeti_cheetah_fam10_ops;
+extern struct chip_operations mainboard_ops;
-struct mainboard_amd_serengeti_cheetah_fam10_config {
+struct mainboard_config {
// int fixup_scsi;
// int fixup_vga;
};
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
index afc89bae3f..de6e139b96 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
@@ -26,7 +26,7 @@
#include "chip.h"
#if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_amd_serengeti_cheetah_fam10_ops = {
+struct chip_operations mainboard_ops = {
CHIP_NAME("AMD family 10 Cheetah mainboard")
};
#endif