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

30 files changed, 45 insertions, 45 deletions

diff --git a/src/mainboard/tyan/s1846/chip.h b/src/mainboard/tyan/s1846/chip.h
index fa911cb8d9..dc9bed35a5 100644
--- a/src/mainboard/tyan/s1846/chip.h
+++ b/src/mainboard/tyan/s1846/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_tyan_s1846_ops;
-struct mainboard_tyan_s1846_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};
diff --git a/src/mainboard/tyan/s1846/mainboard.c b/src/mainboard/tyan/s1846/mainboard.c
index 7a2ed179fc..e5ab1c908b 100644
--- a/src/mainboard/tyan/s1846/mainboard.c
+++ b/src/mainboard/tyan/s1846/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_tyan_s1846_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S1846 Mainboard")
 };
diff --git a/src/mainboard/tyan/s2735/chip.h b/src/mainboard/tyan/s2735/chip.h
index d63c156af5..49842a07d3 100644
--- a/src/mainboard/tyan/s2735/chip.h
+++ b/src/mainboard/tyan/s2735/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_tyan_s2735_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_tyan_s2735_config {
+struct mainboard_config {
 	int fixup_scsi;
 	int fixup_vga;
 };
diff --git a/src/mainboard/tyan/s2735/mainboard.c b/src/mainboard/tyan/s2735/mainboard.c
index a460b77683..e27a6a01cf 100644
--- a/src/mainboard/tyan/s2735/mainboard.c
+++ b/src/mainboard/tyan/s2735/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_tyan_s2735_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2735 Mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2850/chip.h b/src/mainboard/tyan/s2850/chip.h
index d14f97e98c..49842a07d3 100644
--- a/src/mainboard/tyan/s2850/chip.h
+++ b/src/mainboard/tyan/s2850/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_tyan_s2850_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_tyan_s2850_config {
+struct mainboard_config {
 	int fixup_scsi;
 	int fixup_vga;
 };
diff --git a/src/mainboard/tyan/s2850/mainboard.c b/src/mainboard/tyan/s2850/mainboard.c
index c769cb52a1..735e8d3ac5 100644
--- a/src/mainboard/tyan/s2850/mainboard.c
+++ b/src/mainboard/tyan/s2850/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_tyan_s2850_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2850 Mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2875/chip.h b/src/mainboard/tyan/s2875/chip.h
index 8d80c36e6b..49842a07d3 100644
--- a/src/mainboard/tyan/s2875/chip.h
+++ b/src/mainboard/tyan/s2875/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_tyan_s2875_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_tyan_s2875_config {
+struct mainboard_config {
 	int fixup_scsi;
 	int fixup_vga;
 };
diff --git a/src/mainboard/tyan/s2875/mainboard.c b/src/mainboard/tyan/s2875/mainboard.c
index 1f4a38bcb8..8e2a960232 100644
--- a/src/mainboard/tyan/s2875/mainboard.c
+++ b/src/mainboard/tyan/s2875/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_tyan_s2875_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2875 Mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2880/chip.h b/src/mainboard/tyan/s2880/chip.h
index 82fbd5648e..49842a07d3 100644
--- a/src/mainboard/tyan/s2880/chip.h
+++ b/src/mainboard/tyan/s2880/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_tyan_s2880_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_tyan_s2880_config {
+struct mainboard_config {
 	int fixup_scsi;
 	int fixup_vga;
 };
diff --git a/src/mainboard/tyan/s2880/mainboard.c b/src/mainboard/tyan/s2880/mainboard.c
index 20721c19ef..9d6ad077de 100644
--- a/src/mainboard/tyan/s2880/mainboard.c
+++ b/src/mainboard/tyan/s2880/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_tyan_s2880_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2880 Mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2881/chip.h b/src/mainboard/tyan/s2881/chip.h
index bb88108bbc..49842a07d3 100644
--- a/src/mainboard/tyan/s2881/chip.h
+++ b/src/mainboard/tyan/s2881/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_tyan_s2881_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_tyan_s2881_config {
+struct mainboard_config {
 	int fixup_scsi;
 	int fixup_vga;
 };
diff --git a/src/mainboard/tyan/s2881/mainboard.c b/src/mainboard/tyan/s2881/mainboard.c
index 90c02650ec..a0ad48b6fe 100644
--- a/src/mainboard/tyan/s2881/mainboard.c
+++ b/src/mainboard/tyan/s2881/mainboard.c
@@ -159,7 +159,7 @@ static void enable_dev(struct device *dev)
 }
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_tyan_s2881_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2881 Mainboard")
 	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/tyan/s2882/chip.h b/src/mainboard/tyan/s2882/chip.h
index 308683f992..49842a07d3 100644
--- a/src/mainboard/tyan/s2882/chip.h
+++ b/src/mainboard/tyan/s2882/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_tyan_s2882_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_tyan_s2882_config {
+struct mainboard_config {
 	int fixup_scsi;
 	int fixup_vga;
 };
diff --git a/src/mainboard/tyan/s2882/mainboard.c b/src/mainboard/tyan/s2882/mainboard.c
index 89e81956ec..5cc3b971c6 100644
--- a/src/mainboard/tyan/s2882/mainboard.c
+++ b/src/mainboard/tyan/s2882/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_tyan_s2882_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2882 Mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2885/chip.h b/src/mainboard/tyan/s2885/chip.h
index dadfb0f4ee..71df35413f 100644
--- a/src/mainboard/tyan/s2885/chip.h
+++ b/src/mainboard/tyan/s2885/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_tyan_s2885_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_tyan_s2885_config {
+struct mainboard_config {
 //	int fixup_scsi;
 //	int fixup_vga;
 };
diff --git a/src/mainboard/tyan/s2885/mainboard.c b/src/mainboard/tyan/s2885/mainboard.c
index 6b1beadaf2..fbdcc4cd38 100644
--- a/src/mainboard/tyan/s2885/mainboard.c
+++ b/src/mainboard/tyan/s2885/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_tyan_s2885_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2885 Mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2891/chip.h b/src/mainboard/tyan/s2891/chip.h
index 71a5bb9e8d..49842a07d3 100644
--- a/src/mainboard/tyan/s2891/chip.h
+++ b/src/mainboard/tyan/s2891/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_tyan_s2891_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_tyan_s2891_config {
+struct mainboard_config {
 	int fixup_scsi;
 	int fixup_vga;
 };
diff --git a/src/mainboard/tyan/s2891/mainboard.c b/src/mainboard/tyan/s2891/mainboard.c
index a396404b08..d1c7be1b5e 100644
--- a/src/mainboard/tyan/s2891/mainboard.c
+++ b/src/mainboard/tyan/s2891/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_tyan_s2891_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2891 Mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2892/chip.h b/src/mainboard/tyan/s2892/chip.h
index 28fb8a02e1..49842a07d3 100644
--- a/src/mainboard/tyan/s2892/chip.h
+++ b/src/mainboard/tyan/s2892/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_tyan_s2892_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_tyan_s2892_config {
+struct mainboard_config {
 	int fixup_scsi;
 	int fixup_vga;
 };
diff --git a/src/mainboard/tyan/s2892/mainboard.c b/src/mainboard/tyan/s2892/mainboard.c
index 2aad2b3b42..a1f3e04340 100644
--- a/src/mainboard/tyan/s2892/mainboard.c
+++ b/src/mainboard/tyan/s2892/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_tyan_s2892_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2892 Mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2895/chip.h b/src/mainboard/tyan/s2895/chip.h
index 350f4a6369..71df35413f 100644
--- a/src/mainboard/tyan/s2895/chip.h
+++ b/src/mainboard/tyan/s2895/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_tyan_s2895_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_tyan_s2895_config {
+struct mainboard_config {
 //	int fixup_scsi;
 //	int fixup_vga;
 };
diff --git a/src/mainboard/tyan/s2895/mainboard.c b/src/mainboard/tyan/s2895/mainboard.c
index 03514f11c6..f615b1fd0a 100644
--- a/src/mainboard/tyan/s2895/mainboard.c
+++ b/src/mainboard/tyan/s2895/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_tyan_s2895_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2895 Mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2912/chip.h b/src/mainboard/tyan/s2912/chip.h
index a34af2c1ca..556dc7ea1d 100644
--- a/src/mainboard/tyan/s2912/chip.h
+++ b/src/mainboard/tyan/s2912/chip.h
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_tyan_s2912_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_tyan_s2912_config {
+struct mainboard_config {
 //	int fixup_scsi;
 //	int fixup_vga;
 };
diff --git a/src/mainboard/tyan/s2912/mainboard.c b/src/mainboard/tyan/s2912/mainboard.c
index 71445803c3..67aed12d35 100644
--- a/src/mainboard/tyan/s2912/mainboard.c
+++ b/src/mainboard/tyan/s2912/mainboard.c
@@ -27,7 +27,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_tyan_s2912_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2912 Mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s2912_fam10/chip.h b/src/mainboard/tyan/s2912_fam10/chip.h
index f34d17cac0..556dc7ea1d 100644
--- a/src/mainboard/tyan/s2912_fam10/chip.h
+++ b/src/mainboard/tyan/s2912_fam10/chip.h
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_tyan_s2912_fam10_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_tyan_s2912_fam10_config {
+struct mainboard_config {
 //	int fixup_scsi;
 //	int fixup_vga;
 };
diff --git a/src/mainboard/tyan/s2912_fam10/mainboard.c b/src/mainboard/tyan/s2912_fam10/mainboard.c
index 4ceb052e85..f4a07c3708 100644
--- a/src/mainboard/tyan/s2912_fam10/mainboard.c
+++ b/src/mainboard/tyan/s2912_fam10/mainboard.c
@@ -27,7 +27,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_tyan_s2912_fam10_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2912 Mainboard (Family 10)")
 };
 #endif
diff --git a/src/mainboard/tyan/s4880/chip.h b/src/mainboard/tyan/s4880/chip.h
index 65d6d96c1e..b0db1749dc 100644
--- a/src/mainboard/tyan/s4880/chip.h
+++ b/src/mainboard/tyan/s4880/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_tyan_s4880_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_tyan_s4880_config {
+struct mainboard_config {
 	int fixup_scsi;
 //	int fixup_vga;
 };
diff --git a/src/mainboard/tyan/s4880/mainboard.c b/src/mainboard/tyan/s4880/mainboard.c
index c48c7e3e74..0174cd65ec 100644
--- a/src/mainboard/tyan/s4880/mainboard.c
+++ b/src/mainboard/tyan/s4880/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_tyan_s4880_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S4880 Mainboard")
 };
 #endif
diff --git a/src/mainboard/tyan/s4882/chip.h b/src/mainboard/tyan/s4882/chip.h
index b4f8467cc7..b0db1749dc 100644
--- a/src/mainboard/tyan/s4882/chip.h
+++ b/src/mainboard/tyan/s4882/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_tyan_s4882_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_tyan_s4882_config {
+struct mainboard_config {
 	int fixup_scsi;
 //	int fixup_vga;
 };
diff --git a/src/mainboard/tyan/s4882/mainboard.c b/src/mainboard/tyan/s4882/mainboard.c
index 1d1d306e85..267d3d24dd 100644
--- a/src/mainboard/tyan/s4882/mainboard.c
+++ b/src/mainboard/tyan/s4882/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_tyan_s4882_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S4882 Mainboard")
 };
 #endif