[RFC] More generic targets with C preprocessor token concatenation

[Carl-Daniel Hailfinger]

Hi,

all boards have various variables named
mainboard_$VENDOR_$PARTNUMBER_config and similar. If you run diff
between related targets, these variables often account for a sizable
chunk of the diff.
That means for every new target we have to run a search/replace
operation even if the file contents (except variable names) do not change.

I think these search/replace operations are an unnecessary complication
during porting and should be eliminated because they require a human to
deal with the quirks of our build tools.

Below is a patch example which _should_ remove this type problem.

--- src/mainboard/amd/dbm690t/chip.h    (revision 3943)
+++ src/mainboard/amd/dbm690t/chip.h    (working copy)
@@ -19,7 +19,7 @@

extern struct chip_operations mainboard_amd_dbm690t_ops;

-struct mainboard_amd_dbm690t_config
+struct mainboard_##MAINBOARD_VENDOR##_##MAINBOARD_PART_NUMBER##_config
 {
        u32 uma_size;                   /* How many UMA should be used in memory for TOP. */
 };

I wrote "should" because that patch does not work. MAINBOARD_VENDOR and
MAINBOARD_PART_NUMBER are defined as strings with double quotes.
Concatenating strings with variable names can't work.

To fix this, I need an additional #define with mainboard vendor and part
number and that #define should not be a string.

Suggestion:
#define MAINBOARD_PREFIX mainboard_amd_dbm690t

Of course, that #define would be generated as a gcc parameter by our
config tools (like MAINBOARD_VENDOR).

With that change in the config tools, the patch above would look like this:

--- src/mainboard/amd/dbm690t/chip.h    (revision 3943)
+++ src/mainboard/amd/dbm690t/chip.h    (working copy)
@@ -19,7 +19,7 @@

extern struct chip_operations mainboard_amd_dbm690t_ops;

-struct mainboard_amd_dbm690t_config
+struct MAINBOARD_PREFIX##_config
 {
        u32 uma_size;                   /* How many UMA should be used in memory for TOP. */
 };

What do you think?

Regards,
Carl-Daniel

[ron minnich]

On Fri, Feb 13, 2009 at 4:30 AM, Carl-Daniel Hailfinger
 wrote:
> -struct mainboard_amd_dbm690t_config
> +struct MAINBOARD_PREFIX##_config

Here is the problem: now I don't know the name of that structure when
I browse it; and, once again, this kind of trickery can trick me, but
it is also unfriendly to source code analysis tools, which don't
always pick these subtleties up. What happens with doxygen? What do
the data structure graphs look like?

I realize this sort of thing is become more and more accepted in the
GNU universe (just look at glibc!), so call me old-fashioned, but I
feel a structure name should be a structure name, such that people
don't need to indirect (i.e. grep) to go find out what it really is. I
haven't found this kind of batch rename to be a huge issue,
personally.

I'm afraid I don't like the patch. :-)

I'd like us to optimize, if anything, for code that is amenable to
computer-assisted analysis. I was quite amazed to find out just how
much (once again) e.g. glibc frustrates tools designed to analyze
programs. We should be careful about going that route.

thanks

ron

[Myles Watson]

On Fri, Feb 13, 2009 at 9:19 AM, ron minnich  wrote:
> On Fri, Feb 13, 2009 at 4:30 AM, Carl-Daniel Hailfinger
>  wrote:
> > -struct mainboard_amd_dbm690t_config
> > +struct MAINBOARD_PREFIX##_config
>
> Here is the problem: now I don't know the name of that structure when
> I browse it; and, once again, this kind of trickery can trick me, but
> it is also unfriendly to source code analysis tools, which don't
> always pick these subtleties up. What happens with doxygen? What do
> the data structure graphs look like?
>
> I realize this sort of thing is become more and more accepted in the
> GNU universe (just look at glibc!), so call me old-fashioned, but I
> feel a structure name should be a structure name, such that people
> don't need to indirect (i.e. grep) to go find out what it really is. I
> haven't found this kind of batch rename to be a huge issue,
> personally.
>
> I'm afraid I don't like the patch. :-)
>
> I'd like us to optimize, if anything, for code that is amenable to
> computer-assisted analysis. I was quite amazed to find out just how
> much (once again) e.g. glibc frustrates tools designed to analyze
> programs. We should be careful about going that route.

Can it be simpler and just be mainboard_config for all boards?  I
think the fact that it's in the correct mainboards' directory ought to
be good enough.

Thanks,
Myles

[ron minnich]

On Fri, Feb 13, 2009 at 9:14 AM, Myles Watson  wrote:
> Can it be simpler and just be mainboard_config for all boards?  I
> think the fact that it's in the correct mainboards' directory ought to
> be good enough.

I would have to change dtc but it's doable.

ron

[Myles Watson]

On Fri, Feb 13, 2009 at 10:21 AM, ron minnich  wrote:
> On Fri, Feb 13, 2009 at 9:14 AM, Myles Watson  wrote:
> > Can it be simpler and just be mainboard_config for all boards?  I
> > think the fact that it's in the correct mainboards' directory ought to
> > be good enough.
>
> I would have to change dtc but it's doable.

If it's worth unifying boards in v2, I think it's worth doing it simply.

Thanks,
Myles

[ron minnich]

On Fri, Feb 13, 2009 at 9:27 AM, Myles Watson  wrote:
> If it's worth unifying boards in v2, I think it's worth doing it simply.

Sorry I meant change v2 config tool :-)

it's just a name, so the rules on how to generate it are fairly
straightforward.

ron

[RFC] More generic targets with C preprocessor token concatenation

[Stefan Reinauer]

On 13.02.2009 18:27 Uhr, Myles Watson wrote:
> On Fri, Feb 13, 2009 at 10:21 AM, ron minnich  wrote:
> > On Fri, Feb 13, 2009 at 9:14 AM, Myles Watson  wrote:
> > > Can it be simpler and just be mainboard_config for all boards?  I
> > > think the fact that it's in the correct mainboards' directory ought to
> > > be good enough.
> >
> > I would have to change dtc but it's doable.
>
> If it's worth unifying boards in v2, I think it's worth doing it simply.

I think that would be a good idea. There are no two mainboard config
structures in a target. Or can there ever be? (Think multi target images)

[RFC] More generic targets with C preprocessor token concatenation

[Carl-Daniel Hailfinger]

On 13.02.2009 18:47, Stefan Reinauer wrote:
> On 13.02.2009 18:27 Uhr, Myles Watson wrote:
> > On Fri, Feb 13, 2009 at 10:21 AM, ron minnich  wrote:
> > > On Fri, Feb 13, 2009 at 9:14 AM, Myles Watson  wrote:
> > > > Can it be simpler and just be mainboard_config for all boards?  I
> > > > think the fact that it's in the correct mainboards' directory ought to
> > > > be good enough.
> > >
> > > I would have to change dtc but it's doable.
> >
> > If it's worth unifying boards in v2, I think it's worth doing it simply.
>
> I think that would be a good idea. There are no two mainboard config
> structures in a target. Or can there ever be? (Think multi target images)

Unless multi target images are linked together from more than one
mainboard directory, this won't be a problem.

Regards,
Carl-Daniel

[ron minnich]

On Fri, Feb 13, 2009 at 9:47 AM, Stefan Reinauer  wrote:
> I think that would be a good idea. There are no two mainboard config
> structures in a target. Or can there ever be? (Think multi target images)

OK, well I finally have a  Coreboot day today, so let's think on this
carefully.

Do we want a transition or a Big Bang? Do you want to fix every target
or do you want a config tool switch?

ron

[RFC] More generic targets with C preprocessor token concatenation

[Carl-Daniel Hailfinger]

On 13.02.2009 18:57, ron minnich wrote:
> On Fri, Feb 13, 2009 at 9:47 AM, Stefan Reinauer  wrote:
> > I think that would be a good idea. There are no two mainboard config
> > structures in a target. Or can there ever be? (Think multi target images)
>
> OK, well I finally have a  Coreboot day today, so let's think on this
> carefully.
>
> Do we want a transition or a Big Bang? Do you want to fix every target
> or do you want a config tool switch?

I can script the replacements rather easily. Decide on a name and I'll
send a matching patch for the targets. The new name should preferably
not cause any collisions, but I'd say a grep over the tree is sufficient
for that.

Regards,
Carl-Daniel

[RFC] More generic targets with C preprocessor token concatenation

[Carl-Daniel Hailfinger]

On 13.02.2009 19:33, Carl-Daniel Hailfinger wrote:
> On 13.02.2009 18:57, ron minnich wrote:
> > On Fri, Feb 13, 2009 at 9:47 AM, Stefan Reinauer  wrote:
> > > I think that would be a good idea. There are no two mainboard config
> > > structures in a target. Or can there ever be? (Think multi target images)
> >
> > OK, well I finally have a  Coreboot day today, so let's think on this
> > carefully.
> >
> > Do we want a transition or a Big Bang? Do you want to fix every target
> > or do you want a config tool switch?
>
> I can script the replacements rather easily. Decide on a name and I'll
> send a matching patch for the targets. The new name should preferably
> not cause any collisions, but I'd say a grep over the tree is sufficient
> for that.

mainboard_$VENDOR_$BOARD_ops has been converted to mainboard_ops.
mainboard_$VENDOR_$BOARD_config has been converted to mainboard_config.

Most of the patch was generated by a script. The results were inspected
by hand and fixed up in case of non-systematic deviations.

Now the config tools have to be changed accordingly.

Signed-off-by: Carl-Daniel Hailfinger

Index: coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8_htx/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8_htx/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8_htx/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8_htx/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8_htx/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8_htx/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8s2/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8s2/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8s2/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8s2/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8s2/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8s2/mainboard.c	(working copy)
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_iwill_dk8s2_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("IWILL DK8S2 Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8x/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8x/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8x/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8x/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8x/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/iwill/dk8x/mainboard.c	(working copy)
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_iwill_dk8x_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("IWILL DK8X Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/axus/tc320/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/axus/tc320/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/axus/tc320/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/axus/tc320/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/axus/tc320/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/axus/tc320/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_axus_tc320_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("AXUS TC320 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/bcom/winnetp680/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/bcom/winnetp680/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/bcom/winnetp680/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/bcom/winnetp680/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/bcom/winnetp680/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/bcom/winnetp680/mainboard.c	(working copy)
@@ -22,6 +22,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_bcom_winnetp680_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("BCOM WinNET P680 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/bcom/winnet100/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/bcom/winnet100/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/bcom/winnet100/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/bcom/winnet100/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/bcom/winnet100/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/bcom/winnet100/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_bcom_winnet100_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("BCOM WinNET100 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/televideo/tc7020/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/televideo/tc7020/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/televideo/tc7020/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/televideo/tc7020/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/televideo/tc7020/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/televideo/tc7020/mainboard.c	(working copy)
@@ -21,7 +21,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_televideo_tc7020_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("TeleVideo TC7020 Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/broadcom/blast/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/broadcom/blast/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/broadcom/blast/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/broadcom/blast/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/broadcom/blast/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/broadcom/blast/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/thomson/ip1000/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/thomson/ip1000/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/thomson/ip1000/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/thomson/ip1000/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/thomson/ip1000/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/thomson/ip1000/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_thomson_ip1000_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("THOMSON IP1000 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dai_g/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dai_g/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dai_g/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/supermicro/h8dmr/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/supermicro/h8dmr/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/supermicro/h8dmr/chip.h	(working copy)
@@ -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 {
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/supermicro/h8dmr/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/supermicro/h8dmr/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/supermicro/h8dmr/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhe_g/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhe_g/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhe_g/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhe_g2/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhe_g2/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhe_g2/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhr_ig/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhr_ig/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhr_ig/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhr_ig/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhr_ig/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhr_ig/mainboard.c	(working copy)
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_supermicro_x6dhr_ig_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Supermicro X6DHR-iG Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhr_ig2/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhr_ig2/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhr_ig2/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhr_ig2/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/supermicro/x6dhr_ig2/mainboard.c	(working copy)
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_supermicro_x6dhr_ig2_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Supermicro X6DHR-iG2 Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/kontron/986lcd-m/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/kontron/986lcd-m/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/kontron/986lcd-m/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/kontron/986lcd-m/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/kontron/986lcd-m/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/kontron/986lcd-m/mainboard.c	(working copy)
@@ -23,7 +23,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_kontron_986lcd_m_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Kontron 986LCD-M Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/a-trend/atc-6240/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/a-trend/atc-6240/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/a-trend/atc-6240/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/a-trend/atc-6240/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/a-trend/atc-6240/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/a-trend/atc-6240/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_a_trend_atc_6240_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("A-Trend ATC-6240 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/a-trend/atc-6220/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/a-trend/atc-6220/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/a-trend/atc-6220/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/a-trend/atc-6220/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/a-trend/atc-6220/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/a-trend/atc-6220/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_a_trend_atc_6220_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("A-Trend ATC-6220 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/m57sli/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/m57sli/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/m57sli/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/m57sli/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/m57sli/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/m57sli/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/ga_2761gxdk/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/ga_2761gxdk/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/ga_2761gxdk/chip.h	(working copy)
@@ -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 {
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/ga-6bxc/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/ga-6bxc/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/ga-6bxc/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/ga-6bxc/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/ga-6bxc/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/gigabyte/ga-6bxc/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_gigabyte_ga_6bxc_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("GIGABYTE GA-6BXC Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/msm800sev/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/msm800sev/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/msm800sev/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/msm800sev/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/msm800sev/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/msm800sev/mainboard.c	(working copy)
@@ -32,7 +32,7 @@
         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,
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/adl855pc/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/adl855pc/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/adl855pc/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/adl855pc/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/adl855pc/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/adl855pc/mainboard.c	(working copy)
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_digitallogic_adl855pc_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("DIGITAL-LOGIC ADL855PC Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/msm586seg/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/msm586seg/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/msm586seg/chip.h	(working copy)
@@ -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 {

};
Index: coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/msm586seg/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/msm586seg/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/digitallogic/msm586seg/mainboard.c	(working copy)
@@ -141,7 +141,7 @@

}
-struct chip_operations mainboard_digitallogic_msm586seg_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("DIGITAL-LOGIC MSM586SEG Mainboard")
    .enable_dev = enable_dev
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/emulation/qemu-x86/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/emulation/qemu-x86/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/emulation/qemu-x86/chip.h	(working copy)
@@ -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 {
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/emulation/qemu-x86/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/emulation/qemu-x86/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/emulation/qemu-x86/mainboard.c	(working copy)
@@ -35,7 +35,7 @@
    .device = 0x00b8,
 };

-struct chip_operations mainboard_emulation_qemu_x86_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("QEMU Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/olpc/btest/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/olpc/btest/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/olpc/btest/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/olpc/btest/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/olpc/btest/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/olpc/btest/mainboard.c	(working copy)
@@ -131,7 +131,7 @@
         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,
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/olpc/rev_a/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/olpc/rev_a/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/olpc/rev_a/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/olpc/rev_a/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/olpc/rev_a/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/olpc/rev_a/mainboard.c	(working copy)
@@ -102,7 +102,7 @@
         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,
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/technologic/ts5300/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/technologic/ts5300/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/technologic/ts5300/chip.h	(working copy)
@@ -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 {
    
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/technologic/ts5300/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/technologic/ts5300/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/technologic/ts5300/mainboard.c	(working copy)
@@ -148,7 +148,7 @@
    
 }

-struct chip_operations mainboard_technologic_ts5300_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Technologic Systems TS-5300 Mainboard")
    .enable_dev = enable_dev
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/amd/pistachio/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/amd/pistachio/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/amd/pistachio/chip.h	(working copy)
@@ -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. */
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/amd/pistachio/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/amd/pistachio/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/amd/pistachio/mainboard.c	(working copy)
@@ -271,8 +271,8 @@
 *************************************************/
 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 @@
 /*
 * 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,
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/amd/dbm690t/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/amd/dbm690t/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/amd/dbm690t/chip.h	(working copy)
@@ -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. */
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/amd/dbm690t/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/amd/dbm690t/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/amd/dbm690t/mainboard.c	(working copy)
@@ -199,8 +199,8 @@
 *************************************************/
 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 @@
 /*
 * 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,
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/amd/rumba/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/amd/rumba/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/amd/rumba/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/amd/rumba/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/amd/rumba/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/amd/rumba/mainboard.c	(working copy)
@@ -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 @@
         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,
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/amd/serengeti_cheetah/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/amd/serengeti_cheetah/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/amd/serengeti_cheetah/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/amd/serengeti_cheetah/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/amd/serengeti_cheetah/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/amd/serengeti_cheetah/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/amd/norwich/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/amd/norwich/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/amd/norwich/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/amd/norwich/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/amd/norwich/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/amd/norwich/mainboard.c	(working copy)
@@ -32,7 +32,7 @@
    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,
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/amd/serengeti_cheetah_fam10/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/amd/serengeti_cheetah_fam10/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/amd/serengeti_cheetah_fam10/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/amd/db800/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/amd/db800/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/amd/db800/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/amd/db800/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/amd/db800/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/amd/db800/mainboard.c	(working copy)
@@ -32,7 +32,7 @@
    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,
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/biostar/m6tba/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/biostar/m6tba/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/biostar/m6tba/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/biostar/m6tba/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/biostar/m6tba/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/biostar/m6tba/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_biostar_m6tba_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Biostar M6TBA Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/nec/powermate2000/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/nec/powermate2000/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/nec/powermate2000/chip.h	(working copy)
@@ -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 {
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/nec/powermate2000/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/nec/powermate2000/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/nec/powermate2000/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_nec_powermate2000_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("NEC PowerMate 2000 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/azza/pt-6ibd/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/azza/pt-6ibd/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/azza/pt-6ibd/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/azza/pt-6ibd/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/azza/pt-6ibd/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/azza/pt-6ibd/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_azza_pt_6ibd_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("AZZA PT-6IBD Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/rca/rm4100/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/rca/rm4100/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/rca/rm4100/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/rca/rm4100/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/rca/rm4100/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/rca/rm4100/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_rca_rm4100_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("RCA RM4100 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/iei/nova4899r/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/iei/nova4899r/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/iei/nova4899r/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/iei/nova4899r/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/iei/nova4899r/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/iei/nova4899r/mainboard.c	(working copy)
@@ -26,6 +26,6 @@
 #include <arch/io.h>
 #include "chip.h"

-struct chip_operations mainboard_iei_nova4899r_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("IEI NOVA-4899R Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/iei/pcisa-lx-800-r10/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/iei/pcisa-lx-800-r10/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/iei/pcisa-lx-800-r10/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c	(working copy)
@@ -20,6 +20,6 @@

#include <device/device.h>

-struct chip_operations mainboard_iei_pcisa_lx_800_r10_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("IEI PCISA-LX-800-R10 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/iei/juki-511p/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/iei/juki-511p/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/iei/juki-511p/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/iei/juki-511p/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/iei/juki-511p/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/iei/juki-511p/mainboard.c	(working copy)
@@ -26,6 +26,6 @@
 #include <arch/io.h>
 #include "chip.h"

-struct chip_operations mainboard_iei_juki_511p_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("IEI JUKI-511P Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/artecgroup/dbe61/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/artecgroup/dbe61/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/artecgroup/dbe61/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/artecgroup/dbe61/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/artecgroup/dbe61/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/artecgroup/dbe61/mainboard.c	(working copy)
@@ -52,7 +52,7 @@
         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,
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/pcengines/alix1c/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/pcengines/alix1c/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/pcengines/alix1c/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/pcengines/alix1c/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/pcengines/alix1c/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/pcengines/alix1c/mainboard.c	(working copy)
@@ -32,7 +32,7 @@
    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,
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2912/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2912/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2912/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2912/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2912/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2912/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2850/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2850/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2850/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2850/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2850/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2850/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2735/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2735/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2735/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2735/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2735/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2735/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2880/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2880/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2880/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2880/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2880/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2880/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2881/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2881/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2881/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2881/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2881/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2881/mainboard.c	(working copy)
@@ -159,7 +159,7 @@
 }

#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,
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s1846/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s1846/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s1846/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s1846/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s1846/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s1846/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_tyan_s1846_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Tyan S1846 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s4880/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s4880/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s4880/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s4880/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s4880/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s4880/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2891/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2891/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2891/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2891/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2891/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2891/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2882/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2882/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2882/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2882/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2882/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2882/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2892/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2892/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2892/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2892/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2892/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2892/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s4882/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s4882/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s4882/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s4882/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s4882/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s4882/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2875/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2875/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2875/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2875/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2875/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2875/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2885/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2885/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2885/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2885/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2885/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2885/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2895/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2895/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2895/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2895/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2895/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2895/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2912_fam10/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2912_fam10/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2912_fam10/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2912_fam10/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2912_fam10/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/tyan/s2912_fam10/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/asi/mb_5blgp/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asi/mb_5blgp/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asi/mb_5blgp/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/asi/mb_5blgp/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asi/mb_5blgp/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asi/mb_5blgp/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_asi_mb_5blgp_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("ASI MB-5BLGP Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/asi/mb_5blmp/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asi/mb_5blmp/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asi/mb_5blmp/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/asi/mb_5blmp/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asi/mb_5blmp/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asi/mb_5blmp/mainboard.c	(working copy)
@@ -21,7 +21,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_asi_mb_5blmp_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("ASI/BCom MB-5BLMP Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/lippert/roadrunner-lx/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/lippert/roadrunner-lx/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/lippert/roadrunner-lx/chip.h	(working copy)
@@ -22,9 +22,9 @@

#include <stdint.h>

-extern struct chip_operations mainboard_lippert_roadrunner_lx_ops;
+extern struct chip_operations mainboard_ops;

-struct mainboard_lippert_roadrunner_lx_config {
+struct mainboard_config {
    /* bit5 = Live LED, bit2 = RS485_EN2, bit1 = RS485_EN1 */
    u8 sio_gp1x_config;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/lippert/roadrunner-lx/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/lippert/roadrunner-lx/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/lippert/roadrunner-lx/mainboard.c	(working copy)
@@ -40,7 +40,7 @@

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 @@
    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,
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/lippert/frontrunner/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/lippert/frontrunner/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/lippert/frontrunner/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/lippert/frontrunner/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/lippert/frontrunner/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/lippert/frontrunner/mainboard.c	(working copy)
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_lippert_frontrunner_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Lippert Cool Frontrunner Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/lippert/spacerunner-lx/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/lippert/spacerunner-lx/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/lippert/spacerunner-lx/chip.h	(working copy)
@@ -22,9 +22,9 @@

#include <stdint.h>

-extern struct chip_operations mainboard_lippert_spacerunner_lx_ops;
+extern struct chip_operations mainboard_ops;

-struct mainboard_lippert_spacerunner_lx_config {
+struct mainboard_config {
    /* bit2 = RS485_EN2, bit1 = RS485_EN1, bit0 = Live LED */
    u8 sio_gp1x_config;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/lippert/spacerunner-lx/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/lippert/spacerunner-lx/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/lippert/spacerunner-lx/mainboard.c	(working copy)
@@ -41,7 +41,7 @@

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 @@
    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,
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/abit/be6-ii_v2_0/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/abit/be6-ii_v2_0/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/abit/be6-ii_v2_0/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/abit/be6-ii_v2_0/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/abit/be6-ii_v2_0/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/abit/be6-ii_v2_0/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_abit_be6_ii_v2_0_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Abit BE6-II V2.0 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/via/epia-m/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/via/epia-m/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/via/epia-m/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/via/epia-m/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/via/epia-m/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/via/epia-m/mainboard.c	(working copy)
@@ -40,7 +40,7 @@
    	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")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/via/epia-cn/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/via/epia-cn/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/via/epia-cn/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/via/epia-cn/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/via/epia-cn/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/via/epia-cn/mainboard.c	(working copy)
@@ -22,6 +22,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_via_epia_cn_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("VIA EPIA-CN Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/via/epia/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/via/epia/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/via/epia/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/via/epia/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/via/epia/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/via/epia/mainboard.c	(working copy)
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_via_epia_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("VIA EPIA Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/via/pc2500e/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/via/pc2500e/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/via/pc2500e/chip.h	(working copy)
@@ -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 {
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/via/pc2500e/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/via/pc2500e/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/via/pc2500e/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_via_pc2500e_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("VIA pc2500e Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/compaq/deskpro_en_sff_p600/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/compaq/deskpro_en_sff_p600/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/compaq/deskpro_en_sff_p600/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_compaq_deskpro_en_sff_p600_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Compaq Deskpro EN SFF P600 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/dell/s1850/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/dell/s1850/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/dell/s1850/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/dell/s1850/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/dell/s1850/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/dell/s1850/mainboard.c	(working copy)
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_dell_s1850_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Dell S1850 Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/msi/ms7135/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/msi/ms7135/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/msi/ms7135/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/msi/ms7135/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/msi/ms7135/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/msi/ms7135/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6119/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6119/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6119/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6119/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6119/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6119/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_msi_ms6119_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("MSI MS-6119 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6147/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6147/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6147/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6147/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6147/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6147/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_msi_ms6147_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("MSI MS-6147 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/msi/ms9282/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/msi/ms9282/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/msi/ms9282/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/msi/ms9282/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/msi/ms9282/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/msi/ms9282/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6178/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6178/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6178/chip.h	(working copy)
@@ -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 {
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6178/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6178/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/msi/ms6178/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_msi_ms6178_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("MSI MS-6178 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/msi/ms9185/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/msi/ms9185/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/msi/ms9185/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/msi/ms9185/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/msi/ms9185/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/msi/ms9185/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/msi/ms7260/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/msi/ms7260/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/msi/ms7260/chip.h	(working copy)
@@ -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 {
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/msi/ms7260/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/msi/ms7260/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/msi/ms7260/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/arima/hdama/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/arima/hdama/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/arima/hdama/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/arima/hdama/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/arima/hdama/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/arima/hdama/mainboard.c	(working copy)
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_arima_hdama_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Arima HDAMA Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/sunw/ultra40/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/sunw/ultra40/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/sunw/ultra40/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/sunw/ultra40/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/sunw/ultra40/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/sunw/ultra40/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/advantech/pcm-5820/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/advantech/pcm-5820/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/advantech/pcm-5820/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/advantech/pcm-5820/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/advantech/pcm-5820/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/advantech/pcm-5820/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_advantech_pcm_5820_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Advantech PCM-5820 Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/eaglelion/5bcm/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/eaglelion/5bcm/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/eaglelion/5bcm/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/eaglelion/5bcm/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/eaglelion/5bcm/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/eaglelion/5bcm/mainboard.c	(working copy)
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_eaglelion_5bcm_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Eaglelion 5BCM Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/newisys/khepri/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/newisys/khepri/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/newisys/khepri/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/newisys/khepri/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/newisys/khepri/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/newisys/khepri/mainboard.c	(working copy)
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_newisys_khepri_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Newisys 2100 Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/jetway/j7f24/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/jetway/j7f24/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/jetway/j7f24/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/jetway/j7f24/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/jetway/j7f24/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/jetway/j7f24/mainboard.c	(working copy)
@@ -22,6 +22,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_jetway_j7f24_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Jetway J7F[24]* Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/ibm/e326/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/ibm/e326/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/ibm/e326/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/ibm/e326/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/ibm/e326/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/ibm/e326/mainboard.c	(working copy)
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_ibm_e326_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("IBM eServer 326 Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/ibm/e325/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/ibm/e325/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/ibm/e325/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/ibm/e325/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/ibm/e325/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/ibm/e325/mainboard.c	(working copy)
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_ibm_e325_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("IBM eServer 325 Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/nvidia/l1_2pvv/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/nvidia/l1_2pvv/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/nvidia/l1_2pvv/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/nvidia/l1_2pvv/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/nvidia/l1_2pvv/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/nvidia/l1_2pvv/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/intel/xe7501devkit/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/intel/xe7501devkit/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/intel/xe7501devkit/chip.h	(working copy)
@@ -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 {
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/intel/xe7501devkit/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/intel/xe7501devkit/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/intel/xe7501devkit/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/intel/truxton/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/intel/truxton/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/intel/truxton/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/intel/truxton/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/intel/truxton/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/intel/truxton/mainboard.c	(working copy)
@@ -21,7 +21,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_intel_truxton_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Intel Truxton Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/intel/mtarvon/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/intel/mtarvon/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/intel/mtarvon/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/intel/mtarvon/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/intel/mtarvon/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/intel/mtarvon/mainboard.c	(working copy)
@@ -21,7 +21,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_intel_mtarvon_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Intel Mt. Arvon Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/intel/jarrell/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/intel/jarrell/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/intel/jarrell/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/intel/jarrell/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/intel/jarrell/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/intel/jarrell/mainboard.c	(working copy)
@@ -1,7 +1,7 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_intel_e7520_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("Intel Jarell Mainboard")
 };

Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/mew-am/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/mew-am/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/mew-am/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/mew-am/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/mew-am/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/mew-am/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_asus_mew_am_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("ASUS MEW-AM Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_asus_p2b_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("ASUS P2B Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b-f/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b-f/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b-f/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b-f/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b-f/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b-f/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_asus_p2b_f_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("ASUS P2B-F Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/a8v-e_se/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/a8v-e_se/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/a8v-e_se/chip.h	(working copy)
@@ -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 {
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/a8v-e_se/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/a8v-e_se/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/a8v-e_se/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b-ds/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b-ds/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b-ds/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b-ds/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b-ds/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/p2b-ds/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_asus_p2b_ds_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("ASUS P2B-DS Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/p3b-f/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/p3b-f/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/p3b-f/chip.h	(working copy)
@@ -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 {};
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/p3b-f/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/p3b-f/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/p3b-f/mainboard.c	(working copy)
@@ -21,6 +21,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_asus_p3b_f_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("ASUS P3B-F Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/mew-vm/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/mew-vm/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/mew-vm/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/mew-vm/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/mew-vm/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/mew-vm/mainboard.c	(working copy)
@@ -1,6 +1,6 @@
 #include <device/device.h>
 #include "chip.h"

-struct chip_operations mainboard_asus_mew_vm_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("ASUS MEW-VM Mainboard")
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/a8n_e/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/a8n_e/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/a8n_e/chip.h	(working copy)
@@ -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;
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/a8n_e/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/a8n_e/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/a8n_e/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/m2v-mx_se/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/m2v-mx_se/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/m2v-mx_se/chip.h	(working copy)
@@ -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 {
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/asus/m2v-mx_se/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/asus/m2v-mx_se/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/asus/m2v-mx_se/mainboard.c	(working copy)
@@ -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
Index: coreboot-v2-targetstructcleanup/src/mainboard/agami/aruma/chip.h
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/agami/aruma/chip.h	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/agami/aruma/chip.h	(working copy)
@@ -1,4 +1,4 @@
-extern struct chip_operations mainboard_agami_aruma_ops;
+extern struct chip_operations mainboard_ops;

-struct mainboard_agami_aruma_config {
+struct mainboard_config {
 };
Index: coreboot-v2-targetstructcleanup/src/mainboard/agami/aruma/mainboard.c
===================================================================
--- coreboot-v2-targetstructcleanup/src/mainboard/agami/aruma/mainboard.c	(revision 3944)
+++ coreboot-v2-targetstructcleanup/src/mainboard/agami/aruma/mainboard.c	(working copy)
@@ -323,7 +323,7 @@
    dev->ops->init = mainboard_init;
 }

-struct chip_operations mainboard_agami_aruma_ops = {
+struct chip_operations mainboard_ops = {
    CHIP_NAME("AGAMI Aruma Mainboard")
    .enable_dev = enable_dev, 
 };

Regards,
Carl-Daniel

[RFC] More generic targets with C preprocessor token concatenation

[Carl-Daniel Hailfinger]

On 13.02.2009 17:19, ron minnich wrote:
> On Fri, Feb 13, 2009 at 4:30 AM, Carl-Daniel Hailfinger
>  wrote:
> > -struct mainboard_amd_dbm690t_config
> > +struct MAINBOARD_PREFIX##_config
>
> Here is the problem: now I don't know the name of that structure when
> I browse it; and, once again, this kind of trickery can trick me, but
> it is also unfriendly to source code analysis tools, which don't
> always pick these subtleties up. What happens with doxygen? What do
> the data structure graphs look like?

Point taken. I had assumed that kscope and doxygen would be able to
understand this.
> I realize this sort of thing is become more and more accepted in the
> GNU universe (just look at glibc!), so call me old-fashioned, but I
> feel a structure name should be a structure name, such that people
> don't need to indirect (i.e. grep) to go find out what it really is. I
> haven't found this kind of batch rename to be a huge issue,
> personally.

Since this was the first target I wanted to clone, I was surprised by
the amount of search and replace I had to do.
> I'm afraid I don't like the patch. :-)
>
> I'd like us to optimize, if anything, for code that is amenable to
> computer-assisted analysis. I was quite amazed to find out just how
> much (once again) e.g. glibc frustrates tools designed to analyze
> programs. We should be careful about going that route.

Can these programs deal with different structs definitions having the
same name, but living in different mainboard dirs?

Regards,
Carl-Daniel