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

18 files changed, 27 insertions, 27 deletions

diff --git a/src/mainboard/asus/a8n_e/chip.h b/src/mainboard/asus/a8n_e/chip.h
index 61a1b434e9..609d2c2403 100644
--- a/src/mainboard/asus/a8n_e/chip.h
+++ b/src/mainboard/asus/a8n_e/chip.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_asus_a8n_e_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_asus_a8n_e_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/asus/a8n_e/mainboard.c b/src/mainboard/asus/a8n_e/mainboard.c
index f75e7aeac8..4468325502 100644
--- a/src/mainboard/asus/a8n_e/mainboard.c
+++ b/src/mainboard/asus/a8n_e/mainboard.c
@@ -23,7 +23,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_asus_a8n_e_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS A8N-E Mainboard")
 };
 #endif
diff --git a/src/mainboard/asus/a8v-e_se/chip.h b/src/mainboard/asus/a8v-e_se/chip.h
index 101113437d..8a28578758 100644
--- a/src/mainboard/asus/a8v-e_se/chip.h
+++ b/src/mainboard/asus/a8v-e_se/chip.h
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_asus_a8v_e_se_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_asus_a8v_e_se_config {
+struct mainboard_config {
 };
diff --git a/src/mainboard/asus/a8v-e_se/mainboard.c b/src/mainboard/asus/a8v-e_se/mainboard.c
index c06fbffd60..2a3fd3b1c5 100644
--- a/src/mainboard/asus/a8v-e_se/mainboard.c
+++ b/src/mainboard/asus/a8v-e_se/mainboard.c
@@ -24,7 +24,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_asus_a8v_e_se_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS A8V-E SE Mainboard")
 };
 #endif
diff --git a/src/mainboard/asus/m2v-mx_se/chip.h b/src/mainboard/asus/m2v-mx_se/chip.h
index e2174e3948..8a28578758 100644
--- a/src/mainboard/asus/m2v-mx_se/chip.h
+++ b/src/mainboard/asus/m2v-mx_se/chip.h
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_asus_m2v_mx_se_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_asus_m2v_mx_se_config {
+struct mainboard_config {
 };
diff --git a/src/mainboard/asus/m2v-mx_se/mainboard.c b/src/mainboard/asus/m2v-mx_se/mainboard.c
index f46109b561..2a5910b3a3 100644
--- a/src/mainboard/asus/m2v-mx_se/mainboard.c
+++ b/src/mainboard/asus/m2v-mx_se/mainboard.c
@@ -24,7 +24,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_asus_m2v_se_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS M2V-MX SE Mainboard")
 };
 #endif
diff --git a/src/mainboard/asus/mew-am/chip.h b/src/mainboard/asus/mew-am/chip.h
index 75cb37d038..dc9bed35a5 100644
--- a/src/mainboard/asus/mew-am/chip.h
+++ b/src/mainboard/asus/mew-am/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_asus_mew_am_ops;
-struct mainboard_asus_mew_am_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};
diff --git a/src/mainboard/asus/mew-am/mainboard.c b/src/mainboard/asus/mew-am/mainboard.c
index 077919c46f..86f22552e5 100644
--- a/src/mainboard/asus/mew-am/mainboard.c
+++ b/src/mainboard/asus/mew-am/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_asus_mew_am_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS MEW-AM Mainboard")
 };
diff --git a/src/mainboard/asus/mew-vm/chip.h b/src/mainboard/asus/mew-vm/chip.h
index bcadf9e6fe..e168812d0e 100644
--- a/src/mainboard/asus/mew-vm/chip.h
+++ b/src/mainboard/asus/mew-vm/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_asus_mew_vm_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_asus_mew_vm_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/asus/mew-vm/mainboard.c b/src/mainboard/asus/mew-vm/mainboard.c
index 4e03be0fea..9e325e7165 100644
--- a/src/mainboard/asus/mew-vm/mainboard.c
+++ b/src/mainboard/asus/mew-vm/mainboard.c
@@ -1,6 +1,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_asus_mew_vm_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS MEW-VM Mainboard")
 };
diff --git a/src/mainboard/asus/p2b-ds/chip.h b/src/mainboard/asus/p2b-ds/chip.h
index 415085a4a7..56e17ca594 100644
--- a/src/mainboard/asus/p2b-ds/chip.h
+++ b/src/mainboard/asus/p2b-ds/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_asus_p2b_ds_ops;
-struct mainboard_asus_p2b_ds_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};
diff --git a/src/mainboard/asus/p2b-ds/mainboard.c b/src/mainboard/asus/p2b-ds/mainboard.c
index d5a59a3b25..910b13075a 100644
--- a/src/mainboard/asus/p2b-ds/mainboard.c
+++ b/src/mainboard/asus/p2b-ds/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_asus_p2b_ds_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS P2B-DS Mainboard")
 };
diff --git a/src/mainboard/asus/p2b-f/chip.h b/src/mainboard/asus/p2b-f/chip.h
index 1b9b1ead69..dc9bed35a5 100644
--- a/src/mainboard/asus/p2b-f/chip.h
+++ b/src/mainboard/asus/p2b-f/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_asus_p2b_f_ops;
-struct mainboard_asus_p2b_f_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};
diff --git a/src/mainboard/asus/p2b-f/mainboard.c b/src/mainboard/asus/p2b-f/mainboard.c
index 3868de5dbf..e2b022a0a2 100644
--- a/src/mainboard/asus/p2b-f/mainboard.c
+++ b/src/mainboard/asus/p2b-f/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_asus_p2b_f_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS P2B-F Mainboard")
 };
diff --git a/src/mainboard/asus/p2b/chip.h b/src/mainboard/asus/p2b/chip.h
index 2c37301824..dc9bed35a5 100644
--- a/src/mainboard/asus/p2b/chip.h
+++ b/src/mainboard/asus/p2b/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_asus_p2b_ops;
-struct mainboard_asus_p2b_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};
diff --git a/src/mainboard/asus/p2b/mainboard.c b/src/mainboard/asus/p2b/mainboard.c
index b21a9e6e84..21e5a4ef19 100644
--- a/src/mainboard/asus/p2b/mainboard.c
+++ b/src/mainboard/asus/p2b/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_asus_p2b_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS P2B Mainboard")
 };
diff --git a/src/mainboard/asus/p3b-f/chip.h b/src/mainboard/asus/p3b-f/chip.h
index 369246289c..dc9bed35a5 100644
--- a/src/mainboard/asus/p3b-f/chip.h
+++ b/src/mainboard/asus/p3b-f/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_asus_p3b_f_ops;
-struct mainboard_asus_p3b_f_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};
diff --git a/src/mainboard/asus/p3b-f/mainboard.c b/src/mainboard/asus/p3b-f/mainboard.c
index 9296219d1d..c234fc2011 100644
--- a/src/mainboard/asus/p3b-f/mainboard.c
+++ b/src/mainboard/asus/p3b-f/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_asus_p3b_f_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS P3B-F Mainboard")
 };