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

9 files changed, 15 insertions, 15 deletions

diff --git a/src/mainboard/supermicro/h8dmr/chip.h b/src/mainboard/supermicro/h8dmr/chip.h
index d32ce0417c..d37942f49a 100644
--- a/src/mainboard/supermicro/h8dmr/chip.h
+++ b/src/mainboard/supermicro/h8dmr/chip.h
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_supermicro_h8dmr_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_supermicro_h8dmr_config {
+struct mainboard_config {
 };
diff --git a/src/mainboard/supermicro/h8dmr/mainboard.c b/src/mainboard/supermicro/h8dmr/mainboard.c
index cf2f780c71..0f742055f5 100644
--- a/src/mainboard/supermicro/h8dmr/mainboard.c
+++ b/src/mainboard/supermicro/h8dmr/mainboard.c
@@ -27,7 +27,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_supermicro_h8dmr_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Supermicro H8DMR Mainboard")
 };
 #endif
diff --git a/src/mainboard/supermicro/x6dai_g/chip.h b/src/mainboard/supermicro/x6dai_g/chip.h
index 02f15189d6..b6e23b2688 100644
--- a/src/mainboard/supermicro/x6dai_g/chip.h
+++ b/src/mainboard/supermicro/x6dai_g/chip.h
@@ -1,5 +1,5 @@
-struct chip_operations mainboard_supermicro_x6dai_g_ops;
+struct chip_operations mainboard_ops;
 
-struct mainboard_supermicro_x6dai_g_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/supermicro/x6dhe_g/chip.h b/src/mainboard/supermicro/x6dhe_g/chip.h
index f8ba112b02..b6e23b2688 100644
--- a/src/mainboard/supermicro/x6dhe_g/chip.h
+++ b/src/mainboard/supermicro/x6dhe_g/chip.h
@@ -1,5 +1,5 @@
-struct chip_operations mainboard_supermicro_x6dhe_g_ops;
+struct chip_operations mainboard_ops;
 
-struct mainboard_supermicro_x6dhe_g_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/supermicro/x6dhe_g2/chip.h b/src/mainboard/supermicro/x6dhe_g2/chip.h
index ff86e23bfc..b6e23b2688 100644
--- a/src/mainboard/supermicro/x6dhe_g2/chip.h
+++ b/src/mainboard/supermicro/x6dhe_g2/chip.h
@@ -1,5 +1,5 @@
-struct chip_operations mainboard_supermicro_x6dhe_g2_ops;
+struct chip_operations mainboard_ops;
 
-struct mainboard_supermicro_x6dhe_g2_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/supermicro/x6dhr_ig/chip.h b/src/mainboard/supermicro/x6dhr_ig/chip.h
index 495788e43c..b6e23b2688 100644
--- a/src/mainboard/supermicro/x6dhr_ig/chip.h
+++ b/src/mainboard/supermicro/x6dhr_ig/chip.h
@@ -1,5 +1,5 @@
-struct chip_operations mainboard_supermicro_x6dhr_ig_ops;
+struct chip_operations mainboard_ops;
 
-struct mainboard_supermicro_x6dhr_ig_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/supermicro/x6dhr_ig/mainboard.c b/src/mainboard/supermicro/x6dhr_ig/mainboard.c
index 59051de317..51acb86d89 100644
--- a/src/mainboard/supermicro/x6dhr_ig/mainboard.c
+++ b/src/mainboard/supermicro/x6dhr_ig/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_supermicro_x6dhr_ig_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Supermicro X6DHR-iG Mainboard")
 };
 
diff --git a/src/mainboard/supermicro/x6dhr_ig2/chip.h b/src/mainboard/supermicro/x6dhr_ig2/chip.h
index 016f20a3fd..b6e23b2688 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/chip.h
+++ b/src/mainboard/supermicro/x6dhr_ig2/chip.h
@@ -1,5 +1,5 @@
-struct chip_operations mainboard_supermicro_x6dhr_ig2_ops;
+struct chip_operations mainboard_ops;
 
-struct mainboard_supermicro_x6dhr_ig2_config {
+struct mainboard_config {
 	int nothing;
 };
diff --git a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
index b1cda733f4..6b6c64ff12 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_supermicro_x6dhr_ig2_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("Supermicro X6DHR-iG2 Mainboard")
 };