Carl-Daniel's part:

This patch converts mainboard_$VENDOR_$BOARD_ops to mainboard_ops and 
mainboard_$VENDOR_$BOARD_config to mainboard_config.

Ron's part:
The config change that makes the naming change not break every build.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3954 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

6 files changed, 11 insertions, 11 deletions

diff --git a/src/mainboard/lippert/frontrunner/chip.h b/src/mainboard/lippert/frontrunner/chip.h
index ef3f3b7b80..e168812d0e 100644
--- a/src/mainboard/lippert/frontrunner/chip.h
+++ b/src/mainboard/lippert/frontrunner/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_lippert_frontrunner_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_lippert_frontrunner_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/lippert/frontrunner/mainboard.c b/src/mainboard/lippert/frontrunner/mainboard.c
index aa82ae1525..7cd9f1d034 100644
--- a/src/mainboard/lippert/frontrunner/mainboard.c
+++ b/src/mainboard/lippert/frontrunner/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_lippert_frontrunner_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Lippert Cool Frontrunner Mainboard")
 };
 
diff --git a/src/mainboard/lippert/roadrunner-lx/chip.h b/src/mainboard/lippert/roadrunner-lx/chip.h
index 5a676edf0e..b201059400 100644
--- a/src/mainboard/lippert/roadrunner-lx/chip.h
+++ b/src/mainboard/lippert/roadrunner-lx/chip.h
@@ -22,9 +22,9 @@
 
 #include <stdint.h>
 
-extern struct chip_operations mainboard_lippert_roadrunner_lx_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_lippert_roadrunner_lx_config {
+struct mainboard_config {
 	/* bit5 = Live LED, bit2 = RS485_EN2, bit1 = RS485_EN1 */
 	u8 sio_gp1x_config;
 };
diff --git a/src/mainboard/lippert/roadrunner-lx/mainboard.c b/src/mainboard/lippert/roadrunner-lx/mainboard.c
index b577aae2e3..ad72f5dc02 100644
--- a/src/mainboard/lippert/roadrunner-lx/mainboard.c
+++ b/src/mainboard/lippert/roadrunner-lx/mainboard.c
@@ -40,7 +40,7 @@ static const u16 ec_init_table[] = {	/* hi=data, lo=index */
 
 static void init(struct device *dev)
 {
-	struct mainboard_lippert_roadrunner_lx_config *mb = dev->chip_info;
+	struct mainboard_config *mb = dev->chip_info;
 	unsigned int gpio_base, i;
 	printk_debug("LiPPERT RoadRunner-LX ENTER %s\n", __func__);
 
@@ -70,7 +70,7 @@ static void enable_dev(struct device *dev)
 	dev->ops->init = init;
 }
 
-struct chip_operations mainboard_lippert_roadrunner_lx_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("LiPPERT RoadRunner-LX Mainboard")
 	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/lippert/spacerunner-lx/chip.h b/src/mainboard/lippert/spacerunner-lx/chip.h
index d575f6cc3e..422b04ab2b 100644
--- a/src/mainboard/lippert/spacerunner-lx/chip.h
+++ b/src/mainboard/lippert/spacerunner-lx/chip.h
@@ -22,9 +22,9 @@
 
 #include <stdint.h>
 
-extern struct chip_operations mainboard_lippert_spacerunner_lx_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_lippert_spacerunner_lx_config {
+struct mainboard_config {
 	/* bit2 = RS485_EN2, bit1 = RS485_EN1, bit0 = Live LED */
 	u8 sio_gp1x_config;
 };
diff --git a/src/mainboard/lippert/spacerunner-lx/mainboard.c b/src/mainboard/lippert/spacerunner-lx/mainboard.c
index 5ef2ebf3e8..05d2265569 100644
--- a/src/mainboard/lippert/spacerunner-lx/mainboard.c
+++ b/src/mainboard/lippert/spacerunner-lx/mainboard.c
@@ -41,7 +41,7 @@ static const u16 ec_init_table[] = { /* hi=data, lo=index */
 
 static void init(struct device *dev)
 {
-	struct mainboard_lippert_spacerunner_lx_config *mb = dev->chip_info;
+	struct mainboard_config *mb = dev->chip_info;
 	unsigned int gpio_base, i;
 	printk_debug("LiPPERT SpaceRunner-LX ENTER %s\n", __func__);
 
@@ -74,7 +74,7 @@ static void enable_dev(struct device *dev)
 	dev->ops->init = init;
 }
 
-struct chip_operations mainboard_lippert_spacerunner_lx_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("LiPPERT SpaceRunner-LX Mainboard")
 	.enable_dev = enable_dev,
 };