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

diff --git a/src/mainboard/a-trend/atc-6220/chip.h b/src/mainboard/a-trend/atc-6220/chip.h
index 6380ef21491fe56e83c237324b35dd5e8aa8d916..dc9bed35a5c9ea4c5151f767d8b98904a9c2b2aa 100644 (file)
--- a/src/mainboard/a-trend/atc-6220/chip.h
+++ b/src/mainboard/a-trend/atc-6220/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_a_trend_atc_6220_ops;
-struct mainboard_a_trend_atc_6220_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};

diff --git a/src/mainboard/a-trend/atc-6220/mainboard.c b/src/mainboard/a-trend/atc-6220/mainboard.c
index 56c0b39bb2f91f88764f16da0c97ffa7d82c2559..f30ebfa87d81c28ac369c0e715ae65615eaf04b6 100644 (file)
--- a/src/mainboard/a-trend/atc-6220/mainboard.c
+++ b/src/mainboard/a-trend/atc-6220/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_a_trend_atc_6220_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("A-Trend ATC-6220 Mainboard")
 };

diff --git a/src/mainboard/a-trend/atc-6240/chip.h b/src/mainboard/a-trend/atc-6240/chip.h
index 1e15adb6fc10c9f94225334a167e7b2c139808c1..56e17ca594128192c52440b67fed77c2f74605f7 100644 (file)
--- a/src/mainboard/a-trend/atc-6240/chip.h
+++ b/src/mainboard/a-trend/atc-6240/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_a_trend_atc_6240_ops;
-struct mainboard_a_trend_atc_6240_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};

diff --git a/src/mainboard/a-trend/atc-6240/mainboard.c b/src/mainboard/a-trend/atc-6240/mainboard.c
index 15f050a6a74928b1388440c13b47f9769c80fbdc..0e09ea33b2f67a22617aca1ef76866dfd9556223 100644 (file)
--- a/src/mainboard/a-trend/atc-6240/mainboard.c
+++ b/src/mainboard/a-trend/atc-6240/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_a_trend_atc_6240_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("A-Trend ATC-6240 Mainboard")
 };

diff --git a/src/mainboard/abit/be6-ii_v2_0/chip.h b/src/mainboard/abit/be6-ii_v2_0/chip.h
index 671cb7ad1833381141fae9c73f289fba04a75889..dc9bed35a5c9ea4c5151f767d8b98904a9c2b2aa 100644 (file)
--- a/src/mainboard/abit/be6-ii_v2_0/chip.h
+++ b/src/mainboard/abit/be6-ii_v2_0/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_abit_be6_ii_v2_0_ops;
-struct mainboard_abit_be6_ii_v2_0_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};

diff --git a/src/mainboard/abit/be6-ii_v2_0/mainboard.c b/src/mainboard/abit/be6-ii_v2_0/mainboard.c
index 264161756e7717ded41b1afcf5f179dc09873a21..6fc23eca50bd926162e56ec89369fdabee8d4a55 100644 (file)
--- a/src/mainboard/abit/be6-ii_v2_0/mainboard.c
+++ b/src/mainboard/abit/be6-ii_v2_0/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_abit_be6_ii_v2_0_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Abit BE6-II V2.0 Mainboard")
 };

diff --git a/src/mainboard/advantech/pcm-5820/chip.h b/src/mainboard/advantech/pcm-5820/chip.h
index 86902f4f84e70f9d021fa027336bef05735f2e25..dc9bed35a5c9ea4c5151f767d8b98904a9c2b2aa 100644 (file)
--- a/src/mainboard/advantech/pcm-5820/chip.h
+++ b/src/mainboard/advantech/pcm-5820/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_advantech_pcm_5820_ops;
-struct mainboard_advantech_pcm_5820_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};

diff --git a/src/mainboard/advantech/pcm-5820/mainboard.c b/src/mainboard/advantech/pcm-5820/mainboard.c
index a8a03cb4864e6fcd8404f7e90e750f3d9c6890ad..42560599cad6a5fca5359d94c4d8d69aecb85e20 100644 (file)
--- a/src/mainboard/advantech/pcm-5820/mainboard.c
+++ b/src/mainboard/advantech/pcm-5820/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_advantech_pcm_5820_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Advantech PCM-5820 Mainboard")
 };

diff --git a/src/mainboard/amd/db800/chip.h b/src/mainboard/amd/db800/chip.h
index 5a77026f33ddd737174832a8a58c21b6582a23c0..fb8c6abe4bcffc2ec6560b7553fa9f59f5cebf3a 100644 (file)
--- a/src/mainboard/amd/db800/chip.h
+++ b/src/mainboard/amd/db800/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_amd_db800_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_amd_db800_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/amd/db800/mainboard.c b/src/mainboard/amd/db800/mainboard.c
index fab6d81f8bfd854946755b8aa7cceada122c116b..624c5ad19005587e148b2e09bb65afb378147a50 100644 (file)
--- a/src/mainboard/amd/db800/mainboard.c
+++ b/src/mainboard/amd/db800/mainboard.c
@@ -32,7 +32,7 @@ static void enable_dev(struct device *dev)
        dev->ops->init = init;
 }
 
-struct chip_operations mainboard_amd_db800_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("AMD DB800 Mainboard")
        .enable_dev = enable_dev,
 };

diff --git a/src/mainboard/amd/dbm690t/chip.h b/src/mainboard/amd/dbm690t/chip.h
index 786bc9f4e800f3deb8c930a68d94189660df6f8b..bda7abcf2995f774e07d37afc96c2f640a2c5047 100644 (file)
--- a/src/mainboard/amd/dbm690t/chip.h
+++ b/src/mainboard/amd/dbm690t/chip.h
@@ -17,9 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_amd_dbm690t_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_amd_dbm690t_config
+struct mainboard_config
 {
        u32 uma_size;                   /* How many UMA should be used in memory for TOP. */
 };

diff --git a/src/mainboard/amd/dbm690t/mainboard.c b/src/mainboard/amd/dbm690t/mainboard.c
index d5c7f375c1f37644206beb05c6af13c2f9464a35..ce206b951ec1ef50070c8297218bad785c8c8287 100644 (file)
--- a/src/mainboard/amd/dbm690t/mainboard.c
+++ b/src/mainboard/amd/dbm690t/mainboard.c
@@ -199,8 +199,8 @@ static void set_thermal_config()
 *************************************************/
 void dbm690t_enable(device_t dev)
 {
-       struct mainboard_amd_dbm690t_config *mainboard =
-           (struct mainboard_amd_dbm690t_config *)dev->chip_info;
+       struct mainboard_config *mainboard =
+           (struct mainboard_config *)dev->chip_info;
 
        printk_info("Mainboard DBM690T Enable. dev=0x%x\n", dev);
 
@@ -266,7 +266,7 @@ int add_mainboard_resources(struct lb_memory *mem)
 /*
 * CONFIG_CHIP_NAME defined in Option.lb.
 */
-struct chip_operations mainboard_amd_dbm690t_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("AMD DBM690T   Mainboard")
        .enable_dev = dbm690t_enable,
 };

diff --git a/src/mainboard/amd/norwich/chip.h b/src/mainboard/amd/norwich/chip.h
index 8811f41063dd8f504cb8a12ee8f6dc2de22d9683..fb8c6abe4bcffc2ec6560b7553fa9f59f5cebf3a 100644 (file)
--- a/src/mainboard/amd/norwich/chip.h
+++ b/src/mainboard/amd/norwich/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_amd_norwich_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_amd_norwich_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/amd/norwich/mainboard.c b/src/mainboard/amd/norwich/mainboard.c
index 89537fda42ec288694016d29b69b070cfd4bd92c..e86720672ddb2d4c344c05e29a08972fa9ac30af 100644 (file)
--- a/src/mainboard/amd/norwich/mainboard.c
+++ b/src/mainboard/amd/norwich/mainboard.c
@@ -32,7 +32,7 @@ static void enable_dev(struct device *dev)
        dev->ops->init = init;
 }
 
-struct chip_operations mainboard_amd_norwich_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("AMD Norwich Mainboard")
        .enable_dev = enable_dev,
 };

diff --git a/src/mainboard/amd/pistachio/chip.h b/src/mainboard/amd/pistachio/chip.h
index 6cb1b941711e4df4a63503a0b96e2854e8756496..893ff2e88d346f6b68066f0ab3db2b7690af47df 100644 (file)
--- a/src/mainboard/amd/pistachio/chip.h
+++ b/src/mainboard/amd/pistachio/chip.h
@@ -17,9 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_amd_pistachio_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_amd_pistachio_config
+struct mainboard_config
 {
        unsigned long uma_size;                 /* How many UMA should be used in memory for TOP. */
 };

diff --git a/src/mainboard/amd/pistachio/mainboard.c b/src/mainboard/amd/pistachio/mainboard.c
index b72273f4e51de549f09ccee4795d0811498da848..960c74954d482cc542304fb497092828fdda0886 100644 (file)
--- a/src/mainboard/amd/pistachio/mainboard.c
+++ b/src/mainboard/amd/pistachio/mainboard.c
@@ -271,8 +271,8 @@ static void set_thermal_config()
 *************************************************/
 void pistachio_enable(device_t dev)
 {
-       struct mainboard_amd_pistachio_config *mainboard =
-           (struct mainboard_amd_pistachio_config *)dev->chip_info;
+       struct mainboard_config *mainboard =
+           (struct mainboard_config *)dev->chip_info;
 
        printk_info("Mainboard Pistachio Enable. dev=0x%x\n", dev);
 
@@ -338,7 +338,7 @@ int add_mainboard_resources(struct lb_memory *mem)
 /*
 * CONFIG_CHIP_NAME defined in Option.lb.
 */
-struct chip_operations mainboard_amd_pistachio_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("AMD Pistachio Mainboard")
        .enable_dev = pistachio_enable,
 };

diff --git a/src/mainboard/amd/rumba/chip.h b/src/mainboard/amd/rumba/chip.h
index 40efbfa69837766a59e61d9ddb21a0e224bdec1d..2094b2392cbd806bac0e3829fc679948e7b1a1e0 100644 (file)
--- a/src/mainboard/amd/rumba/chip.h
+++ b/src/mainboard/amd/rumba/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_amd_rumba_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_amd_rumba_config {
+struct mainboard_config {
        int nicirq;
 };

diff --git a/src/mainboard/amd/rumba/mainboard.c b/src/mainboard/amd/rumba/mainboard.c
index 84c9708b31b90a917e503a72ddf78e5ce71c5ed6..843f71b07135631e254425ef9c78402a0593ccc3 100644 (file)
--- a/src/mainboard/amd/rumba/mainboard.c
+++ b/src/mainboard/amd/rumba/mainboard.c
@@ -7,7 +7,7 @@
 #include "chip.h"
 
 static void init(struct device *dev) {
-       struct mainboard_amd_rumba_config  *mainboard = (struct mainboard_amd_rumba_config*)dev->chip_info;
+       struct mainboard_config  *mainboard = (struct mainboard_config*)dev->chip_info;
        device_t nic = NULL;
        unsigned bus = 0;
        unsigned devfn = PCI_DEVFN(0xd, 0);
@@ -36,7 +36,7 @@ static void enable_dev(struct device *dev)
         dev->ops->init = init;
 }
 
-struct chip_operations mainboard_amd_rumba_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("AMD Rumba Mainboard")
         .enable_dev = enable_dev,
 };

diff --git a/src/mainboard/amd/serengeti_cheetah/chip.h b/src/mainboard/amd/serengeti_cheetah/chip.h
index 258d16de4e3a0b05aeb7253b6c37ba8ea66a3468..71df35413f18abc7964c2471461eba959f9fb3f8 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/chip.h
+++ b/src/mainboard/amd/serengeti_cheetah/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_amd_serengeti_cheetah_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_amd_serengeti_cheetah_config {
+struct mainboard_config {
 //     int fixup_scsi;
 //     int fixup_vga;
 };

diff --git a/src/mainboard/amd/serengeti_cheetah/mainboard.c b/src/mainboard/amd/serengeti_cheetah/mainboard.c
index 73d962513b6875622e2b1f50608bb140e00af37f..c9ba0950296d20ecc4a60213933549e1edd668c3 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_amd_serengeti_cheetah_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("AMD Serengeti Cheetah Mainboard")
 };
 #endif

diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/chip.h b/src/mainboard/amd/serengeti_cheetah_fam10/chip.h
index e4034c661edb1465dff9906dc994c575d05c1110..bac5266485b925f1ebe38528c723b680dc2f4198 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah_fam10/chip.h
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/chip.h
@@ -18,9 +18,9 @@
  */
 
 
-extern struct chip_operations mainboard_amd_serengeti_cheetah_fam10_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_amd_serengeti_cheetah_fam10_config {
+struct mainboard_config {
 //     int fixup_scsi;
 //     int fixup_vga;
 };

diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
index afc89bae3f7f3e5ac80ad5572d34cc7affb3ede4..de6e139b96d1102bc434af2c64430a199a384117 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
@@ -26,7 +26,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_amd_serengeti_cheetah_fam10_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("AMD family 10 Cheetah mainboard")
 };
 #endif

diff --git a/src/mainboard/arima/hdama/chip.h b/src/mainboard/arima/hdama/chip.h
index c3792f41e978d1566e3072b035d47a22d6c6f670..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- a/src/mainboard/arima/hdama/chip.h
+++ b/src/mainboard/arima/hdama/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_arima_hdama_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_arima_hdama_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/arima/hdama/mainboard.c b/src/mainboard/arima/hdama/mainboard.c
index d676f975acfe268acd09593be2fae49883d1fae7..688a01cd87a8a5751384752ed3152cd20e7724a6 100644 (file)
--- a/src/mainboard/arima/hdama/mainboard.c
+++ b/src/mainboard/arima/hdama/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_arima_hdama_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Arima HDAMA Mainboard")
 };
 

diff --git a/src/mainboard/artecgroup/dbe61/chip.h b/src/mainboard/artecgroup/dbe61/chip.h
index f899056d44f40abb6155c13c1f64c6e0003ae5d9..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- a/src/mainboard/artecgroup/dbe61/chip.h
+++ b/src/mainboard/artecgroup/dbe61/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_artecgroup_dbe61_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_artecgroup_dbe61_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/artecgroup/dbe61/mainboard.c b/src/mainboard/artecgroup/dbe61/mainboard.c
index 37ad988cd8374bbd9d78ebac0d099a1826a1579c..49c27b3b6e4d07ae768395cbeeaf465e68ea8491 100644 (file)
--- a/src/mainboard/artecgroup/dbe61/mainboard.c
+++ b/src/mainboard/artecgroup/dbe61/mainboard.c
@@ -52,7 +52,7 @@ static void enable_dev(struct device *dev)
         dev->ops->init = init;
 }
 
-struct chip_operations mainboard_artecgroup_dbe61_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Artec Group dbe61 Mainboard")
         .enable_dev = enable_dev,
 };

diff --git a/src/mainboard/asi/mb_5blgp/chip.h b/src/mainboard/asi/mb_5blgp/chip.h
index 1fd07c0d0e1da47f2048085fef741540ef90c5be..56e17ca594128192c52440b67fed77c2f74605f7 100644 (file)
--- a/src/mainboard/asi/mb_5blgp/chip.h
+++ b/src/mainboard/asi/mb_5blgp/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_asi_mb_5blgp_ops;
-struct mainboard_asi_mb_5blgp_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};

diff --git a/src/mainboard/asi/mb_5blgp/mainboard.c b/src/mainboard/asi/mb_5blgp/mainboard.c
index a31d332487860e28000bbe9c247c64a19c5a0d1e..22bc52dae72679da2d3e86888cc5f1b05d7859c0 100644 (file)
--- a/src/mainboard/asi/mb_5blgp/mainboard.c
+++ b/src/mainboard/asi/mb_5blgp/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_asi_mb_5blgp_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("ASI MB-5BLGP Mainboard")
 };

diff --git a/src/mainboard/asi/mb_5blmp/chip.h b/src/mainboard/asi/mb_5blmp/chip.h
index bfe305c479e25baf39b03b0fb88808506d7cc033..4bb66e962e330e037468d9b5d87cf066ff3ef35f 100644 (file)
--- a/src/mainboard/asi/mb_5blmp/chip.h
+++ b/src/mainboard/asi/mb_5blmp/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_asi_mb_5blmp_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_asi_mb_5blmp_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/asi/mb_5blmp/mainboard.c b/src/mainboard/asi/mb_5blmp/mainboard.c
index 53151c2aed2fbc076be04683d99d77f180f73f37..78366ba20da337c954a04b1847ade9edfa7f74ae 100644 (file)
--- a/src/mainboard/asi/mb_5blmp/mainboard.c
+++ b/src/mainboard/asi/mb_5blmp/mainboard.c
@@ -21,7 +21,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_asi_mb_5blmp_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("ASI/BCom MB-5BLMP Mainboard")
 };
 

diff --git a/src/mainboard/asus/a8n_e/chip.h b/src/mainboard/asus/a8n_e/chip.h
index 61a1b434e980ff6da35b6441aa5a51bee3ea1b2d..609d2c240304aced75f4ed3938d4378b88544770 100644 (file)
--- 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 f75e7aeac82a6147d10f3dafd586002f8e0e43c0..4468325502e0acaa90e21d0943b99837c6e5a0a6 100644 (file)
--- 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 101113437d5e34d900ffb30282f5597381ffa18b..8a285787583eafd70047109ffea6b0213d94a3fb 100644 (file)
--- 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 c06fbffd60af45b96095b96d0db2b995e6899b29..2a3fd3b1c525621c8d97bc8cda3084ec372d9564 100644 (file)
--- 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 e2174e3948b3bbb1260becb21f3b03aa70d2c870..8a285787583eafd70047109ffea6b0213d94a3fb 100644 (file)
--- 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 f46109b561584f3056dca527aefa01d8b4a8f0b5..2a5910b3a329974047473fc480ca95ab16aa6956 100644 (file)
--- 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 75cb37d038500344058eed3680c8fa01d1a96f62..dc9bed35a5c9ea4c5151f767d8b98904a9c2b2aa 100644 (file)
--- 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 077919c46fe331749f65f9d8136abc19e3bcf874..86f22552e57e696863e84c20e9965f300f7b9870 100644 (file)
--- 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 bcadf9e6fe8a74f1fc2c7e097cea0ae6ed4124e2..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- 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 4e03be0fea08f3564cffcdd43480bdb8aaf7b8ad..9e325e7165aa71eb496e621d7b5be2e494623b07 100644 (file)
--- 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 415085a4a7b44690b5c0cdea7d54b9ac9caed764..56e17ca594128192c52440b67fed77c2f74605f7 100644 (file)
--- 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 d5a59a3b2581991c43d696b0ecb4920a091b6214..910b13075a07dae969eb3a234b7b8102c029b459 100644 (file)
--- 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 1b9b1ead69a05e8d01f9e348b6ee2f8c5ed1b544..dc9bed35a5c9ea4c5151f767d8b98904a9c2b2aa 100644 (file)
--- 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 3868de5dbfa521be6e752fe6ec46d1125c33397f..e2b022a0a25b3e4407e167c0eaf74939de44090e 100644 (file)
--- 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 2c37301824b5357d643bd888ffb5c4b60bac7e2f..dc9bed35a5c9ea4c5151f767d8b98904a9c2b2aa 100644 (file)
--- 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 b21a9e6e84665ab8507127364dfc0cd5393e36e0..21e5a4ef1983b70c1335ddcc3143d90cd63920c9 100644 (file)
--- 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 369246289cb11d5c30ca085aab69abe5a5fbf80b..dc9bed35a5c9ea4c5151f767d8b98904a9c2b2aa 100644 (file)
--- 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 9296219d1d7ce976a9898cd228d0196b19f319f8..c234fc20112da82a6a5d2488ceb2458222553b2e 100644 (file)
--- 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")
 };

diff --git a/src/mainboard/axus/tc320/chip.h b/src/mainboard/axus/tc320/chip.h
index bf14e960984aed32b0fe0e7f6a60a44af2347b83..6e6f190305b758e7f254e2925cd7c8a2f09d5b5a 100644 (file)
--- a/src/mainboard/axus/tc320/chip.h
+++ b/src/mainboard/axus/tc320/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_axus_tc320_ops;
-struct mainboard_axus_tc320_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};

diff --git a/src/mainboard/axus/tc320/mainboard.c b/src/mainboard/axus/tc320/mainboard.c
index 47dfd00ccff4b543e369943ae4d3ca5e22bdaf61..89c3dca5affa5124d09902d6d20c3e4f40a3713a 100644 (file)
--- a/src/mainboard/axus/tc320/mainboard.c
+++ b/src/mainboard/axus/tc320/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_axus_tc320_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("AXUS TC320 Mainboard")
 };

diff --git a/src/mainboard/azza/pt-6ibd/chip.h b/src/mainboard/azza/pt-6ibd/chip.h
index 843c41d099343c2fb3066e529e76c98a1a04fa9d..dc9bed35a5c9ea4c5151f767d8b98904a9c2b2aa 100644 (file)
--- a/src/mainboard/azza/pt-6ibd/chip.h
+++ b/src/mainboard/azza/pt-6ibd/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_azza_pt_6ibd_ops;
-struct mainboard_azza_pt_6ibd_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};

diff --git a/src/mainboard/azza/pt-6ibd/mainboard.c b/src/mainboard/azza/pt-6ibd/mainboard.c
index ab648651ce502a660d7136e394b7b62ced196e14..45efc16dbba86844f655bbf1643755150632beae 100644 (file)
--- a/src/mainboard/azza/pt-6ibd/mainboard.c
+++ b/src/mainboard/azza/pt-6ibd/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_azza_pt_6ibd_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("AZZA PT-6IBD Mainboard")
 };

diff --git a/src/mainboard/bcom/winnet100/chip.h b/src/mainboard/bcom/winnet100/chip.h
index 0ecdc4c0bb4b12b3c35e2b86c483377d74d8cd7d..eae17f8782eadc71408448bcb81e3fa1958612ee 100644 (file)
--- a/src/mainboard/bcom/winnet100/chip.h
+++ b/src/mainboard/bcom/winnet100/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_bcom_winnet100_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_bcom_winnet100_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/bcom/winnet100/mainboard.c b/src/mainboard/bcom/winnet100/mainboard.c
index 1201995c5f845b8ca27ae0eca149c19d30f56635..279701dc0ef20de90ea8dbf034b24d63b24b3765 100644 (file)
--- a/src/mainboard/bcom/winnet100/mainboard.c
+++ b/src/mainboard/bcom/winnet100/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_bcom_winnet100_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("BCOM WinNET100 Mainboard")
 };

diff --git a/src/mainboard/bcom/winnetp680/chip.h b/src/mainboard/bcom/winnetp680/chip.h
index e2202dd6594f3ad35e719cde4850c785a699471b..59ab64395f6fda3d2255188b9b9b0ef30d870218 100644 (file)
--- a/src/mainboard/bcom/winnetp680/chip.h
+++ b/src/mainboard/bcom/winnetp680/chip.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_bcom_winnetp680_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_bcom_winnetp680_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/bcom/winnetp680/mainboard.c b/src/mainboard/bcom/winnetp680/mainboard.c
index 9ce51bb559fe7f3388a532686f4137bcf0cb26d5..f467e1b6f1d016155fc2ef73f0b02573a17ad37c 100644 (file)
--- a/src/mainboard/bcom/winnetp680/mainboard.c
+++ b/src/mainboard/bcom/winnetp680/mainboard.c
@@ -22,6 +22,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_bcom_winnetp680_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("BCOM WinNET P680 Mainboard")
 };

diff --git a/src/mainboard/biostar/m6tba/chip.h b/src/mainboard/biostar/m6tba/chip.h
index 7b45a7ee03872bb233c3a2213e9bbecc085af92f..dc9bed35a5c9ea4c5151f767d8b98904a9c2b2aa 100644 (file)
--- a/src/mainboard/biostar/m6tba/chip.h
+++ b/src/mainboard/biostar/m6tba/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_biostar_m6tba_ops;
-struct mainboard_biostar_m6tba_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};

diff --git a/src/mainboard/biostar/m6tba/mainboard.c b/src/mainboard/biostar/m6tba/mainboard.c
index a804ae98ee15f56a3f0da4a3328e1bdf70d845a5..fb6896ab56d5e7289342b7929ec67abe7fb16ad4 100644 (file)
--- a/src/mainboard/biostar/m6tba/mainboard.c
+++ b/src/mainboard/biostar/m6tba/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_biostar_m6tba_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Biostar M6TBA Mainboard")
 };

diff --git a/src/mainboard/broadcom/blast/chip.h b/src/mainboard/broadcom/blast/chip.h
index dbc442a1849e8c71cf6c9fda0c2bf54816764e65..71df35413f18abc7964c2471461eba959f9fb3f8 100644 (file)
--- a/src/mainboard/broadcom/blast/chip.h
+++ b/src/mainboard/broadcom/blast/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_broadcom_blast_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_broadcom_blast_config {
+struct mainboard_config {
 //     int fixup_scsi;
 //     int fixup_vga;
 };

diff --git a/src/mainboard/broadcom/blast/mainboard.c b/src/mainboard/broadcom/blast/mainboard.c
index 27909ecd81629db7a9975f3e4a8c0485b0a9be56..5217473252c29d5fa00d122575648be461413164 100644 (file)
--- a/src/mainboard/broadcom/blast/mainboard.c
+++ b/src/mainboard/broadcom/blast/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_broadcom_blast_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Broadcom Blast Mainboard")
 };
 #endif

diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/chip.h b/src/mainboard/compaq/deskpro_en_sff_p600/chip.h
index 9e6d238f3f7fecb092e7fe6291762ab3f5475c6e..dc9bed35a5c9ea4c5151f767d8b98904a9c2b2aa 100644 (file)
--- a/src/mainboard/compaq/deskpro_en_sff_p600/chip.h
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_compaq_deskpro_en_sff_p600_ops;
-struct mainboard_compaq_deskpro_en_sff_p600_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};

diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c b/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c
index d31a809933af36fb7e4d444e8e4835daed102405..75d7876aa9f8807867a2e75cae9ce75c65386707 100644 (file)
--- a/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_compaq_deskpro_en_sff_p600_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Compaq Deskpro EN SFF P600 Mainboard")
 };

diff --git a/src/mainboard/dell/s1850/chip.h b/src/mainboard/dell/s1850/chip.h
index 75dcaf49c1b95d90041174045339a26dd624aff0..b6e23b26882e2aeb976b0f94d994a5ff602cdd18 100644 (file)
--- a/src/mainboard/dell/s1850/chip.h
+++ b/src/mainboard/dell/s1850/chip.h
@@ -1,5 +1,5 @@
-struct chip_operations mainboard_dell_s1850_ops;
+struct chip_operations mainboard_ops;
 
-struct mainboard_dell_s1850_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/dell/s1850/mainboard.c b/src/mainboard/dell/s1850/mainboard.c
index e969dd20f3d5188f9241ccac5e05847d077d4e6c..3d22f2d64acd2a8f79357be2956a8b690788e155 100644 (file)
--- a/src/mainboard/dell/s1850/mainboard.c
+++ b/src/mainboard/dell/s1850/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_dell_s1850_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Dell S1850 Mainboard")
 };
 

diff --git a/src/mainboard/digitallogic/adl855pc/chip.h b/src/mainboard/digitallogic/adl855pc/chip.h
index 0ed80895610c5b855df7b2b3934f6734e617d965..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- a/src/mainboard/digitallogic/adl855pc/chip.h
+++ b/src/mainboard/digitallogic/adl855pc/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_digitallogic_adl855pc_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_digitallogic_adl855pc_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/digitallogic/adl855pc/mainboard.c b/src/mainboard/digitallogic/adl855pc/mainboard.c
index 2e0e332ee186babd5f22d68aa003f7b423a1f148..c6ab63e182d088e638772fdfd34679452fee5f6f 100644 (file)
--- a/src/mainboard/digitallogic/adl855pc/mainboard.c
+++ b/src/mainboard/digitallogic/adl855pc/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_digitallogic_adl855pc_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("DIGITAL-LOGIC ADL855PC Mainboard")
 };
 

diff --git a/src/mainboard/digitallogic/msm586seg/chip.h b/src/mainboard/digitallogic/msm586seg/chip.h
index fa064d48f32bfb1874c2838b1bac5cf6a07f227b..ceb8af100a8efc29e9a55cae87568224fc4b06eb 100644 (file)
--- a/src/mainboard/digitallogic/msm586seg/chip.h
+++ b/src/mainboard/digitallogic/msm586seg/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_digitallogic_msm586seg_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_digitallogic_msm586seg_config {
+struct mainboard_config {
 
 };

diff --git a/src/mainboard/digitallogic/msm586seg/mainboard.c b/src/mainboard/digitallogic/msm586seg/mainboard.c
index f898218c7710396daeee4efe89a9e6a5a84e03ea..b64a927bd72e9605ef2fff6dac30d98a6047a6cd 100644 (file)
--- a/src/mainboard/digitallogic/msm586seg/mainboard.c
+++ b/src/mainboard/digitallogic/msm586seg/mainboard.c
@@ -141,7 +141,7 @@ static void enable_dev(struct device *dev) {
 
        
 }
-struct chip_operations mainboard_digitallogic_msm586seg_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("DIGITAL-LOGIC MSM586SEG Mainboard")
        .enable_dev = enable_dev
 };

diff --git a/src/mainboard/digitallogic/msm800sev/chip.h b/src/mainboard/digitallogic/msm800sev/chip.h
index 908ea93beff62ce542f60978758284d90896252b..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- a/src/mainboard/digitallogic/msm800sev/chip.h
+++ b/src/mainboard/digitallogic/msm800sev/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_digitallogic_msm800sev_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_digitallogic_msm800sev_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/digitallogic/msm800sev/mainboard.c b/src/mainboard/digitallogic/msm800sev/mainboard.c
index ffe95b234b6cbf45d4ff37ed6f1840cc631be6db..2d3c3c4b519982b499125950c3eb55059525e488 100644 (file)
--- a/src/mainboard/digitallogic/msm800sev/mainboard.c
+++ b/src/mainboard/digitallogic/msm800sev/mainboard.c
@@ -32,7 +32,7 @@ static void enable_dev(struct device *dev)
         dev->ops->init = init;
 }
 
-struct chip_operations mainboard_digitallogic_msm800sev_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("DIGITAL-LOGIC MSM800SEV Mainboard")
         .enable_dev = enable_dev,
 };

diff --git a/src/mainboard/eaglelion/5bcm/chip.h b/src/mainboard/eaglelion/5bcm/chip.h
index 4eb6bf7f25f0397401af3be1ee2c2998974978be..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- a/src/mainboard/eaglelion/5bcm/chip.h
+++ b/src/mainboard/eaglelion/5bcm/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_eaglelion_5bcm_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_eaglelion_5bcm_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/eaglelion/5bcm/mainboard.c b/src/mainboard/eaglelion/5bcm/mainboard.c
index 7048ad819a5ffb2cbdbf662087d5cbab78ad8e64..c0b3ae067e763f18f7e5009385cefcb0e77ed9ee 100644 (file)
--- a/src/mainboard/eaglelion/5bcm/mainboard.c
+++ b/src/mainboard/eaglelion/5bcm/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_eaglelion_5bcm_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Eaglelion 5BCM Mainboard")
 };
 

diff --git a/src/mainboard/emulation/qemu-x86/chip.h b/src/mainboard/emulation/qemu-x86/chip.h
index d6ecdde37b303ee34e06e72a8e51ea833fbc1457..06f11d08629333efc36805ed06f74acfb8f00419 100644 (file)
--- a/src/mainboard/emulation/qemu-x86/chip.h
+++ b/src/mainboard/emulation/qemu-x86/chip.h
@@ -1,4 +1,4 @@
-extern struct chip_operations mainboard_emulation_qemu_x86_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_emulation_qemu_x86_config {
+struct mainboard_config {
 };

diff --git a/src/mainboard/emulation/qemu-x86/mainboard.c b/src/mainboard/emulation/qemu-x86/mainboard.c
index abf1299dd104ac66e44cd874756274c499e97484..99e289f334e469f718befc25d11e67afb566d72b 100644 (file)
--- a/src/mainboard/emulation/qemu-x86/mainboard.c
+++ b/src/mainboard/emulation/qemu-x86/mainboard.c
@@ -35,7 +35,7 @@ static const struct pci_driver vga_driver __pci_driver = {
        .device = 0x00b8,
 };
 
-struct chip_operations mainboard_emulation_qemu_x86_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("QEMU Mainboard")
 };
 

diff --git a/src/mainboard/gigabyte/ga-6bxc/chip.h b/src/mainboard/gigabyte/ga-6bxc/chip.h
index a2bca6b0584f00fae90c6dc7a4885f18bd2c2582..dc9bed35a5c9ea4c5151f767d8b98904a9c2b2aa 100644 (file)
--- 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 70a74782e0b71966d2f58463f453c2dedd6e5ad5..01411f3f8198cfbc422c8191114a191c269e14ef 100644 (file)
--- 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 289fbefd7e59014aca40e45fe2d5a333044d9c14..530c7f923086d84c8678ef4e0a6c8510e67d5056 100644 (file)
--- 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 eec11951588d4a97a98fc6253c95c54e2da5e95b..89fd895de18da6ebe9c8d81b81e3e9d464420b7b 100644 (file)
--- 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 7cc12ee0481b449c6bfdde58258f69873b47d1d6..556dc7ea1d16cefb3ff6eac7f82b94a2dbffeff3 100644 (file)
--- 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 0a8257a5742e96a11e107224294c478e39fbfbff..3a688768e39cde2327ccdaf563f836566e68b75a 100644 (file)
--- 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

diff --git a/src/mainboard/ibm/e325/chip.h b/src/mainboard/ibm/e325/chip.h
index 589d0284aa312d63e465d6d3f3ef437f767efbb3..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- a/src/mainboard/ibm/e325/chip.h
+++ b/src/mainboard/ibm/e325/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_ibm_e325_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_ibm_e325_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/ibm/e325/mainboard.c b/src/mainboard/ibm/e325/mainboard.c
index 81aa594c190b22b770262a3a7790ce127d5ebc04..49a8c4131d94ef4b7d6e2e8c15e5335c6ce64fcb 100644 (file)
--- a/src/mainboard/ibm/e325/mainboard.c
+++ b/src/mainboard/ibm/e325/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_ibm_e325_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("IBM eServer 325 Mainboard")
 };
 

diff --git a/src/mainboard/ibm/e326/chip.h b/src/mainboard/ibm/e326/chip.h
index 35f10e64cf8e112abeee6fb3d7563ce8dc524373..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- a/src/mainboard/ibm/e326/chip.h
+++ b/src/mainboard/ibm/e326/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_ibm_e326_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_ibm_e326_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/ibm/e326/mainboard.c b/src/mainboard/ibm/e326/mainboard.c
index 0439a5b709049f8bb0965b7c5feffed0a52054e2..70b59a96b4532297d030efd3dc44a6e29bafd2ba 100644 (file)
--- a/src/mainboard/ibm/e326/mainboard.c
+++ b/src/mainboard/ibm/e326/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_ibm_e326_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("IBM eServer 326 Mainboard")
 };
 

diff --git a/src/mainboard/iei/juki-511p/chip.h b/src/mainboard/iei/juki-511p/chip.h
index db99050efdbf8071db5780185b59b360f856ef74..8c613a7cd05a7b91222e1da746fbc903255edef8 100644 (file)
--- a/src/mainboard/iei/juki-511p/chip.h
+++ b/src/mainboard/iei/juki-511p/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_iei_juki_511p_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_iei_juki_511p_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/iei/juki-511p/mainboard.c b/src/mainboard/iei/juki-511p/mainboard.c
index 0956a6193f92ed03f572af99e6043606e709f92b..e44a07c23068452dded44b043de99265d31afaa8 100644 (file)
--- a/src/mainboard/iei/juki-511p/mainboard.c
+++ b/src/mainboard/iei/juki-511p/mainboard.c
@@ -26,6 +26,6 @@
 #include <arch/io.h>
 #include "chip.h"
 
-struct chip_operations mainboard_iei_juki_511p_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("IEI JUKI-511P Mainboard")
 };

diff --git a/src/mainboard/iei/nova4899r/chip.h b/src/mainboard/iei/nova4899r/chip.h
index 51403ae9954efb85ef0ab33668680b3a46800228..4092860b959446043cdc0e195c5edf4c278c6b86 100644 (file)
--- a/src/mainboard/iei/nova4899r/chip.h
+++ b/src/mainboard/iei/nova4899r/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_iei_nova4899r_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_iei_nova4899r_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/iei/nova4899r/mainboard.c b/src/mainboard/iei/nova4899r/mainboard.c
index 0a8a9177bb9a94d9ad8b28b455c9787adb164118..7ca0a14214b64b4889ebfbb79e0a95a9f845e8e3 100644 (file)
--- a/src/mainboard/iei/nova4899r/mainboard.c
+++ b/src/mainboard/iei/nova4899r/mainboard.c
@@ -26,6 +26,6 @@
 #include <arch/io.h>
 #include "chip.h"
 
-struct chip_operations mainboard_iei_nova4899r_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("IEI NOVA-4899R Mainboard")
 };

diff --git a/src/mainboard/iei/pcisa-lx-800-r10/chip.h b/src/mainboard/iei/pcisa-lx-800-r10/chip.h
index ceaaafda42366467b8874dc11bae703f5904b2a6..8c613a7cd05a7b91222e1da746fbc903255edef8 100644 (file)
--- a/src/mainboard/iei/pcisa-lx-800-r10/chip.h
+++ b/src/mainboard/iei/pcisa-lx-800-r10/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_iei_pcisa_lx_800_r10_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_iei_pcisa_lx_800_r10_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c b/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c
index c33eb0b7afb12922ba66cd9d21677e39047f2eb6..163e3607379bf2662044daedf7134730c97137cf 100644 (file)
--- a/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c
+++ b/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c
@@ -20,6 +20,6 @@
 
 #include <device/device.h>
 
-struct chip_operations mainboard_iei_pcisa_lx_800_r10_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("IEI PCISA-LX-800-R10 Mainboard")
 };

diff --git a/src/mainboard/intel/jarrell/chip.h b/src/mainboard/intel/jarrell/chip.h
index 7cc59091bd82a843006e765078392c043a7a3bcf..b6e23b26882e2aeb976b0f94d994a5ff602cdd18 100644 (file)
--- a/src/mainboard/intel/jarrell/chip.h
+++ b/src/mainboard/intel/jarrell/chip.h
@@ -1,5 +1,5 @@
-struct chip_operations mainboard_intel_jarrell_ops;
+struct chip_operations mainboard_ops;
 
-struct mainboard_intel_jarrell_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/intel/jarrell/mainboard.c b/src/mainboard/intel/jarrell/mainboard.c
index f7b58ac3f013b3783714a5fc67c07990c099d2a5..ba2bfc5017d7ecfaf48b699cd503a9157899dcec 100644 (file)
--- a/src/mainboard/intel/jarrell/mainboard.c
+++ b/src/mainboard/intel/jarrell/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_intel_e7520_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Intel Jarell Mainboard")
 };
 

diff --git a/src/mainboard/intel/mtarvon/chip.h b/src/mainboard/intel/mtarvon/chip.h
index c61616dfd5e56cb21cfa186223e38848ed13e6bb..4921b7bfcc0ea17489c4228c9745ccecf0a491cf 100644 (file)
--- a/src/mainboard/intel/mtarvon/chip.h
+++ b/src/mainboard/intel/mtarvon/chip.h
@@ -18,8 +18,8 @@
  *
  */
 
-struct chip_operations mainboard_intel_mtarvon_ops;
+struct chip_operations mainboard_ops;
 
-struct mainboard_intel_mtarvon_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/intel/mtarvon/mainboard.c b/src/mainboard/intel/mtarvon/mainboard.c
index 2ff158caa2ec9fe9aefdeeeb8a6e17bb07b362f0..26111f541227d719f25cb04ff53e5910f870c3cc 100644 (file)
--- a/src/mainboard/intel/mtarvon/mainboard.c
+++ b/src/mainboard/intel/mtarvon/mainboard.c
@@ -21,7 +21,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_intel_mtarvon_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Intel Mt. Arvon Mainboard")
 };
 

diff --git a/src/mainboard/intel/truxton/chip.h b/src/mainboard/intel/truxton/chip.h
index f1100b9f3ceece1e0a84a231cdd28caf56da3fca..4921b7bfcc0ea17489c4228c9745ccecf0a491cf 100644 (file)
--- a/src/mainboard/intel/truxton/chip.h
+++ b/src/mainboard/intel/truxton/chip.h
@@ -18,8 +18,8 @@
  *
  */
 
-struct chip_operations mainboard_intel_truxton_ops;
+struct chip_operations mainboard_ops;
 
-struct mainboard_intel_truxton_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/intel/truxton/mainboard.c b/src/mainboard/intel/truxton/mainboard.c
index e0f3def2950fb532ed399d8d88376ef745e13454..78a16a92b5751056d4d56899e4259d1ef981020d 100644 (file)
--- a/src/mainboard/intel/truxton/mainboard.c
+++ b/src/mainboard/intel/truxton/mainboard.c
@@ -21,7 +21,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_intel_truxton_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Intel Truxton Mainboard")
 };
 

diff --git a/src/mainboard/intel/xe7501devkit/chip.h b/src/mainboard/intel/xe7501devkit/chip.h
index 12a9127ff2fc7fd19c3283210e854c16f19708de..af1397bd0fa47aa4a6ca7d4cde3b04e913b4bc94 100644 (file)
--- a/src/mainboard/intel/xe7501devkit/chip.h
+++ b/src/mainboard/intel/xe7501devkit/chip.h
@@ -1,6 +1,6 @@
 extern unsigned char _vgarom_start[];
 
-extern struct chip_operations mainboard_intel_xe7501devkit_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_intel_xe7501devkit_config {
+struct mainboard_config {
 };

diff --git a/src/mainboard/intel/xe7501devkit/mainboard.c b/src/mainboard/intel/xe7501devkit/mainboard.c
index 923878291addac6a30b96e02163c28150ceb0eaf..1d0a1d09c802e6425918ac0e61577390caf8838d 100644 (file)
--- a/src/mainboard/intel/xe7501devkit/mainboard.c
+++ b/src/mainboard/intel/xe7501devkit/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_intel_xe7501devkit_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Intel Xeon E7501 DevKit Mainboard")
 };
 #endif

diff --git a/src/mainboard/iwill/dk8_htx/chip.h b/src/mainboard/iwill/dk8_htx/chip.h
index 6d6e90c51581f0e4ce878c63db8e1961251ca52e..71df35413f18abc7964c2471461eba959f9fb3f8 100644 (file)
--- a/src/mainboard/iwill/dk8_htx/chip.h
+++ b/src/mainboard/iwill/dk8_htx/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_iwill_dk8_htx_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_iwill_dk8_htx_config {
+struct mainboard_config {
 //     int fixup_scsi;
 //     int fixup_vga;
 };

diff --git a/src/mainboard/iwill/dk8_htx/mainboard.c b/src/mainboard/iwill/dk8_htx/mainboard.c
index 01cbe494a823b8bdbab27021833abf1fd98fcda9..484290bd129df5344821c092cc22348273e93b0b 100644 (file)
--- a/src/mainboard/iwill/dk8_htx/mainboard.c
+++ b/src/mainboard/iwill/dk8_htx/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_iwill_dk8_htx_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("IWILL DK8-HTX Mainboard")
 };
 #endif

diff --git a/src/mainboard/iwill/dk8s2/chip.h b/src/mainboard/iwill/dk8s2/chip.h
index af9438c9133d8a0b012cc9c4aa42c4b6efab3d13..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- a/src/mainboard/iwill/dk8s2/chip.h
+++ b/src/mainboard/iwill/dk8s2/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_iwill_dk8s2_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_iwill_dk8s2_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/iwill/dk8s2/mainboard.c b/src/mainboard/iwill/dk8s2/mainboard.c
index b51ef18bada6889552d1bcf40115e043e358f309..7559da63c069fc92fdc5dab51a77647b59d26106 100644 (file)
--- a/src/mainboard/iwill/dk8s2/mainboard.c
+++ b/src/mainboard/iwill/dk8s2/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_iwill_dk8s2_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("IWILL DK8S2 Mainboard")
 };
 

diff --git a/src/mainboard/iwill/dk8x/chip.h b/src/mainboard/iwill/dk8x/chip.h
index 4057cfa204c125130671f184495d5e6ff6c696d5..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- a/src/mainboard/iwill/dk8x/chip.h
+++ b/src/mainboard/iwill/dk8x/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_iwill_dk8x_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_iwill_dk8x_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/iwill/dk8x/mainboard.c b/src/mainboard/iwill/dk8x/mainboard.c
index 18cb2b5b4fe6c6ab2871db7dc2d63e3ca14a709f..a936f4032b188406b0de1785d022290e92227b14 100644 (file)
--- a/src/mainboard/iwill/dk8x/mainboard.c
+++ b/src/mainboard/iwill/dk8x/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_iwill_dk8x_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("IWILL DK8X Mainboard")
 };
 

diff --git a/src/mainboard/jetway/j7f24/chip.h b/src/mainboard/jetway/j7f24/chip.h
index ad8c8a78865af6ff8d11fd87257dad1a87d54624..59ab64395f6fda3d2255188b9b9b0ef30d870218 100644 (file)
--- a/src/mainboard/jetway/j7f24/chip.h
+++ b/src/mainboard/jetway/j7f24/chip.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_jetway_j7f24_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_jetway_j7f24_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/jetway/j7f24/mainboard.c b/src/mainboard/jetway/j7f24/mainboard.c
index bb769b144ff19b907b9df20bce5e1e6e7bae5aa0..66937479d3a22e98ac01b67aefa5cd00de1f848d 100644 (file)
--- a/src/mainboard/jetway/j7f24/mainboard.c
+++ b/src/mainboard/jetway/j7f24/mainboard.c
@@ -22,6 +22,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_jetway_j7f24_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Jetway J7F[24]* Mainboard")
 };

diff --git a/src/mainboard/kontron/986lcd-m/chip.h b/src/mainboard/kontron/986lcd-m/chip.h
index abc9e8b0be8496129f3e679ab86705b49f8dbd97..08a66b677e3ac7b7e983711ca63b9242986dc0b9 100644 (file)
--- a/src/mainboard/kontron/986lcd-m/chip.h
+++ b/src/mainboard/kontron/986lcd-m/chip.h
@@ -19,7 +19,7 @@
  * MA 02110-1301 USA
  */
 
-struct chip_operations mainboard_kontron_986lcd_m_ops;
-struct mainboard_kontron_986lcd_m_config {
+struct chip_operations mainboard_ops;
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c
index 17b23a24625ba5c7d9ff48b9ad020aaff39b05cf..e66777cc965db0bb0efd49592af9bb8d37e71164 100644 (file)
--- a/src/mainboard/kontron/986lcd-m/mainboard.c
+++ b/src/mainboard/kontron/986lcd-m/mainboard.c
@@ -23,7 +23,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_kontron_986lcd_m_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Kontron 986LCD-M Mainboard")
 };
 

diff --git a/src/mainboard/lippert/frontrunner/chip.h b/src/mainboard/lippert/frontrunner/chip.h
index ef3f3b7b803ad6f867d0004d8b51d679780437b5..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- a/src/mainboard/lippert/frontrunner/chip.h
+++ b/src/mainboard/lippert/frontrunner/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_lippert_frontrunner_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_lippert_frontrunner_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/lippert/frontrunner/mainboard.c b/src/mainboard/lippert/frontrunner/mainboard.c
index aa82ae152521166b8c5580c5d0bd2f7fdc862e02..7cd9f1d03433d42df1e16aec9a7d0a4aced748f4 100644 (file)
--- a/src/mainboard/lippert/frontrunner/mainboard.c
+++ b/src/mainboard/lippert/frontrunner/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_lippert_frontrunner_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Lippert Cool Frontrunner Mainboard")
 };
 

diff --git a/src/mainboard/lippert/roadrunner-lx/chip.h b/src/mainboard/lippert/roadrunner-lx/chip.h
index 5a676edf0e3f455d9fee37cb34164972b8948904..b201059400c8c8d72ac2729bd4d5277d57d954e9 100644 (file)
--- a/src/mainboard/lippert/roadrunner-lx/chip.h
+++ b/src/mainboard/lippert/roadrunner-lx/chip.h
@@ -22,9 +22,9 @@
 
 #include <stdint.h>
 
-extern struct chip_operations mainboard_lippert_roadrunner_lx_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_lippert_roadrunner_lx_config {
+struct mainboard_config {
        /* bit5 = Live LED, bit2 = RS485_EN2, bit1 = RS485_EN1 */
        u8 sio_gp1x_config;
 };

diff --git a/src/mainboard/lippert/roadrunner-lx/mainboard.c b/src/mainboard/lippert/roadrunner-lx/mainboard.c
index b577aae2e34f8bebd9fb5f6a45d94db58dae969d..ad72f5dc023d1076f552d1af78011296120b82c5 100644 (file)
--- a/src/mainboard/lippert/roadrunner-lx/mainboard.c
+++ b/src/mainboard/lippert/roadrunner-lx/mainboard.c
@@ -40,7 +40,7 @@ static const u16 ec_init_table[] = {  /* hi=data, lo=index */
 
 static void init(struct device *dev)
 {
-       struct mainboard_lippert_roadrunner_lx_config *mb = dev->chip_info;
+       struct mainboard_config *mb = dev->chip_info;
        unsigned int gpio_base, i;
        printk_debug("LiPPERT RoadRunner-LX ENTER %s\n", __func__);
 
@@ -70,7 +70,7 @@ static void enable_dev(struct device *dev)
        dev->ops->init = init;
 }
 
-struct chip_operations mainboard_lippert_roadrunner_lx_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("LiPPERT RoadRunner-LX Mainboard")
        .enable_dev = enable_dev,
 };

diff --git a/src/mainboard/lippert/spacerunner-lx/chip.h b/src/mainboard/lippert/spacerunner-lx/chip.h
index d575f6cc3e7b410f026ce858bc0b02e2e2ea113a..422b04ab2bfa5e809c7bac6755bcc507a63e152a 100644 (file)
--- a/src/mainboard/lippert/spacerunner-lx/chip.h
+++ b/src/mainboard/lippert/spacerunner-lx/chip.h
@@ -22,9 +22,9 @@
 
 #include <stdint.h>
 
-extern struct chip_operations mainboard_lippert_spacerunner_lx_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_lippert_spacerunner_lx_config {
+struct mainboard_config {
        /* bit2 = RS485_EN2, bit1 = RS485_EN1, bit0 = Live LED */
        u8 sio_gp1x_config;
 };

diff --git a/src/mainboard/lippert/spacerunner-lx/mainboard.c b/src/mainboard/lippert/spacerunner-lx/mainboard.c
index 5ef2ebf3e89f31395ea62d1626c9757272c6cfef..05d2265569fb0edc1c2e9255360ce55ddde303a9 100644 (file)
--- a/src/mainboard/lippert/spacerunner-lx/mainboard.c
+++ b/src/mainboard/lippert/spacerunner-lx/mainboard.c
@@ -41,7 +41,7 @@ static const u16 ec_init_table[] = { /* hi=data, lo=index */
 
 static void init(struct device *dev)
 {
-       struct mainboard_lippert_spacerunner_lx_config *mb = dev->chip_info;
+       struct mainboard_config *mb = dev->chip_info;
        unsigned int gpio_base, i;
        printk_debug("LiPPERT SpaceRunner-LX ENTER %s\n", __func__);
 
@@ -74,7 +74,7 @@ static void enable_dev(struct device *dev)
        dev->ops->init = init;
 }
 
-struct chip_operations mainboard_lippert_spacerunner_lx_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("LiPPERT SpaceRunner-LX Mainboard")
        .enable_dev = enable_dev,
 };

diff --git a/src/mainboard/msi/ms6119/chip.h b/src/mainboard/msi/ms6119/chip.h
index bcc281fde9a28831b70938f5ff4b8c77aba08ffe..56e17ca594128192c52440b67fed77c2f74605f7 100644 (file)
--- a/src/mainboard/msi/ms6119/chip.h
+++ b/src/mainboard/msi/ms6119/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_msi_ms6119_ops;
-struct mainboard_msi_ms6119_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};

diff --git a/src/mainboard/msi/ms6119/mainboard.c b/src/mainboard/msi/ms6119/mainboard.c
index 77ffcb8d64c9848746edccc6a6fdc0c73a076d8e..9c4ef292160de75dc61ca5b6c6527d3f1d364e49 100644 (file)
--- a/src/mainboard/msi/ms6119/mainboard.c
+++ b/src/mainboard/msi/ms6119/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_msi_ms6119_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("MSI MS-6119 Mainboard")
 };

diff --git a/src/mainboard/msi/ms6147/chip.h b/src/mainboard/msi/ms6147/chip.h
index 15ee56d90a53c613c4cfe3c98d78225d27c6671b..fbf5d32e8c4ce63a1bdbf33cde0630d22f298c6f 100644 (file)
--- a/src/mainboard/msi/ms6147/chip.h
+++ b/src/mainboard/msi/ms6147/chip.h
@@ -18,5 +18,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_msi_ms6147_ops;
-struct mainboard_msi_ms6147_config {};
+extern struct chip_operations mainboard_ops;
+struct mainboard_config {};

diff --git a/src/mainboard/msi/ms6147/mainboard.c b/src/mainboard/msi/ms6147/mainboard.c
index 607a4619f860d2149da2d9f92199fc0a6f89dd70..b7c7386d3ee24cf620509b19316bedc16e59c18c 100644 (file)
--- a/src/mainboard/msi/ms6147/mainboard.c
+++ b/src/mainboard/msi/ms6147/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_msi_ms6147_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("MSI MS-6147 Mainboard")
 };

diff --git a/src/mainboard/msi/ms6178/chip.h b/src/mainboard/msi/ms6178/chip.h
index 92f8a53226af8727f41e80f86b34307d4d401cda..1e6116e8f8e6f43c378b80f3802fe87e75773972 100644 (file)
--- a/src/mainboard/msi/ms6178/chip.h
+++ b/src/mainboard/msi/ms6178/chip.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_msi_ms6178_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_msi_ms6178_config {
+struct mainboard_config {
 };

diff --git a/src/mainboard/msi/ms6178/mainboard.c b/src/mainboard/msi/ms6178/mainboard.c
index 0a5410386d9d996963fe060c25e4c29e361a8900..c3fdd81bbcf7222a484944c69b7791179a34073a 100644 (file)
--- a/src/mainboard/msi/ms6178/mainboard.c
+++ b/src/mainboard/msi/ms6178/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_msi_ms6178_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("MSI MS-6178 Mainboard")
 };

diff --git a/src/mainboard/msi/ms7135/chip.h b/src/mainboard/msi/ms7135/chip.h
index 024971bb46d914250b5f3724615e7677dd429aff..262341df75eb77e28480ff52c460955cb7684200 100644 (file)
--- a/src/mainboard/msi/ms7135/chip.h
+++ b/src/mainboard/msi/ms7135/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_msi_ms7135_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_ms7135_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/msi/ms7135/mainboard.c b/src/mainboard/msi/ms7135/mainboard.c
index 32784b021ed285ddf53929e7aa20ea33eddccbac..ac0bace4133905ab097fa6e9091c1aab0d83e6e3 100644 (file)
--- a/src/mainboard/msi/ms7135/mainboard.c
+++ b/src/mainboard/msi/ms7135/mainboard.c
@@ -22,7 +22,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_msi_ms7135_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("MSI MS7135 Mainboard")
 };
 #endif

diff --git a/src/mainboard/msi/ms7260/chip.h b/src/mainboard/msi/ms7260/chip.h
index e1eb800aafd78982d9fc35dab1828c955a948e4b..1e6116e8f8e6f43c378b80f3802fe87e75773972 100644 (file)
--- a/src/mainboard/msi/ms7260/chip.h
+++ b/src/mainboard/msi/ms7260/chip.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_msi_ms7260_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_msi_ms7260_config {
+struct mainboard_config {
 };

diff --git a/src/mainboard/msi/ms7260/mainboard.c b/src/mainboard/msi/ms7260/mainboard.c
index 11fabe81a8d041362562b5c85e7b54c3e98d89ef..a6c6e08d58829321ce15dfa0434abf72287cc108 100644 (file)
--- a/src/mainboard/msi/ms7260/mainboard.c
+++ b/src/mainboard/msi/ms7260/mainboard.c
@@ -22,7 +22,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_msi_ms7260_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("MSI K9N Neo (MS-7260) Mainboard")
 };
 #endif

diff --git a/src/mainboard/msi/ms9185/chip.h b/src/mainboard/msi/ms9185/chip.h
index 0cef9992da6fba812409dc992c41f8f444e61b00..12d593237e5f00724e552d687035ea8f756f5aa4 100644 (file)
--- a/src/mainboard/msi/ms9185/chip.h
+++ b/src/mainboard/msi/ms9185/chip.h
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_msi_ms9185_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_msi_ms9185_config {
+struct mainboard_config {
 //     int fixup_scsi;
 //     int fixup_vga;
 };

diff --git a/src/mainboard/msi/ms9185/mainboard.c b/src/mainboard/msi/ms9185/mainboard.c
index 8b995af32690c95cec2f2560c2d23358ea258674..e681d74604cec930e1c42780a5b28b93479e2f5b 100644 (file)
--- a/src/mainboard/msi/ms9185/mainboard.c
+++ b/src/mainboard/msi/ms9185/mainboard.c
@@ -27,7 +27,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_msi_ms9185_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("MSI MS-9185 Mainboard")
 };
 #endif

diff --git a/src/mainboard/msi/ms9282/chip.h b/src/mainboard/msi/ms9282/chip.h
index d5558d146cb60bbe73f5440df5dc7900b4baca52..d57f1df7d81d30459fcf31cd24912c0e94d74521 100644 (file)
--- a/src/mainboard/msi/ms9282/chip.h
+++ b/src/mainboard/msi/ms9282/chip.h
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_msi_ms9282_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_msi_ms9282_config {
+struct mainboard_config {
        int fixup_scsi;
        int fixup_vga;
 };

diff --git a/src/mainboard/msi/ms9282/mainboard.c b/src/mainboard/msi/ms9282/mainboard.c
index 62a39259b528314b6b85c4b52fe5dafb69e2cdba..91bbffd9ffe29201535b5f1f302c5af3734647a5 100644 (file)
--- a/src/mainboard/msi/ms9282/mainboard.c
+++ b/src/mainboard/msi/ms9282/mainboard.c
@@ -27,7 +27,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_msi_ms9282_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("MSI MS-9282 Mainboard")
 };
 #endif

diff --git a/src/mainboard/nec/powermate2000/chip.h b/src/mainboard/nec/powermate2000/chip.h
index aecb7ae34eadf7bae377f2ea5beec3f997a48080..613d9fd860132377b42eb5aa2b0e7971628b2612 100644 (file)
--- a/src/mainboard/nec/powermate2000/chip.h
+++ b/src/mainboard/nec/powermate2000/chip.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_nec_powermate2000_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_nec_powermate2000_config {
+struct mainboard_config {
 };

diff --git a/src/mainboard/nec/powermate2000/mainboard.c b/src/mainboard/nec/powermate2000/mainboard.c
index 7578bfaaa12a745f7fa50d3154b8fc2ec4d7a16d..a24b54835792d916f752d91f48cd788339a704a5 100644 (file)
--- a/src/mainboard/nec/powermate2000/mainboard.c
+++ b/src/mainboard/nec/powermate2000/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_nec_powermate2000_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("NEC PowerMate 2000 Mainboard")
 };

diff --git a/src/mainboard/newisys/khepri/chip.h b/src/mainboard/newisys/khepri/chip.h
index f4889d6a652dabf7a62411ebaa183afed7d2e659..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- a/src/mainboard/newisys/khepri/chip.h
+++ b/src/mainboard/newisys/khepri/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_newisys_khepri_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_newisys_khepri_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/newisys/khepri/mainboard.c b/src/mainboard/newisys/khepri/mainboard.c
index d5dfcbc05e9ddc2b7548d1f4278a29f04d780176..d278fd2501169a0b065e655b3b6fc341ac8c487a 100644 (file)
--- a/src/mainboard/newisys/khepri/mainboard.c
+++ b/src/mainboard/newisys/khepri/mainboard.c
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_newisys_khepri_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Newisys 2100 Mainboard")
 };
 

diff --git a/src/mainboard/nvidia/l1_2pvv/chip.h b/src/mainboard/nvidia/l1_2pvv/chip.h
index 51b539193b2adda3a991396015de2b3b969ed366..556dc7ea1d16cefb3ff6eac7f82b94a2dbffeff3 100644 (file)
--- a/src/mainboard/nvidia/l1_2pvv/chip.h
+++ b/src/mainboard/nvidia/l1_2pvv/chip.h
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_nvidia_l1_2pvv_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_nvidia_l1_2pvv_config {
+struct mainboard_config {
 //     int fixup_scsi;
 //     int fixup_vga;
 };

diff --git a/src/mainboard/nvidia/l1_2pvv/mainboard.c b/src/mainboard/nvidia/l1_2pvv/mainboard.c
index 322a9af155b7f5769c8fa502f66d39f5a19eaa06..5fa84b0daf4d09308fa129b9456b7845ef826be5 100644 (file)
--- a/src/mainboard/nvidia/l1_2pvv/mainboard.c
+++ b/src/mainboard/nvidia/l1_2pvv/mainboard.c
@@ -27,7 +27,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_nvidia_l1_2pvv_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("NVIDIA l1_2pvv Mainboard")
 };
 #endif

diff --git a/src/mainboard/olpc/btest/chip.h b/src/mainboard/olpc/btest/chip.h
index 615ed8d2ace733b899c9e0de8d5e5e8a6c8ad2ec..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- a/src/mainboard/olpc/btest/chip.h
+++ b/src/mainboard/olpc/btest/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_olpc_btest_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_olpc_btest_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/olpc/btest/mainboard.c b/src/mainboard/olpc/btest/mainboard.c
index acedff8d6e524e7198fc26653d8bb63d50116848..40e363f49a7864150547a772305d965634f055c5 100644 (file)
--- a/src/mainboard/olpc/btest/mainboard.c
+++ b/src/mainboard/olpc/btest/mainboard.c
@@ -131,7 +131,7 @@ static void enable_dev(struct device *dev)
         dev->ops->init = init;
 }
 
-struct chip_operations mainboard_olpc_btest_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("OLPC btest Mainboard")
         .enable_dev = enable_dev,
 };

diff --git a/src/mainboard/olpc/rev_a/chip.h b/src/mainboard/olpc/rev_a/chip.h
index 34c0959a4879dc000bee557cf321f84ee346f0ab..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- a/src/mainboard/olpc/rev_a/chip.h
+++ b/src/mainboard/olpc/rev_a/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_olpc_rev_a_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_olpc_rev_a_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/olpc/rev_a/mainboard.c b/src/mainboard/olpc/rev_a/mainboard.c
index a89abb505a558294e48dc853dd38379afeb5fdee..604f34ccfde90a78e9f9b2fa23c23494f5b6bd54 100644 (file)
--- a/src/mainboard/olpc/rev_a/mainboard.c
+++ b/src/mainboard/olpc/rev_a/mainboard.c
@@ -102,7 +102,7 @@ static void enable_dev(struct device *dev)
         dev->ops->init = init;
 }
 
-struct chip_operations mainboard_olpc_rev_a_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("OLPC rev_a Mainboard")
         .enable_dev = enable_dev,
 };

diff --git a/src/mainboard/pcengines/alix1c/chip.h b/src/mainboard/pcengines/alix1c/chip.h
index 18f7eaf94aabfb6f4865582509e69f77040ceb81..4dba37680a6e4bc61d70d84c91f2407e26cc5b3b 100644 (file)
--- a/src/mainboard/pcengines/alix1c/chip.h
+++ b/src/mainboard/pcengines/alix1c/chip.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_pcengines_alix1c_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_pcengines_alix1c_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/pcengines/alix1c/mainboard.c b/src/mainboard/pcengines/alix1c/mainboard.c
index 620951a19bb548221abb476460f7436587139237..ab7043423432743ca961cd8510760f3d324e5322 100644 (file)
--- a/src/mainboard/pcengines/alix1c/mainboard.c
+++ b/src/mainboard/pcengines/alix1c/mainboard.c
@@ -32,7 +32,7 @@ static void enable_dev(struct device *dev)
        dev->ops->init = init;
 }
 
-struct chip_operations mainboard_pcengines_alix1c_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("PC Engines ALIX1.C Mainboard")
        .enable_dev = enable_dev,
 };

diff --git a/src/mainboard/rca/rm4100/chip.h b/src/mainboard/rca/rm4100/chip.h
index c53f56e0ef8fa87b077f858599eba3e7a3334d08..c50199eee441187cdb180bd29914b8213e4cdd9a 100644 (file)
--- a/src/mainboard/rca/rm4100/chip.h
+++ b/src/mainboard/rca/rm4100/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_rca_rm4100_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_rca_rm4100_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/rca/rm4100/mainboard.c b/src/mainboard/rca/rm4100/mainboard.c
index 0c7863d0cf9cca063d1c7af1afa037da5dba71e0..e84b95bc1203ce2812661d7a9c6c6132e6657ec2 100644 (file)
--- a/src/mainboard/rca/rm4100/mainboard.c
+++ b/src/mainboard/rca/rm4100/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_rca_rm4100_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("RCA RM4100 Mainboard")
 };

diff --git a/src/mainboard/sunw/ultra40/chip.h b/src/mainboard/sunw/ultra40/chip.h
index bd7b8634bc42cb4d09967b7c6ac07213529392d7..71df35413f18abc7964c2471461eba959f9fb3f8 100644 (file)
--- a/src/mainboard/sunw/ultra40/chip.h
+++ b/src/mainboard/sunw/ultra40/chip.h
@@ -1,6 +1,6 @@
-extern struct chip_operations mainboard_sunw_ultra40_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_sunw_ultra40_config {
+struct mainboard_config {
 //     int fixup_scsi;
 //     int fixup_vga;
 };

diff --git a/src/mainboard/sunw/ultra40/mainboard.c b/src/mainboard/sunw/ultra40/mainboard.c
index 6660badb0ec3d709d438f27ee0cf39e37d2bb60d..2d4b77ae3f72c001267d087b2ae9b9724cba41e6 100644 (file)
--- a/src/mainboard/sunw/ultra40/mainboard.c
+++ b/src/mainboard/sunw/ultra40/mainboard.c
@@ -2,7 +2,7 @@
 #include "chip.h"
 
 #if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_sunw_ultra40_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Sun Ultra 40 Mainboard")
 };
 #endif

diff --git a/src/mainboard/supermicro/h8dmr/chip.h b/src/mainboard/supermicro/h8dmr/chip.h
index d32ce0417ce9236f3dbd888375a0269ce018da10..d37942f49a187bc6016d1c76d6a512f6b61edec0 100644 (file)
--- 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 cf2f780c719c3bc732ac31cfda2e532b128bb975..0f742055f5fd37f536318e34ae0b01b4c11395fd 100644 (file)
--- 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 02f15189d65a18b45a9ee62ef727c89a54a9e61b..b6e23b26882e2aeb976b0f94d994a5ff602cdd18 100644 (file)
--- 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 f8ba112b0230f3a4f8ad55838d3dd1499b0d19f3..b6e23b26882e2aeb976b0f94d994a5ff602cdd18 100644 (file)
--- 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 ff86e23bfca06cf5675b5c3b3eeb3d70797a88da..b6e23b26882e2aeb976b0f94d994a5ff602cdd18 100644 (file)
--- 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 495788e43c0c28ce6a834ddd6fcdeb4307e50adb..b6e23b26882e2aeb976b0f94d994a5ff602cdd18 100644 (file)
--- 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 59051de317d0b98efb719ce25445e94076e19395..51acb86d89962d19fb064cfd9851cebe8d9cb218 100644 (file)
--- 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 016f20a3fdb1f8e6803edd6b2bb837e4fdbf6425..b6e23b26882e2aeb976b0f94d994a5ff602cdd18 100644 (file)
--- 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 b1cda733f403b08658344ba0f6f5659414bf0d33..6b6c64ff1226f3c2fc00d0be79f551997e114aa5 100644 (file)
--- 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")
 };
 

diff --git a/src/mainboard/technologic/ts5300/chip.h b/src/mainboard/technologic/ts5300/chip.h
index d81199ea7e7bb9848f80c6446de20d171c177103..97f92dd9155b0c54b6b0b533972c7c43a27c7532 100644 (file)
--- a/src/mainboard/technologic/ts5300/chip.h
+++ b/src/mainboard/technologic/ts5300/chip.h
@@ -1,5 +1,5 @@
-extern struct chip_operations mainboard_technologic_ts5300_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_technologic_ts5300_config {
+struct mainboard_config {
        
 };

diff --git a/src/mainboard/technologic/ts5300/mainboard.c b/src/mainboard/technologic/ts5300/mainboard.c
index d6d9723b66d1bc6918a806542597d6e8797760d7..3ce22f0e9ed65fbdf7a5697324a896f92738c75a 100644 (file)
--- a/src/mainboard/technologic/ts5300/mainboard.c
+++ b/src/mainboard/technologic/ts5300/mainboard.c
@@ -148,7 +148,7 @@ static void enable_dev(struct device *dev) {
        
 }
 
-struct chip_operations mainboard_technologic_ts5300_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("Technologic Systems TS-5300 Mainboard")
        .enable_dev = enable_dev
 };

diff --git a/src/mainboard/televideo/tc7020/chip.h b/src/mainboard/televideo/tc7020/chip.h
index 20b1d6ecabf1c6b12c62d6134b66de65b0c166d1..a1486f671482670bc17ff7fbd739c311578f6814 100644 (file)
--- a/src/mainboard/televideo/tc7020/chip.h
+++ b/src/mainboard/televideo/tc7020/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_televideo_tc7020_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_televideo_tc7020_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/televideo/tc7020/mainboard.c b/src/mainboard/televideo/tc7020/mainboard.c
index a580bb08d3287d4182edb77011f607780d033756..a0919dc802c9677175691241e65efc9d2dd90d85 100644 (file)
--- a/src/mainboard/televideo/tc7020/mainboard.c
+++ b/src/mainboard/televideo/tc7020/mainboard.c
@@ -21,7 +21,7 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_televideo_tc7020_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("TeleVideo TC7020 Mainboard")
 };
 

diff --git a/src/mainboard/thomson/ip1000/chip.h b/src/mainboard/thomson/ip1000/chip.h
index f01bfb6d474d321ab465e87c9f391ed60fe1db27..c46c318c2986e0f1913fb3dd0567b083412477ad 100644 (file)
--- a/src/mainboard/thomson/ip1000/chip.h
+++ b/src/mainboard/thomson/ip1000/chip.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern struct chip_operations mainboard_thomson_ip1000_ops;
+extern struct chip_operations mainboard_ops;
 
-struct mainboard_thomson_ip1000_config {
+struct mainboard_config {
        int nothing;
 };

diff --git a/src/mainboard/thomson/ip1000/mainboard.c b/src/mainboard/thomson/ip1000/mainboard.c
index 2a164e846185ba2c77481185e232f85de696c444..c6b4cdf738bc3fff0dfb077acc32818aca341996 100644 (file)
--- a/src/mainboard/thomson/ip1000/mainboard.c
+++ b/src/mainboard/thomson/ip1000/mainboard.c
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"
 
-struct chip_operations mainboard_thomson_ip1000_ops = {
+struct chip_operations mainboard_ops = {
        CHIP_NAME("THOMSON IP1000 Mainboard")
 };

diff --git a/src/mainboard/tyan/s1846/chip.h b/src/mainboard/tyan/s1846/chip.h
index fa911cb8d9ee26f2e4d0da01a2ccaeb9096e84ec..dc9bed35a5c9ea4c5151f767d8b98904a9c2b2aa 100644 (file)
--- 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 7a2ed179fc5433de8c4b7c0204f0b0f04f17dfd9..e5ab1c908ba244198da705868d4ff2354fede223 100644 (file)
--- 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 d63c156af59b8e7a90877746cefd9540aa4e4802..49842a07d3840a0808d1dfdb225393d9a3cb32cf 100644 (file)
--- 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 a460b77683a1e8a6d40cc029016db4157ade63d8..e27a6a01cf6c4bee9973fcd2a69ffdd0c00f5605 100644 (file)
--- 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 d14f97e98c252aba1100abddd7ad934c17152b25..49842a07d3840a0808d1dfdb225393d9a3cb32cf 100644 (file)
--- 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 c769cb52a1f2d483d2493d1b1f7d42ad115356a6..735e8d3ac5e8205ed8dd9300153c9aad97992fad 100644 (file)
--- 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 8d80c36e6b5283650eb2b86fe0539a8e5ed6224f..49842a07d3840a0808d1dfdb225393d9a3cb32cf 100644 (file)
--- 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 1f4a38bcb86284491746ca0e9692d9cc1304708d..8e2a96023260fd6bedace11a6032cf9c4c3bdd22 100644 (file)
--- 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 82fbd5648e8e5b1d20151ba6209a4c0ae7e8b9b9..49842a07d3840a0808d1dfdb225393d9a3cb32cf 100644 (file)
--- 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 20721c19ef044364b3a6f5202d9991675094c0fe..9d6ad077de9b09e3704f2def4ff8caa8db9f1e2f 100644 (file)
--- 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 bb88108bbc198ce6fd5eff2517154d082ba057b7..49842a07d3840a0808d1dfdb225393d9a3cb32cf 100644 (file)
--- 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 90c02650ec80302d8d5eaac9f68c0a7bae910a7a..a0ad48b6fe5c554a564d807aff4e63074c77ae73 100644 (file)
--- 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 308683f99288994764af7b54ae051fa07842d41e..49842a07d3840a0808d1dfdb225393d9a3cb32cf 100644 (file)
--- 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 89e81956ec7adc6232b2b5d2fcf5f1b8a5631c2f..5cc3b971c6fe2088cdac15cd732e13bb6eb68f91 100644 (file)
--- 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 dadfb0f4ee2dda65979a506d5ea3e21cc847bb72..71df35413f18abc7964c2471461eba959f9fb3f8 100644 (file)
--- 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 6b1beadaf2c29737a8c070a673d678645edee1d9..fbdcc4cd38a61505c12e0256fe2623c0f9e72c02 100644 (file)
--- 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 71a5bb9e8d8a8996b34c94289ebf6872563dc366..49842a07d3840a0808d1dfdb225393d9a3cb32cf 100644 (file)
--- 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 a396404b08c1a55db5c11d4eb1b7975e19c1774d..d1c7be1b5ec4abb4751faadfbd77a821ca4fcd68 100644 (file)
--- 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 28fb8a02e1b5eabc030848ee6e3388bc16e435d8..49842a07d3840a0808d1dfdb225393d9a3cb32cf 100644 (file)
--- 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 2aad2b3b42126a13f29722c1b8dc1a393db9d525..a1f3e0434021c10feb85ef340210232484822b10 100644 (file)
--- 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 350f4a63692cca8c447698b36ca3ffe60d711cef..71df35413f18abc7964c2471461eba959f9fb3f8 100644 (file)
--- 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 03514f11c676a640d5dcb9ac717cb9525042c594..f615b1fd0ae810c36615f2703e75b121e7c623db 100644 (file)
--- 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 a34af2c1ca131ea279382b2b894fcbd43c8c2618..556dc7ea1d16cefb3ff6eac7f82b94a2dbffeff3 100644 (file)
--- 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 71445803c3e5f05f40881d66a8e267eaf05355e8..67aed12d357ebd9526c08228d3b412e86131c7d2 100644 (file)
--- 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 f34d17cac0440549d48467ab41beeca8eb1231b1..556dc7ea1d16cefb3ff6eac7f82b94a2dbffeff3 100644 (file)
--- 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 4ceb052e85f062dda10ce82df3f3bec1b4f998e8..f4a07c3708415e51eeb528a015d58fe97fc9b5ff 100644 (file)
--- 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 65d6d96c1e207c13718312f42d588a535689f014..b0db1749dc3566531e4d8169477f4db3fd91e283 100644 (file)
--- 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 c48c7e3e74dcf899929cbd93428f2baee27bd214..0174cd65ecc87650b749a770c6ee3314d3e30acf 100644 (file)
--- 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 b4f8467cc7581b5245c699e87834804e01b0e4e7..b0db1749dc3566531e4d8169477f4db3fd91e283 100644 (file)
--- 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 1d1d306e8545459a0944091909917d5bb930251e..267d3d24dd15894358a716c3c691094c82ce9a10 100644 (file)
--- 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

diff --git a/src/mainboard/via/epia-cn/chip.h b/src/mainboard/via/epia-cn/chip.h
index ff91a02b989ef44603ef693019be9ac2aaabbb06..59ab64395f6fda3d2255188b9b9b0ef30d870218 100644 (file)
--- 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 e1eac58a6226aa920fea37392c8ef832eed88c54..1a7210eefabf645dbc5faed32c23b624ea549de9 100644 (file)
--- 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 2710e7b03530991a7e343f51c2547c93ef35bbcb..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- 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 8f2ee10f021d2ed5b836e52bce971ad25845a474..64b7c6d2328409f5fc28ccc21e3a874c5c8bf868 100644 (file)
--- 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 9e019bd80724add400528c3c45e8236257cd3a9f..e168812d0ea6ace8f58b3efe41283d5d29029fd5 100644 (file)
--- 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 4242dfa92fd20c62fc26f8567a1853847424fd6f..25d72a51d9abdd79bcf8b63aa5c0db6d2254be0a 100644 (file)
--- 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 abb1f6c9ba015c5c0244a2d8e2c3c56236a4b4b1..613d9fd860132377b42eb5aa2b0e7971628b2612 100644 (file)
--- 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 b7865dae4321805f09b4aba829e5d2a045fc821b..9fcee5588e95dbc925f8fa6e292ebc5108c7c70d 100644 (file)
--- 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")
 };

diff --git a/util/newconfig/config.g b/util/newconfig/config.g
index 294d4072161b31e064ca9b0c4b1113953a1cdf94..0e741836e72ecd7be8404ef6ab85a6fcd31f23cd 100644 (file)
--- a/util/newconfig/config.g
+++ b/util/newconfig/config.g
@@ -1353,7 +1353,7 @@ def mainboard():
        fulldir = os.path.join(srcdir, partdir)
        type_name = flatten_name(partdir)
        newpart = partobj(curimage, fulldir, partstack.tos(), 'mainboard', \
-               type_name, 0, 'chip')
+               'mainboard', 0, 'chip')
        #print "Configuring PART %s" % (type)
        partstack.push(newpart)
        #print "  new PART tos is now %s\n" %partstack.tos().info()