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

8 files changed, 12 insertions, 12 deletions

diff --git a/src/mainboard/via/epia-cn/chip.h b/src/mainboard/via/epia-cn/chip.h
index ff91a02b98..59ab64395f 100644
--- a/src/mainboard/via/epia-cn/chip.h
+++ b/src/mainboard/via/epia-cn/chip.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_via_epia_cn_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_via_epia_cn_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/via/epia-cn/mainboard.c b/src/mainboard/via/epia-cn/mainboard.c
index e1eac58a62..1a7210eefa 100644
--- a/src/mainboard/via/epia-cn/mainboard.c
+++ b/src/mainboard/via/epia-cn/mainboard.c
@@ -22,6 +22,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_via_epia_cn_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("VIA EPIA-CN Mainboard")
 };
diff --git a/src/mainboard/via/epia-m/chip.h b/src/mainboard/via/epia-m/chip.h
index 2710e7b035..e168812d0e 100644
--- a/src/mainboard/via/epia-m/chip.h
+++ b/src/mainboard/via/epia-m/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_via_epia_m_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_via_epia_m_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c
index 8f2ee10f02..64b7c6d232 100644
--- a/src/mainboard/via/epia-m/mainboard.c
+++ b/src/mainboard/via/epia-m/mainboard.c
@@ -40,7 +40,7 @@ void write_protect_vgabios(void)
  		pci_write_config8(dev, 0x61, 0xaa);
 }
 
-struct chip_operations mainboard_via_epia_m_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("VIA EPIA-M Mainboard")
 };
 
diff --git a/src/mainboard/via/epia/chip.h b/src/mainboard/via/epia/chip.h
index 9e019bd807..e168812d0e 100644
--- a/src/mainboard/via/epia/chip.h
+++ b/src/mainboard/via/epia/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_via_epia_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_via_epia_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/via/epia/mainboard.c b/src/mainboard/via/epia/mainboard.c
index 4242dfa92f..25d72a51d9 100644
--- a/src/mainboard/via/epia/mainboard.c
+++ b/src/mainboard/via/epia/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_via_epia_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("VIA EPIA Mainboard")
 };
 
diff --git a/src/mainboard/via/pc2500e/chip.h b/src/mainboard/via/pc2500e/chip.h
index abb1f6c9ba..613d9fd860 100644
--- a/src/mainboard/via/pc2500e/chip.h
+++ b/src/mainboard/via/pc2500e/chip.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_via_pc2500e_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_via_pc2500e_config {
+struct mainboard_config {
 };
diff --git a/src/mainboard/via/pc2500e/mainboard.c b/src/mainboard/via/pc2500e/mainboard.c
index b7865dae43..9fcee5588e 100644
--- a/src/mainboard/via/pc2500e/mainboard.c
+++ b/src/mainboard/via/pc2500e/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_via_pc2500e_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("VIA pc2500e Mainboard")
 };