From 7ad11e8d33bf0f377ea882848e7e9e6cdd0243bb Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Wed, 18 Feb 2009 20:41:57 +0000 Subject: [PATCH] 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 Signed-off-by: Ronald G. Minnich Acked-by: Myles Watson git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3954 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/a-trend/atc-6220/chip.h | 4 ++-- src/mainboard/a-trend/atc-6220/mainboard.c | 2 +- src/mainboard/a-trend/atc-6240/chip.h | 4 ++-- src/mainboard/a-trend/atc-6240/mainboard.c | 2 +- src/mainboard/abit/be6-ii_v2_0/chip.h | 4 ++-- src/mainboard/abit/be6-ii_v2_0/mainboard.c | 2 +- src/mainboard/advantech/pcm-5820/chip.h | 4 ++-- src/mainboard/advantech/pcm-5820/mainboard.c | 2 +- src/mainboard/amd/db800/chip.h | 4 ++-- src/mainboard/amd/db800/mainboard.c | 2 +- src/mainboard/amd/dbm690t/chip.h | 4 ++-- src/mainboard/amd/dbm690t/mainboard.c | 6 +++--- src/mainboard/amd/norwich/chip.h | 4 ++-- src/mainboard/amd/norwich/mainboard.c | 2 +- src/mainboard/amd/pistachio/chip.h | 4 ++-- src/mainboard/amd/pistachio/mainboard.c | 6 +++--- src/mainboard/amd/rumba/chip.h | 4 ++-- src/mainboard/amd/rumba/mainboard.c | 4 ++-- src/mainboard/amd/serengeti_cheetah/chip.h | 4 ++-- src/mainboard/amd/serengeti_cheetah/mainboard.c | 2 +- src/mainboard/amd/serengeti_cheetah_fam10/chip.h | 4 ++-- src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c | 2 +- src/mainboard/arima/hdama/chip.h | 4 ++-- src/mainboard/arima/hdama/mainboard.c | 2 +- src/mainboard/artecgroup/dbe61/chip.h | 4 ++-- src/mainboard/artecgroup/dbe61/mainboard.c | 2 +- src/mainboard/asi/mb_5blgp/chip.h | 4 ++-- src/mainboard/asi/mb_5blgp/mainboard.c | 2 +- src/mainboard/asi/mb_5blmp/chip.h | 4 ++-- src/mainboard/asi/mb_5blmp/mainboard.c | 2 +- src/mainboard/asus/a8n_e/chip.h | 4 ++-- src/mainboard/asus/a8n_e/mainboard.c | 2 +- src/mainboard/asus/a8v-e_se/chip.h | 4 ++-- src/mainboard/asus/a8v-e_se/mainboard.c | 2 +- src/mainboard/asus/m2v-mx_se/chip.h | 4 ++-- src/mainboard/asus/m2v-mx_se/mainboard.c | 2 +- src/mainboard/asus/mew-am/chip.h | 4 ++-- src/mainboard/asus/mew-am/mainboard.c | 2 +- src/mainboard/asus/mew-vm/chip.h | 4 ++-- src/mainboard/asus/mew-vm/mainboard.c | 2 +- src/mainboard/asus/p2b-ds/chip.h | 4 ++-- src/mainboard/asus/p2b-ds/mainboard.c | 2 +- src/mainboard/asus/p2b-f/chip.h | 4 ++-- src/mainboard/asus/p2b-f/mainboard.c | 2 +- src/mainboard/asus/p2b/chip.h | 4 ++-- src/mainboard/asus/p2b/mainboard.c | 2 +- src/mainboard/asus/p3b-f/chip.h | 4 ++-- src/mainboard/asus/p3b-f/mainboard.c | 2 +- src/mainboard/axus/tc320/chip.h | 4 ++-- src/mainboard/axus/tc320/mainboard.c | 2 +- src/mainboard/azza/pt-6ibd/chip.h | 4 ++-- src/mainboard/azza/pt-6ibd/mainboard.c | 2 +- src/mainboard/bcom/winnet100/chip.h | 4 ++-- src/mainboard/bcom/winnet100/mainboard.c | 2 +- src/mainboard/bcom/winnetp680/chip.h | 4 ++-- src/mainboard/bcom/winnetp680/mainboard.c | 2 +- src/mainboard/biostar/m6tba/chip.h | 4 ++-- src/mainboard/biostar/m6tba/mainboard.c | 2 +- src/mainboard/broadcom/blast/chip.h | 4 ++-- src/mainboard/broadcom/blast/mainboard.c | 2 +- src/mainboard/compaq/deskpro_en_sff_p600/chip.h | 4 ++-- src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c | 2 +- src/mainboard/dell/s1850/chip.h | 4 ++-- src/mainboard/dell/s1850/mainboard.c | 2 +- src/mainboard/digitallogic/adl855pc/chip.h | 4 ++-- src/mainboard/digitallogic/adl855pc/mainboard.c | 2 +- src/mainboard/digitallogic/msm586seg/chip.h | 4 ++-- src/mainboard/digitallogic/msm586seg/mainboard.c | 2 +- src/mainboard/digitallogic/msm800sev/chip.h | 4 ++-- src/mainboard/digitallogic/msm800sev/mainboard.c | 2 +- src/mainboard/eaglelion/5bcm/chip.h | 4 ++-- src/mainboard/eaglelion/5bcm/mainboard.c | 2 +- src/mainboard/emulation/qemu-x86/chip.h | 4 ++-- src/mainboard/emulation/qemu-x86/mainboard.c | 2 +- src/mainboard/gigabyte/ga-6bxc/chip.h | 4 ++-- src/mainboard/gigabyte/ga-6bxc/mainboard.c | 2 +- src/mainboard/gigabyte/ga_2761gxdk/chip.h | 4 ++-- src/mainboard/gigabyte/ga_2761gxdk/mainboard.c | 2 +- src/mainboard/gigabyte/m57sli/chip.h | 4 ++-- src/mainboard/gigabyte/m57sli/mainboard.c | 2 +- src/mainboard/ibm/e325/chip.h | 4 ++-- src/mainboard/ibm/e325/mainboard.c | 2 +- src/mainboard/ibm/e326/chip.h | 4 ++-- src/mainboard/ibm/e326/mainboard.c | 2 +- src/mainboard/iei/juki-511p/chip.h | 4 ++-- src/mainboard/iei/juki-511p/mainboard.c | 2 +- src/mainboard/iei/nova4899r/chip.h | 4 ++-- src/mainboard/iei/nova4899r/mainboard.c | 2 +- src/mainboard/iei/pcisa-lx-800-r10/chip.h | 4 ++-- src/mainboard/iei/pcisa-lx-800-r10/mainboard.c | 2 +- src/mainboard/intel/jarrell/chip.h | 4 ++-- src/mainboard/intel/jarrell/mainboard.c | 2 +- src/mainboard/intel/mtarvon/chip.h | 4 ++-- src/mainboard/intel/mtarvon/mainboard.c | 2 +- src/mainboard/intel/truxton/chip.h | 4 ++-- src/mainboard/intel/truxton/mainboard.c | 2 +- src/mainboard/intel/xe7501devkit/chip.h | 4 ++-- src/mainboard/intel/xe7501devkit/mainboard.c | 2 +- src/mainboard/iwill/dk8_htx/chip.h | 4 ++-- src/mainboard/iwill/dk8_htx/mainboard.c | 2 +- src/mainboard/iwill/dk8s2/chip.h | 4 ++-- src/mainboard/iwill/dk8s2/mainboard.c | 2 +- src/mainboard/iwill/dk8x/chip.h | 4 ++-- src/mainboard/iwill/dk8x/mainboard.c | 2 +- src/mainboard/jetway/j7f24/chip.h | 4 ++-- src/mainboard/jetway/j7f24/mainboard.c | 2 +- src/mainboard/kontron/986lcd-m/chip.h | 4 ++-- src/mainboard/kontron/986lcd-m/mainboard.c | 2 +- src/mainboard/lippert/frontrunner/chip.h | 4 ++-- src/mainboard/lippert/frontrunner/mainboard.c | 2 +- src/mainboard/lippert/roadrunner-lx/chip.h | 4 ++-- src/mainboard/lippert/roadrunner-lx/mainboard.c | 4 ++-- src/mainboard/lippert/spacerunner-lx/chip.h | 4 ++-- src/mainboard/lippert/spacerunner-lx/mainboard.c | 4 ++-- src/mainboard/msi/ms6119/chip.h | 4 ++-- src/mainboard/msi/ms6119/mainboard.c | 2 +- src/mainboard/msi/ms6147/chip.h | 4 ++-- src/mainboard/msi/ms6147/mainboard.c | 2 +- src/mainboard/msi/ms6178/chip.h | 4 ++-- src/mainboard/msi/ms6178/mainboard.c | 2 +- src/mainboard/msi/ms7135/chip.h | 4 ++-- src/mainboard/msi/ms7135/mainboard.c | 2 +- src/mainboard/msi/ms7260/chip.h | 4 ++-- src/mainboard/msi/ms7260/mainboard.c | 2 +- src/mainboard/msi/ms9185/chip.h | 4 ++-- src/mainboard/msi/ms9185/mainboard.c | 2 +- src/mainboard/msi/ms9282/chip.h | 4 ++-- src/mainboard/msi/ms9282/mainboard.c | 2 +- src/mainboard/nec/powermate2000/chip.h | 4 ++-- src/mainboard/nec/powermate2000/mainboard.c | 2 +- src/mainboard/newisys/khepri/chip.h | 4 ++-- src/mainboard/newisys/khepri/mainboard.c | 2 +- src/mainboard/nvidia/l1_2pvv/chip.h | 4 ++-- src/mainboard/nvidia/l1_2pvv/mainboard.c | 2 +- src/mainboard/olpc/btest/chip.h | 4 ++-- src/mainboard/olpc/btest/mainboard.c | 2 +- src/mainboard/olpc/rev_a/chip.h | 4 ++-- src/mainboard/olpc/rev_a/mainboard.c | 2 +- src/mainboard/pcengines/alix1c/chip.h | 4 ++-- src/mainboard/pcengines/alix1c/mainboard.c | 2 +- src/mainboard/rca/rm4100/chip.h | 4 ++-- src/mainboard/rca/rm4100/mainboard.c | 2 +- src/mainboard/sunw/ultra40/chip.h | 4 ++-- src/mainboard/sunw/ultra40/mainboard.c | 2 +- src/mainboard/supermicro/h8dmr/chip.h | 4 ++-- src/mainboard/supermicro/h8dmr/mainboard.c | 2 +- src/mainboard/supermicro/x6dai_g/chip.h | 4 ++-- src/mainboard/supermicro/x6dhe_g/chip.h | 4 ++-- src/mainboard/supermicro/x6dhe_g2/chip.h | 4 ++-- src/mainboard/supermicro/x6dhr_ig/chip.h | 4 ++-- src/mainboard/supermicro/x6dhr_ig/mainboard.c | 2 +- src/mainboard/supermicro/x6dhr_ig2/chip.h | 4 ++-- src/mainboard/supermicro/x6dhr_ig2/mainboard.c | 2 +- src/mainboard/technologic/ts5300/chip.h | 4 ++-- src/mainboard/technologic/ts5300/mainboard.c | 2 +- src/mainboard/televideo/tc7020/chip.h | 4 ++-- src/mainboard/televideo/tc7020/mainboard.c | 2 +- src/mainboard/thomson/ip1000/chip.h | 4 ++-- src/mainboard/thomson/ip1000/mainboard.c | 2 +- src/mainboard/tyan/s1846/chip.h | 4 ++-- src/mainboard/tyan/s1846/mainboard.c | 2 +- src/mainboard/tyan/s2735/chip.h | 4 ++-- src/mainboard/tyan/s2735/mainboard.c | 2 +- src/mainboard/tyan/s2850/chip.h | 4 ++-- src/mainboard/tyan/s2850/mainboard.c | 2 +- src/mainboard/tyan/s2875/chip.h | 4 ++-- src/mainboard/tyan/s2875/mainboard.c | 2 +- src/mainboard/tyan/s2880/chip.h | 4 ++-- src/mainboard/tyan/s2880/mainboard.c | 2 +- src/mainboard/tyan/s2881/chip.h | 4 ++-- src/mainboard/tyan/s2881/mainboard.c | 2 +- src/mainboard/tyan/s2882/chip.h | 4 ++-- src/mainboard/tyan/s2882/mainboard.c | 2 +- src/mainboard/tyan/s2885/chip.h | 4 ++-- src/mainboard/tyan/s2885/mainboard.c | 2 +- src/mainboard/tyan/s2891/chip.h | 4 ++-- src/mainboard/tyan/s2891/mainboard.c | 2 +- src/mainboard/tyan/s2892/chip.h | 4 ++-- src/mainboard/tyan/s2892/mainboard.c | 2 +- src/mainboard/tyan/s2895/chip.h | 4 ++-- src/mainboard/tyan/s2895/mainboard.c | 2 +- src/mainboard/tyan/s2912/chip.h | 4 ++-- src/mainboard/tyan/s2912/mainboard.c | 2 +- src/mainboard/tyan/s2912_fam10/chip.h | 4 ++-- src/mainboard/tyan/s2912_fam10/mainboard.c | 2 +- src/mainboard/tyan/s4880/chip.h | 4 ++-- src/mainboard/tyan/s4880/mainboard.c | 2 +- src/mainboard/tyan/s4882/chip.h | 4 ++-- src/mainboard/tyan/s4882/mainboard.c | 2 +- src/mainboard/via/epia-cn/chip.h | 4 ++-- src/mainboard/via/epia-cn/mainboard.c | 2 +- src/mainboard/via/epia-m/chip.h | 4 ++-- src/mainboard/via/epia-m/mainboard.c | 2 +- src/mainboard/via/epia/chip.h | 4 ++-- src/mainboard/via/epia/mainboard.c | 2 +- src/mainboard/via/pc2500e/chip.h | 4 ++-- src/mainboard/via/pc2500e/mainboard.c | 2 +- util/newconfig/config.g | 2 +- 198 files changed, 305 insertions(+), 305 deletions(-) diff --git a/src/mainboard/a-trend/atc-6220/chip.h b/src/mainboard/a-trend/atc-6220/chip.h index 6380ef214..dc9bed35a 100644 --- 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 56c0b39bb..f30ebfa87 100644 --- a/src/mainboard/a-trend/atc-6220/mainboard.c +++ b/src/mainboard/a-trend/atc-6220/mainboard.c @@ -21,6 +21,6 @@ #include #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 1e15adb6f..56e17ca59 100644 --- 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 15f050a6a..0e09ea33b 100644 --- a/src/mainboard/a-trend/atc-6240/mainboard.c +++ b/src/mainboard/a-trend/atc-6240/mainboard.c @@ -21,6 +21,6 @@ #include #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 671cb7ad1..dc9bed35a 100644 --- 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 264161756..6fc23eca5 100644 --- 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 #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 86902f4f8..dc9bed35a 100644 --- 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 a8a03cb48..42560599c 100644 --- a/src/mainboard/advantech/pcm-5820/mainboard.c +++ b/src/mainboard/advantech/pcm-5820/mainboard.c @@ -21,6 +21,6 @@ #include #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 5a77026f3..fb8c6abe4 100644 --- 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 fab6d81f8..624c5ad19 100644 --- 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 786bc9f4e..bda7abcf2 100644 --- 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 d5c7f375c..ce206b951 100644 --- 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 8811f4106..fb8c6abe4 100644 --- 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 89537fda4..e86720672 100644 --- 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 6cb1b9417..893ff2e88 100644 --- 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 b72273f4e..960c74954 100644 --- 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 40efbfa69..2094b2392 100644 --- 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 84c9708b3..843f71b07 100644 --- 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 258d16de4..71df35413 100644 --- 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 73d962513..c9ba09502 100644 --- 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 e4034c661..bac526648 100644 --- 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 afc89bae3..de6e139b9 100644 --- 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 c3792f41e..e168812d0 100644 --- 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 d676f975a..688a01cd8 100644 --- a/src/mainboard/arima/hdama/mainboard.c +++ b/src/mainboard/arima/hdama/mainboard.c @@ -1,7 +1,7 @@ #include #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 f899056d4..e168812d0 100644 --- 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 37ad988cd..49c27b3b6 100644 --- 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 1fd07c0d0..56e17ca59 100644 --- 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 a31d33248..22bc52dae 100644 --- a/src/mainboard/asi/mb_5blgp/mainboard.c +++ b/src/mainboard/asi/mb_5blgp/mainboard.c @@ -21,6 +21,6 @@ #include #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 bfe305c47..4bb66e962 100644 --- 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 53151c2ae..78366ba20 100644 --- a/src/mainboard/asi/mb_5blmp/mainboard.c +++ b/src/mainboard/asi/mb_5blmp/mainboard.c @@ -21,7 +21,7 @@ #include #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 61a1b434e..609d2c240 100644 --- a/src/mainboard/asus/a8n_e/chip.h +++ b/src/mainboard/asus/a8n_e/chip.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct chip_operations mainboard_asus_a8n_e_ops; +extern struct chip_operations mainboard_ops; -struct mainboard_asus_a8n_e_config { +struct mainboard_config { int nothing; }; diff --git a/src/mainboard/asus/a8n_e/mainboard.c b/src/mainboard/asus/a8n_e/mainboard.c index f75e7aeac..446832550 100644 --- a/src/mainboard/asus/a8n_e/mainboard.c +++ b/src/mainboard/asus/a8n_e/mainboard.c @@ -23,7 +23,7 @@ #include "chip.h" #if CONFIG_CHIP_NAME == 1 -struct chip_operations mainboard_asus_a8n_e_ops = { +struct chip_operations mainboard_ops = { CHIP_NAME("ASUS A8N-E Mainboard") }; #endif diff --git a/src/mainboard/asus/a8v-e_se/chip.h b/src/mainboard/asus/a8v-e_se/chip.h index 101113437..8a2857875 100644 --- a/src/mainboard/asus/a8v-e_se/chip.h +++ b/src/mainboard/asus/a8v-e_se/chip.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct chip_operations mainboard_asus_a8v_e_se_ops; +extern struct chip_operations mainboard_ops; -struct mainboard_asus_a8v_e_se_config { +struct mainboard_config { }; diff --git a/src/mainboard/asus/a8v-e_se/mainboard.c b/src/mainboard/asus/a8v-e_se/mainboard.c index c06fbffd6..2a3fd3b1c 100644 --- a/src/mainboard/asus/a8v-e_se/mainboard.c +++ b/src/mainboard/asus/a8v-e_se/mainboard.c @@ -24,7 +24,7 @@ #include "chip.h" #if CONFIG_CHIP_NAME == 1 -struct chip_operations mainboard_asus_a8v_e_se_ops = { +struct chip_operations mainboard_ops = { CHIP_NAME("ASUS A8V-E SE Mainboard") }; #endif diff --git a/src/mainboard/asus/m2v-mx_se/chip.h b/src/mainboard/asus/m2v-mx_se/chip.h index e2174e394..8a2857875 100644 --- a/src/mainboard/asus/m2v-mx_se/chip.h +++ b/src/mainboard/asus/m2v-mx_se/chip.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct chip_operations mainboard_asus_m2v_mx_se_ops; +extern struct chip_operations mainboard_ops; -struct mainboard_asus_m2v_mx_se_config { +struct mainboard_config { }; diff --git a/src/mainboard/asus/m2v-mx_se/mainboard.c b/src/mainboard/asus/m2v-mx_se/mainboard.c index f46109b56..2a5910b3a 100644 --- a/src/mainboard/asus/m2v-mx_se/mainboard.c +++ b/src/mainboard/asus/m2v-mx_se/mainboard.c @@ -24,7 +24,7 @@ #include "chip.h" #if CONFIG_CHIP_NAME == 1 -struct chip_operations mainboard_asus_m2v_se_ops = { +struct chip_operations mainboard_ops = { CHIP_NAME("ASUS M2V-MX SE Mainboard") }; #endif diff --git a/src/mainboard/asus/mew-am/chip.h b/src/mainboard/asus/mew-am/chip.h index 75cb37d03..dc9bed35a 100644 --- a/src/mainboard/asus/mew-am/chip.h +++ b/src/mainboard/asus/mew-am/chip.h @@ -18,5 +18,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct chip_operations mainboard_asus_mew_am_ops; -struct mainboard_asus_mew_am_config {}; +extern struct chip_operations mainboard_ops; +struct mainboard_config {}; diff --git a/src/mainboard/asus/mew-am/mainboard.c b/src/mainboard/asus/mew-am/mainboard.c index 077919c46..86f22552e 100644 --- a/src/mainboard/asus/mew-am/mainboard.c +++ b/src/mainboard/asus/mew-am/mainboard.c @@ -21,6 +21,6 @@ #include #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 bcadf9e6f..e168812d0 100644 --- a/src/mainboard/asus/mew-vm/chip.h +++ b/src/mainboard/asus/mew-vm/chip.h @@ -1,5 +1,5 @@ -extern struct chip_operations mainboard_asus_mew_vm_ops; +extern struct chip_operations mainboard_ops; -struct mainboard_asus_mew_vm_config { +struct mainboard_config { int nothing; }; diff --git a/src/mainboard/asus/mew-vm/mainboard.c b/src/mainboard/asus/mew-vm/mainboard.c index 4e03be0fe..9e325e716 100644 --- a/src/mainboard/asus/mew-vm/mainboard.c +++ b/src/mainboard/asus/mew-vm/mainboard.c @@ -1,6 +1,6 @@ #include #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 415085a4a..56e17ca59 100644 --- a/src/mainboard/asus/p2b-ds/chip.h +++ b/src/mainboard/asus/p2b-ds/chip.h @@ -18,5 +18,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct chip_operations mainboard_asus_p2b_ds_ops; -struct mainboard_asus_p2b_ds_config {}; +extern struct chip_operations mainboard_ops; +struct mainboard_config {}; diff --git a/src/mainboard/asus/p2b-ds/mainboard.c b/src/mainboard/asus/p2b-ds/mainboard.c index d5a59a3b2..910b13075 100644 --- a/src/mainboard/asus/p2b-ds/mainboard.c +++ b/src/mainboard/asus/p2b-ds/mainboard.c @@ -21,6 +21,6 @@ #include #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 1b9b1ead6..dc9bed35a 100644 --- a/src/mainboard/asus/p2b-f/chip.h +++ b/src/mainboard/asus/p2b-f/chip.h @@ -18,5 +18,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct chip_operations mainboard_asus_p2b_f_ops; -struct mainboard_asus_p2b_f_config {}; +extern struct chip_operations mainboard_ops; +struct mainboard_config {}; diff --git a/src/mainboard/asus/p2b-f/mainboard.c b/src/mainboard/asus/p2b-f/mainboard.c index 3868de5db..e2b022a0a 100644 --- a/src/mainboard/asus/p2b-f/mainboard.c +++ b/src/mainboard/asus/p2b-f/mainboard.c @@ -21,6 +21,6 @@ #include #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 2c3730182..dc9bed35a 100644 --- a/src/mainboard/asus/p2b/chip.h +++ b/src/mainboard/asus/p2b/chip.h @@ -18,5 +18,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct chip_operations mainboard_asus_p2b_ops; -struct mainboard_asus_p2b_config {}; +extern struct chip_operations mainboard_ops; +struct mainboard_config {}; diff --git a/src/mainboard/asus/p2b/mainboard.c b/src/mainboard/asus/p2b/mainboard.c index b21a9e6e8..21e5a4ef1 100644 --- a/src/mainboard/asus/p2b/mainboard.c +++ b/src/mainboard/asus/p2b/mainboard.c @@ -21,6 +21,6 @@ #include #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 369246289..dc9bed35a 100644 --- a/src/mainboard/asus/p3b-f/chip.h +++ b/src/mainboard/asus/p3b-f/chip.h @@ -18,5 +18,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct chip_operations mainboard_asus_p3b_f_ops; -struct mainboard_asus_p3b_f_config {}; +extern struct chip_operations mainboard_ops; +struct mainboard_config {}; diff --git a/src/mainboard/asus/p3b-f/mainboard.c b/src/mainboard/asus/p3b-f/mainboard.c index 9296219d1..c234fc201 100644 --- a/src/mainboard/asus/p3b-f/mainboard.c +++ b/src/mainboard/asus/p3b-f/mainboard.c @@ -21,6 +21,6 @@ #include #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 bf14e9609..6e6f19030 100644 --- 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 47dfd00cc..89c3dca5a 100644 --- a/src/mainboard/axus/tc320/mainboard.c +++ b/src/mainboard/axus/tc320/mainboard.c @@ -21,6 +21,6 @@ #include #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 843c41d09..dc9bed35a 100644 --- 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 ab648651c..45efc16db 100644 --- a/src/mainboard/azza/pt-6ibd/mainboard.c +++ b/src/mainboard/azza/pt-6ibd/mainboard.c @@ -21,6 +21,6 @@ #include #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 0ecdc4c0b..eae17f878 100644 --- 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 1201995c5..279701dc0 100644 --- a/src/mainboard/bcom/winnet100/mainboard.c +++ b/src/mainboard/bcom/winnet100/mainboard.c @@ -21,6 +21,6 @@ #include #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 e2202dd65..59ab64395 100644 --- 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 9ce51bb55..f467e1b6f 100644 --- a/src/mainboard/bcom/winnetp680/mainboard.c +++ b/src/mainboard/bcom/winnetp680/mainboard.c @@ -22,6 +22,6 @@ #include #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 7b45a7ee0..dc9bed35a 100644 --- 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 a804ae98e..fb6896ab5 100644 --- a/src/mainboard/biostar/m6tba/mainboard.c +++ b/src/mainboard/biostar/m6tba/mainboard.c @@ -21,6 +21,6 @@ #include #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 dbc442a18..71df35413 100644 --- 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 27909ecd8..521747325 100644 --- 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 9e6d238f3..dc9bed35a 100644 --- 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 d31a80993..75d7876aa 100644 --- 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 #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 75dcaf49c..b6e23b268 100644 --- 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 e969dd20f..3d22f2d64 100644 --- a/src/mainboard/dell/s1850/mainboard.c +++ b/src/mainboard/dell/s1850/mainboard.c @@ -1,7 +1,7 @@ #include #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 0ed808956..e168812d0 100644 --- 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 2e0e332ee..c6ab63e18 100644 --- a/src/mainboard/digitallogic/adl855pc/mainboard.c +++ b/src/mainboard/digitallogic/adl855pc/mainboard.c @@ -1,7 +1,7 @@ #include #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 fa064d48f..ceb8af100 100644 --- 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 f898218c7..b64a927bd 100644 --- 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 908ea93be..e168812d0 100644 --- 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 ffe95b234..2d3c3c4b5 100644 --- 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 4eb6bf7f2..e168812d0 100644 --- 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 7048ad819..c0b3ae067 100644 --- a/src/mainboard/eaglelion/5bcm/mainboard.c +++ b/src/mainboard/eaglelion/5bcm/mainboard.c @@ -1,7 +1,7 @@ #include #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 d6ecdde37..06f11d086 100644 --- 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 abf1299dd..99e289f33 100644 --- 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 a2bca6b05..dc9bed35a 100644 --- a/src/mainboard/gigabyte/ga-6bxc/chip.h +++ b/src/mainboard/gigabyte/ga-6bxc/chip.h @@ -18,5 +18,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct chip_operations mainboard_gigabyte_ga_6bxc_ops; -struct mainboard_gigabyte_ga_6bxc_config {}; +extern struct chip_operations mainboard_ops; +struct mainboard_config {}; diff --git a/src/mainboard/gigabyte/ga-6bxc/mainboard.c b/src/mainboard/gigabyte/ga-6bxc/mainboard.c index 70a74782e..01411f3f8 100644 --- a/src/mainboard/gigabyte/ga-6bxc/mainboard.c +++ b/src/mainboard/gigabyte/ga-6bxc/mainboard.c @@ -21,6 +21,6 @@ #include #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 289fbefd7..530c7f923 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/chip.h +++ b/src/mainboard/gigabyte/ga_2761gxdk/chip.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct chip_operations mainboard_gigabyte_ga_2761gxdk_ops; +extern struct chip_operations mainboard_ops; -struct mainboard_gigabyte_ga_2761gxdk_config { +struct mainboard_config { }; diff --git a/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c b/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c index eec119515..89fd895de 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c +++ b/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c @@ -27,7 +27,7 @@ #include "chip.h" #if CONFIG_CHIP_NAME == 1 -struct chip_operations mainboard_gigabyte_ga_2761gxdk_ops = { +struct chip_operations mainboard_ops = { CHIP_NAME("GIGABYTE GA-2761GXDK Mainboard") }; #endif diff --git a/src/mainboard/gigabyte/m57sli/chip.h b/src/mainboard/gigabyte/m57sli/chip.h index 7cc12ee04..556dc7ea1 100644 --- a/src/mainboard/gigabyte/m57sli/chip.h +++ b/src/mainboard/gigabyte/m57sli/chip.h @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct chip_operations mainboard_gigabyte_m57sli_ops; +extern struct chip_operations mainboard_ops; -struct mainboard_gigabyte_m57sli_config { +struct mainboard_config { // int fixup_scsi; // int fixup_vga; }; diff --git a/src/mainboard/gigabyte/m57sli/mainboard.c b/src/mainboard/gigabyte/m57sli/mainboard.c index 0a8257a57..3a688768e 100644 --- a/src/mainboard/gigabyte/m57sli/mainboard.c +++ b/src/mainboard/gigabyte/m57sli/mainboard.c @@ -27,7 +27,7 @@ #include "chip.h" #if CONFIG_CHIP_NAME == 1 -struct chip_operations mainboard_gigabyte_m57sli_ops = { +struct chip_operations mainboard_ops = { CHIP_NAME("GIGABYTE GA-M57SLI Mainboard") }; #endif diff --git a/src/mainboard/ibm/e325/chip.h b/src/mainboard/ibm/e325/chip.h index 589d0284a..e168812d0 100644 --- 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 81aa594c1..49a8c4131 100644 --- a/src/mainboard/ibm/e325/mainboard.c +++ b/src/mainboard/ibm/e325/mainboard.c @@ -1,7 +1,7 @@ #include #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 35f10e64c..e168812d0 100644 --- 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 0439a5b70..70b59a96b 100644 --- a/src/mainboard/ibm/e326/mainboard.c +++ b/src/mainboard/ibm/e326/mainboard.c @@ -1,7 +1,7 @@ #include #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 db99050ef..8c613a7cd 100644 --- 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 0956a6193..e44a07c23 100644 --- a/src/mainboard/iei/juki-511p/mainboard.c +++ b/src/mainboard/iei/juki-511p/mainboard.c @@ -26,6 +26,6 @@ #include #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 51403ae99..4092860b9 100644 --- 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 0a8a9177b..7ca0a1421 100644 --- a/src/mainboard/iei/nova4899r/mainboard.c +++ b/src/mainboard/iei/nova4899r/mainboard.c @@ -26,6 +26,6 @@ #include #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 ceaaafda4..8c613a7cd 100644 --- 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 c33eb0b7a..163e36073 100644 --- 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 -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 7cc59091b..b6e23b268 100644 --- 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 f7b58ac3f..ba2bfc501 100644 --- a/src/mainboard/intel/jarrell/mainboard.c +++ b/src/mainboard/intel/jarrell/mainboard.c @@ -1,7 +1,7 @@ #include #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 c61616dfd..4921b7bfc 100644 --- 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 2ff158caa..26111f541 100644 --- a/src/mainboard/intel/mtarvon/mainboard.c +++ b/src/mainboard/intel/mtarvon/mainboard.c @@ -21,7 +21,7 @@ #include #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 f1100b9f3..4921b7bfc 100644 --- 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 e0f3def29..78a16a92b 100644 --- a/src/mainboard/intel/truxton/mainboard.c +++ b/src/mainboard/intel/truxton/mainboard.c @@ -21,7 +21,7 @@ #include #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 12a9127ff..af1397bd0 100644 --- 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 923878291..1d0a1d09c 100644 --- 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 6d6e90c51..71df35413 100644 --- 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 01cbe494a..484290bd1 100644 --- 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 af9438c91..e168812d0 100644 --- 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 b51ef18ba..7559da63c 100644 --- a/src/mainboard/iwill/dk8s2/mainboard.c +++ b/src/mainboard/iwill/dk8s2/mainboard.c @@ -1,7 +1,7 @@ #include #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 4057cfa20..e168812d0 100644 --- 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 18cb2b5b4..a936f4032 100644 --- a/src/mainboard/iwill/dk8x/mainboard.c +++ b/src/mainboard/iwill/dk8x/mainboard.c @@ -1,7 +1,7 @@ #include #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 ad8c8a788..59ab64395 100644 --- 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 bb769b144..66937479d 100644 --- a/src/mainboard/jetway/j7f24/mainboard.c +++ b/src/mainboard/jetway/j7f24/mainboard.c @@ -22,6 +22,6 @@ #include #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 abc9e8b0b..08a66b677 100644 --- 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 17b23a246..e66777cc9 100644 --- a/src/mainboard/kontron/986lcd-m/mainboard.c +++ b/src/mainboard/kontron/986lcd-m/mainboard.c @@ -23,7 +23,7 @@ #include #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 ef3f3b7b8..e168812d0 100644 --- 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 aa82ae152..7cd9f1d03 100644 --- a/src/mainboard/lippert/frontrunner/mainboard.c +++ b/src/mainboard/lippert/frontrunner/mainboard.c @@ -1,7 +1,7 @@ #include #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 5a676edf0..b20105940 100644 --- a/src/mainboard/lippert/roadrunner-lx/chip.h +++ b/src/mainboard/lippert/roadrunner-lx/chip.h @@ -22,9 +22,9 @@ #include -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 b577aae2e..ad72f5dc0 100644 --- 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 d575f6cc3..422b04ab2 100644 --- a/src/mainboard/lippert/spacerunner-lx/chip.h +++ b/src/mainboard/lippert/spacerunner-lx/chip.h @@ -22,9 +22,9 @@ #include -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 5ef2ebf3e..05d226556 100644 --- 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 bcc281fde..56e17ca59 100644 --- 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 77ffcb8d6..9c4ef2921 100644 --- a/src/mainboard/msi/ms6119/mainboard.c +++ b/src/mainboard/msi/ms6119/mainboard.c @@ -21,6 +21,6 @@ #include #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 15ee56d90..fbf5d32e8 100644 --- 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 607a4619f..b7c7386d3 100644 --- a/src/mainboard/msi/ms6147/mainboard.c +++ b/src/mainboard/msi/ms6147/mainboard.c @@ -21,6 +21,6 @@ #include #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 92f8a5322..1e6116e8f 100644 --- 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 0a5410386..c3fdd81bb 100644 --- a/src/mainboard/msi/ms6178/mainboard.c +++ b/src/mainboard/msi/ms6178/mainboard.c @@ -21,6 +21,6 @@ #include #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 024971bb4..262341df7 100644 --- 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 32784b021..ac0bace41 100644 --- 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 e1eb800aa..1e6116e8f 100644 --- 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 11fabe81a..a6c6e08d5 100644 --- 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 0cef9992d..12d593237 100644 --- 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 8b995af32..e681d7460 100644 --- 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 d5558d146..d57f1df7d 100644 --- 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 62a39259b..91bbffd9f 100644 --- 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 aecb7ae34..613d9fd86 100644 --- 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 7578bfaaa..a24b54835 100644 --- a/src/mainboard/nec/powermate2000/mainboard.c +++ b/src/mainboard/nec/powermate2000/mainboard.c @@ -21,6 +21,6 @@ #include #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 f4889d6a6..e168812d0 100644 --- 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 d5dfcbc05..d278fd250 100644 --- a/src/mainboard/newisys/khepri/mainboard.c +++ b/src/mainboard/newisys/khepri/mainboard.c @@ -1,7 +1,7 @@ #include #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 51b539193..556dc7ea1 100644 --- 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 322a9af15..5fa84b0da 100644 --- 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 615ed8d2a..e168812d0 100644 --- 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 acedff8d6..40e363f49 100644 --- 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 34c0959a4..e168812d0 100644 --- 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 a89abb505..604f34ccf 100644 --- 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 18f7eaf94..4dba37680 100644 --- 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 620951a19..ab7043423 100644 --- 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 c53f56e0e..c50199eee 100644 --- 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 0c7863d0c..e84b95bc1 100644 --- a/src/mainboard/rca/rm4100/mainboard.c +++ b/src/mainboard/rca/rm4100/mainboard.c @@ -21,6 +21,6 @@ #include #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 bd7b8634b..71df35413 100644 --- 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 6660badb0..2d4b77ae3 100644 --- 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 d32ce0417..d37942f49 100644 --- a/src/mainboard/supermicro/h8dmr/chip.h +++ b/src/mainboard/supermicro/h8dmr/chip.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct chip_operations mainboard_supermicro_h8dmr_ops; +extern struct chip_operations mainboard_ops; -struct mainboard_supermicro_h8dmr_config { +struct mainboard_config { }; diff --git a/src/mainboard/supermicro/h8dmr/mainboard.c b/src/mainboard/supermicro/h8dmr/mainboard.c index cf2f780c7..0f742055f 100644 --- a/src/mainboard/supermicro/h8dmr/mainboard.c +++ b/src/mainboard/supermicro/h8dmr/mainboard.c @@ -27,7 +27,7 @@ #include "chip.h" #if CONFIG_CHIP_NAME == 1 -struct chip_operations mainboard_supermicro_h8dmr_ops = { +struct chip_operations mainboard_ops = { CHIP_NAME("Supermicro H8DMR Mainboard") }; #endif diff --git a/src/mainboard/supermicro/x6dai_g/chip.h b/src/mainboard/supermicro/x6dai_g/chip.h index 02f15189d..b6e23b268 100644 --- a/src/mainboard/supermicro/x6dai_g/chip.h +++ b/src/mainboard/supermicro/x6dai_g/chip.h @@ -1,5 +1,5 @@ -struct chip_operations mainboard_supermicro_x6dai_g_ops; +struct chip_operations mainboard_ops; -struct mainboard_supermicro_x6dai_g_config { +struct mainboard_config { int nothing; }; diff --git a/src/mainboard/supermicro/x6dhe_g/chip.h b/src/mainboard/supermicro/x6dhe_g/chip.h index f8ba112b0..b6e23b268 100644 --- a/src/mainboard/supermicro/x6dhe_g/chip.h +++ b/src/mainboard/supermicro/x6dhe_g/chip.h @@ -1,5 +1,5 @@ -struct chip_operations mainboard_supermicro_x6dhe_g_ops; +struct chip_operations mainboard_ops; -struct mainboard_supermicro_x6dhe_g_config { +struct mainboard_config { int nothing; }; diff --git a/src/mainboard/supermicro/x6dhe_g2/chip.h b/src/mainboard/supermicro/x6dhe_g2/chip.h index ff86e23bf..b6e23b268 100644 --- a/src/mainboard/supermicro/x6dhe_g2/chip.h +++ b/src/mainboard/supermicro/x6dhe_g2/chip.h @@ -1,5 +1,5 @@ -struct chip_operations mainboard_supermicro_x6dhe_g2_ops; +struct chip_operations mainboard_ops; -struct mainboard_supermicro_x6dhe_g2_config { +struct mainboard_config { int nothing; }; diff --git a/src/mainboard/supermicro/x6dhr_ig/chip.h b/src/mainboard/supermicro/x6dhr_ig/chip.h index 495788e43..b6e23b268 100644 --- a/src/mainboard/supermicro/x6dhr_ig/chip.h +++ b/src/mainboard/supermicro/x6dhr_ig/chip.h @@ -1,5 +1,5 @@ -struct chip_operations mainboard_supermicro_x6dhr_ig_ops; +struct chip_operations mainboard_ops; -struct mainboard_supermicro_x6dhr_ig_config { +struct mainboard_config { int nothing; }; diff --git a/src/mainboard/supermicro/x6dhr_ig/mainboard.c b/src/mainboard/supermicro/x6dhr_ig/mainboard.c index 59051de31..51acb86d8 100644 --- a/src/mainboard/supermicro/x6dhr_ig/mainboard.c +++ b/src/mainboard/supermicro/x6dhr_ig/mainboard.c @@ -1,7 +1,7 @@ #include #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 016f20a3f..b6e23b268 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/chip.h +++ b/src/mainboard/supermicro/x6dhr_ig2/chip.h @@ -1,5 +1,5 @@ -struct chip_operations mainboard_supermicro_x6dhr_ig2_ops; +struct chip_operations mainboard_ops; -struct mainboard_supermicro_x6dhr_ig2_config { +struct mainboard_config { int nothing; }; diff --git a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c index b1cda733f..6b6c64ff1 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c +++ b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c @@ -1,7 +1,7 @@ #include #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 d81199ea7..97f92dd91 100644 --- 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 d6d9723b6..3ce22f0e9 100644 --- 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 20b1d6eca..a1486f671 100644 --- 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 a580bb08d..a0919dc80 100644 --- a/src/mainboard/televideo/tc7020/mainboard.c +++ b/src/mainboard/televideo/tc7020/mainboard.c @@ -21,7 +21,7 @@ #include #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 f01bfb6d4..c46c318c2 100644 --- 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 2a164e846..c6b4cdf73 100644 --- a/src/mainboard/thomson/ip1000/mainboard.c +++ b/src/mainboard/thomson/ip1000/mainboard.c @@ -21,6 +21,6 @@ #include #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 fa911cb8d..dc9bed35a 100644 --- 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 7a2ed179f..e5ab1c908 100644 --- a/src/mainboard/tyan/s1846/mainboard.c +++ b/src/mainboard/tyan/s1846/mainboard.c @@ -21,6 +21,6 @@ #include #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 d63c156af..49842a07d 100644 --- 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 a460b7768..e27a6a01c 100644 --- 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 d14f97e98..49842a07d 100644 --- 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 c769cb52a..735e8d3ac 100644 --- 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 8d80c36e6..49842a07d 100644 --- 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 1f4a38bcb..8e2a96023 100644 --- 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 82fbd5648..49842a07d 100644 --- 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 20721c19e..9d6ad077d 100644 --- 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 bb88108bb..49842a07d 100644 --- 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 90c02650e..a0ad48b6f 100644 --- 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 308683f99..49842a07d 100644 --- 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 89e81956e..5cc3b971c 100644 --- 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 dadfb0f4e..71df35413 100644 --- 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 6b1beadaf..fbdcc4cd3 100644 --- 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 71a5bb9e8..49842a07d 100644 --- 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 a396404b0..d1c7be1b5 100644 --- 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 28fb8a02e..49842a07d 100644 --- 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 2aad2b3b4..a1f3e0434 100644 --- 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 350f4a636..71df35413 100644 --- 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 03514f11c..f615b1fd0 100644 --- 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 a34af2c1c..556dc7ea1 100644 --- 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 71445803c..67aed12d3 100644 --- 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 f34d17cac..556dc7ea1 100644 --- 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 4ceb052e8..f4a07c370 100644 --- 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 65d6d96c1..b0db1749d 100644 --- 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 c48c7e3e7..0174cd65e 100644 --- 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 b4f8467cc..b0db1749d 100644 --- 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 1d1d306e8..267d3d24d 100644 --- 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 ff91a02b9..59ab64395 100644 --- a/src/mainboard/via/epia-cn/chip.h +++ b/src/mainboard/via/epia-cn/chip.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct chip_operations mainboard_via_epia_cn_ops; +extern struct chip_operations mainboard_ops; -struct mainboard_via_epia_cn_config { +struct mainboard_config { int nothing; }; diff --git a/src/mainboard/via/epia-cn/mainboard.c b/src/mainboard/via/epia-cn/mainboard.c index e1eac58a6..1a7210eef 100644 --- a/src/mainboard/via/epia-cn/mainboard.c +++ b/src/mainboard/via/epia-cn/mainboard.c @@ -22,6 +22,6 @@ #include #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 2710e7b03..e168812d0 100644 --- a/src/mainboard/via/epia-m/chip.h +++ b/src/mainboard/via/epia-m/chip.h @@ -1,5 +1,5 @@ -extern struct chip_operations mainboard_via_epia_m_ops; +extern struct chip_operations mainboard_ops; -struct mainboard_via_epia_m_config { +struct mainboard_config { int nothing; }; diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c index 8f2ee10f0..64b7c6d23 100644 --- a/src/mainboard/via/epia-m/mainboard.c +++ b/src/mainboard/via/epia-m/mainboard.c @@ -40,7 +40,7 @@ void write_protect_vgabios(void) pci_write_config8(dev, 0x61, 0xaa); } -struct chip_operations mainboard_via_epia_m_ops = { +struct chip_operations mainboard_ops = { CHIP_NAME("VIA EPIA-M Mainboard") }; diff --git a/src/mainboard/via/epia/chip.h b/src/mainboard/via/epia/chip.h index 9e019bd80..e168812d0 100644 --- a/src/mainboard/via/epia/chip.h +++ b/src/mainboard/via/epia/chip.h @@ -1,5 +1,5 @@ -extern struct chip_operations mainboard_via_epia_ops; +extern struct chip_operations mainboard_ops; -struct mainboard_via_epia_config { +struct mainboard_config { int nothing; }; diff --git a/src/mainboard/via/epia/mainboard.c b/src/mainboard/via/epia/mainboard.c index 4242dfa92..25d72a51d 100644 --- a/src/mainboard/via/epia/mainboard.c +++ b/src/mainboard/via/epia/mainboard.c @@ -1,7 +1,7 @@ #include #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 abb1f6c9b..613d9fd86 100644 --- a/src/mainboard/via/pc2500e/chip.h +++ b/src/mainboard/via/pc2500e/chip.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct chip_operations mainboard_via_pc2500e_ops; +extern struct chip_operations mainboard_ops; -struct mainboard_via_pc2500e_config { +struct mainboard_config { }; diff --git a/src/mainboard/via/pc2500e/mainboard.c b/src/mainboard/via/pc2500e/mainboard.c index b7865dae4..9fcee5588 100644 --- a/src/mainboard/via/pc2500e/mainboard.c +++ b/src/mainboard/via/pc2500e/mainboard.c @@ -21,6 +21,6 @@ #include #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 294d40721..0e741836e 100644 --- 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() -- 2.25.1