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, 9 insertions, 9 deletions

diff --git a/src/mainboard/gigabyte/ga-6bxc/chip.h b/src/mainboard/gigabyte/ga-6bxc/chip.h
index a2bca6b058..dc9bed35a5 100644
--- a/src/mainboard/gigabyte/ga-6bxc/chip.h
+++ b/src/mainboard/gigabyte/ga-6bxc/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_gigabyte_ga_6bxc_ops;
-struct mainboard_gigabyte_ga_6bxc_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};
diff --git a/src/mainboard/gigabyte/ga-6bxc/mainboard.c b/src/mainboard/gigabyte/ga-6bxc/mainboard.c
index 70a74782e0..01411f3f81 100644
--- a/src/mainboard/gigabyte/ga-6bxc/mainboard.c
+++ b/src/mainboard/gigabyte/ga-6bxc/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_gigabyte_ga_6bxc_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("GIGABYTE GA-6BXC Mainboard")
 };
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/chip.h b/src/mainboard/gigabyte/ga_2761gxdk/chip.h
index 289fbefd7e..530c7f9230 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/chip.h
+++ b/src/mainboard/gigabyte/ga_2761gxdk/chip.h
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_gigabyte_ga_2761gxdk_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_gigabyte_ga_2761gxdk_config {
+struct mainboard_config {
 };
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c b/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c
index eec1195158..89fd895de1 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c
@@ -27,7 +27,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_gigabyte_ga_2761gxdk_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("GIGABYTE GA-2761GXDK Mainboard")
 };
 #endif
diff --git a/src/mainboard/gigabyte/m57sli/chip.h b/src/mainboard/gigabyte/m57sli/chip.h
index 7cc12ee048..556dc7ea1d 100644
--- a/src/mainboard/gigabyte/m57sli/chip.h
+++ b/src/mainboard/gigabyte/m57sli/chip.h
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_gigabyte_m57sli_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_gigabyte_m57sli_config {
+struct mainboard_config {
 //	int fixup_scsi;
 //	int fixup_vga;
 };
diff --git a/src/mainboard/gigabyte/m57sli/mainboard.c b/src/mainboard/gigabyte/m57sli/mainboard.c
index 0a8257a574..3a688768e3 100644
--- a/src/mainboard/gigabyte/m57sli/mainboard.c
+++ b/src/mainboard/gigabyte/m57sli/mainboard.c
@@ -27,7 +27,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_gigabyte_m57sli_ops = {
+struct chip_operations mainboard_ops = {
 	CHIP_NAME("GIGABYTE GA-M57SLI Mainboard")
 };
 #endif