[coreboot] New patch to review for coreboot: ae6dc2d Drop mainboard chip.h

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Thu Jul 26 21:52:05 CEST 2012


Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1359

-gerrit

commit ae6dc2d8e13608fe2a172cbf5dce716c937cc217
Author: Stefan Reinauer <reinauer at chromium.org>
Date:   Thu Jul 26 12:46:48 2012 -0700

    Drop mainboard chip.h
    
    mainboard_config never worked right, at least not since we've had sconfig.
    Hence, drop mainboard/<vendor>/<device>/chip.h and fix up the mainboards that
    tried to use it anyways.
    
    Change-Id: I7cd403ea188d8a9fd4c1ad15479fa88e02ab8e83
    Signed-off-by: Stefan Reinauer <reinauer at google.com>
---
 src/mainboard/a-trend/atc-6220/chip.h              |   22 ---------------
 src/mainboard/a-trend/atc-6220/mainboard.c         |    1 -
 src/mainboard/a-trend/atc-6240/chip.h              |   22 ---------------
 src/mainboard/a-trend/atc-6240/mainboard.c         |    1 -
 src/mainboard/aaeon/pfm-540i_revb/chip.h           |   23 ---------------
 src/mainboard/aaeon/pfm-540i_revb/mainboard.c      |    1 -
 src/mainboard/abit/be6-ii_v2_0/chip.h              |   22 ---------------
 src/mainboard/abit/be6-ii_v2_0/mainboard.c         |    1 -
 src/mainboard/advansus/a785e-i/chip.h              |   22 ---------------
 src/mainboard/advansus/a785e-i/mainboard.c         |    5 ---
 src/mainboard/advantech/pcm-5820/chip.h            |   22 ---------------
 src/mainboard/advantech/pcm-5820/mainboard.c       |    1 -
 src/mainboard/amd/bimini_fam10/chip.h              |   22 ---------------
 src/mainboard/amd/bimini_fam10/mainboard.c         |    5 ---
 src/mainboard/amd/db800/chip.h                     |   23 ---------------
 src/mainboard/amd/db800/mainboard.c                |    1 -
 src/mainboard/amd/dbm690t/chip.h                   |   21 --------------
 src/mainboard/amd/dbm690t/mainboard.c              |    1 -
 src/mainboard/amd/dinar/chip.h                     |   23 ---------------
 src/mainboard/amd/dinar/mainboard.c                |    1 -
 src/mainboard/amd/inagua/chip.h                    |   23 ---------------
 src/mainboard/amd/inagua/mainboard.c               |    1 -
 src/mainboard/amd/mahogany/chip.h                  |   21 --------------
 src/mainboard/amd/mahogany/mainboard.c             |    1 -
 src/mainboard/amd/mahogany_fam10/chip.h            |   23 ---------------
 src/mainboard/amd/mahogany_fam10/mainboard.c       |    1 -
 src/mainboard/amd/norwich/chip.h                   |   23 ---------------
 src/mainboard/amd/norwich/mainboard.c              |    1 -
 src/mainboard/amd/parmer/chip.h                    |   22 ---------------
 src/mainboard/amd/parmer/mainboard.c               |    1 -
 src/mainboard/amd/persimmon/chip.h                 |   23 ---------------
 src/mainboard/amd/persimmon/mainboard.c            |    1 -
 src/mainboard/amd/pistachio/chip.h                 |   23 ---------------
 src/mainboard/amd/pistachio/mainboard.c            |    1 -
 src/mainboard/amd/rumba/chip.h                     |    5 ---
 src/mainboard/amd/rumba/mainboard.c                |    8 +----
 src/mainboard/amd/serengeti_cheetah/chip.h         |    3 --
 src/mainboard/amd/serengeti_cheetah/mainboard.c    |    1 -
 src/mainboard/amd/serengeti_cheetah_fam10/chip.h   |   23 ---------------
 .../amd/serengeti_cheetah_fam10/mainboard.c        |    1 -
 src/mainboard/amd/south_station/chip.h             |   23 ---------------
 src/mainboard/amd/south_station/mainboard.c        |    1 -
 src/mainboard/amd/tilapia_fam10/chip.h             |   23 ---------------
 src/mainboard/amd/tilapia_fam10/mainboard.c        |    1 -
 src/mainboard/amd/torpedo/chip.h                   |   23 ---------------
 src/mainboard/amd/torpedo/mainboard.c              |    1 -
 src/mainboard/amd/union_station/chip.h             |   23 ---------------
 src/mainboard/amd/union_station/mainboard.c        |    1 -
 src/mainboard/aopen/dxplplusu/chip.h               |    4 ---
 src/mainboard/aopen/dxplplusu/mainboard.c          |    1 -
 src/mainboard/arima/hdama/chip.h                   |    3 --
 src/mainboard/arima/hdama/mainboard.c              |    1 -
 src/mainboard/artecgroup/dbe61/chip.h              |    3 --
 src/mainboard/artecgroup/dbe61/mainboard.c         |    1 -
 src/mainboard/asi/mb_5blgp/chip.h                  |   22 ---------------
 src/mainboard/asi/mb_5blgp/mainboard.c             |    1 -
 src/mainboard/asi/mb_5blmp/chip.h                  |   23 ---------------
 src/mainboard/asi/mb_5blmp/mainboard.c             |    1 -
 src/mainboard/asrock/939a785gmh/chip.h             |   23 ---------------
 src/mainboard/asrock/939a785gmh/mainboard.c        |    1 -
 src/mainboard/asrock/e350m1/chip.h                 |   23 ---------------
 src/mainboard/asrock/e350m1/mainboard.c            |    1 -
 src/mainboard/asus/a8n_e/chip.h                    |   24 ----------------
 src/mainboard/asus/a8n_e/mainboard.c               |    1 -
 src/mainboard/asus/a8v-e_deluxe/chip.h             |   22 ---------------
 src/mainboard/asus/a8v-e_deluxe/mainboard.c        |    1 -
 src/mainboard/asus/a8v-e_se/chip.h                 |   22 ---------------
 src/mainboard/asus/a8v-e_se/mainboard.c            |    1 -
 src/mainboard/asus/dsbf/chip.h                     |   21 --------------
 src/mainboard/asus/dsbf/mainboard.c                |    1 -
 src/mainboard/asus/k8v-x/chip.h                    |   22 ---------------
 src/mainboard/asus/k8v-x/mainboard.c               |    1 -
 src/mainboard/asus/m2n-e/chip.h                    |   23 ---------------
 src/mainboard/asus/m2n-e/mainboard.c               |    1 -
 src/mainboard/asus/m2v-mx_se/chip.h                |   22 ---------------
 src/mainboard/asus/m2v-mx_se/mainboard.c           |    1 -
 src/mainboard/asus/m2v/chip.h                      |   22 ---------------
 src/mainboard/asus/m2v/mainboard.c                 |    1 -
 src/mainboard/asus/m4a78-em/chip.h                 |   23 ---------------
 src/mainboard/asus/m4a78-em/mainboard.c            |    1 -
 src/mainboard/asus/m4a785-m/chip.h                 |   23 ---------------
 src/mainboard/asus/m4a785-m/mainboard.c            |    1 -
 src/mainboard/asus/m4a785t-m/chip.h                |   23 ---------------
 src/mainboard/asus/m5a88-v/chip.h                  |   22 ---------------
 src/mainboard/asus/m5a88-v/mainboard.c             |    1 -
 src/mainboard/asus/mew-am/chip.h                   |   22 ---------------
 src/mainboard/asus/mew-am/mainboard.c              |    1 -
 src/mainboard/asus/mew-vm/chip.h                   |    3 --
 src/mainboard/asus/mew-vm/mainboard.c              |    1 -
 src/mainboard/asus/p2b-d/chip.h                    |   22 ---------------
 src/mainboard/asus/p2b-d/mainboard.c               |    1 -
 src/mainboard/asus/p2b-ds/chip.h                   |   22 ---------------
 src/mainboard/asus/p2b-ds/mainboard.c              |    1 -
 src/mainboard/asus/p2b-f/chip.h                    |   22 ---------------
 src/mainboard/asus/p2b-f/mainboard.c               |    1 -
 src/mainboard/asus/p2b-ls/chip.h                   |   22 ---------------
 src/mainboard/asus/p2b-ls/mainboard.c              |    1 -
 src/mainboard/asus/p2b/chip.h                      |   22 ---------------
 src/mainboard/asus/p2b/mainboard.c                 |    1 -
 src/mainboard/asus/p3b-f/chip.h                    |   22 ---------------
 src/mainboard/asus/p3b-f/mainboard.c               |    1 -
 src/mainboard/avalue/eax-785e/chip.h               |   22 ---------------
 src/mainboard/avalue/eax-785e/mainboard.c          |    5 ---
 src/mainboard/axus/tc320/chip.h                    |   22 ---------------
 src/mainboard/axus/tc320/mainboard.c               |    1 -
 src/mainboard/azza/pt-6ibd/chip.h                  |   22 ---------------
 src/mainboard/azza/pt-6ibd/mainboard.c             |    1 -
 src/mainboard/bachmann/ot200/chip.h                |   23 ---------------
 src/mainboard/bcom/winnet100/chip.h                |   23 ---------------
 src/mainboard/bcom/winnet100/mainboard.c           |    1 -
 src/mainboard/bcom/winnetp680/chip.h               |   24 ----------------
 src/mainboard/bcom/winnetp680/mainboard.c          |    1 -
 src/mainboard/bifferos/bifferboard/chip.h          |   23 ---------------
 src/mainboard/bifferos/bifferboard/mainboard.c     |    1 -
 src/mainboard/biostar/m6tba/chip.h                 |   22 ---------------
 src/mainboard/biostar/m6tba/mainboard.c            |    1 -
 src/mainboard/broadcom/blast/chip.h                |    3 --
 src/mainboard/broadcom/blast/mainboard.c           |    1 -
 src/mainboard/compaq/deskpro_en_sff_p600/chip.h    |   22 ---------------
 .../compaq/deskpro_en_sff_p600/mainboard.c         |    1 -
 src/mainboard/digitallogic/adl855pc/chip.h         |    3 --
 src/mainboard/digitallogic/adl855pc/mainboard.c    |    1 -
 src/mainboard/digitallogic/msm586seg/chip.h        |    3 --
 src/mainboard/digitallogic/msm586seg/mainboard.c   |    1 -
 src/mainboard/digitallogic/msm800sev/chip.h        |    3 --
 src/mainboard/digitallogic/msm800sev/mainboard.c   |    1 -
 src/mainboard/eaglelion/5bcm/chip.h                |    3 --
 src/mainboard/eaglelion/5bcm/mainboard.c           |    1 -
 src/mainboard/ecs/p6iwp-fe/chip.h                  |   22 ---------------
 src/mainboard/ecs/p6iwp-fe/mainboard.c             |    1 -
 src/mainboard/emulation/qemu-x86/mainboard.c       |    1 -
 src/mainboard/getac/p470/chip.h                    |   23 ---------------
 src/mainboard/getac/p470/mainboard.c               |    1 -
 src/mainboard/gigabyte/ga-6bxc/chip.h              |   22 ---------------
 src/mainboard/gigabyte/ga-6bxc/mainboard.c         |    1 -
 src/mainboard/gigabyte/ga-6bxe/chip.h              |   22 ---------------
 src/mainboard/gigabyte/ga-6bxe/mainboard.c         |    1 -
 src/mainboard/gigabyte/ga_2761gxdk/chip.h          |   24 ----------------
 src/mainboard/gigabyte/ga_2761gxdk/mainboard.c     |    1 -
 src/mainboard/gigabyte/m57sli/chip.h               |   24 ----------------
 src/mainboard/gigabyte/m57sli/mainboard.c          |    1 -
 src/mainboard/gigabyte/ma785gm/chip.h              |   23 ---------------
 src/mainboard/gigabyte/ma785gm/mainboard.c         |    1 -
 src/mainboard/gigabyte/ma785gmt/chip.h             |   23 ---------------
 src/mainboard/gigabyte/ma785gmt/mainboard.c        |    1 -
 src/mainboard/gigabyte/ma78gm/chip.h               |   23 ---------------
 src/mainboard/gigabyte/ma78gm/mainboard.c          |    1 -
 src/mainboard/hp/dl145_g1/chip.h                   |    3 --
 src/mainboard/hp/dl145_g1/mainboard.c              |    1 -
 src/mainboard/hp/dl145_g3/chip.h                   |   24 ----------------
 src/mainboard/hp/dl145_g3/mainboard.c              |    1 -
 src/mainboard/hp/dl165_g6_fam10/chip.h             |   26 -----------------
 src/mainboard/hp/dl165_g6_fam10/mainboard.c        |    1 -
 src/mainboard/hp/e_vectra_p2706t/chip.h            |   23 ---------------
 src/mainboard/hp/e_vectra_p2706t/mainboard.c       |    1 -
 src/mainboard/ibase/mb899/chip.h                   |   21 --------------
 src/mainboard/ibase/mb899/mainboard.c              |    1 -
 src/mainboard/ibm/e325/chip.h                      |    3 --
 src/mainboard/ibm/e325/mainboard.c                 |    1 -
 src/mainboard/ibm/e326/chip.h                      |    3 --
 src/mainboard/ibm/e326/mainboard.c                 |    1 -
 src/mainboard/iei/juki-511p/chip.h                 |   23 ---------------
 src/mainboard/iei/juki-511p/mainboard.c            |    1 -
 src/mainboard/iei/kino-780am2-fam10/chip.h         |   23 ---------------
 src/mainboard/iei/kino-780am2-fam10/mainboard.c    |    1 -
 src/mainboard/iei/nova4899r/chip.h                 |   23 ---------------
 src/mainboard/iei/nova4899r/mainboard.c            |    1 -
 src/mainboard/iei/pcisa-lx-800-r10/chip.h          |   23 ---------------
 src/mainboard/iei/pm-lx-800-r11/chip.h             |   23 ---------------
 src/mainboard/intel/d810e2cb/chip.h                |   21 --------------
 src/mainboard/intel/d810e2cb/mainboard.c           |    1 -
 src/mainboard/intel/d945gclf/chip.h                |   21 --------------
 src/mainboard/intel/d945gclf/mainboard.c           |    1 -
 src/mainboard/intel/eagleheights/chip.h            |   22 ---------------
 src/mainboard/intel/eagleheights/mainboard.c       |    1 -
 src/mainboard/intel/emeraldlake2/chip.h            |   21 --------------
 src/mainboard/intel/emeraldlake2/mainboard.c       |    1 -
 src/mainboard/intel/jarrell/chip.h                 |    3 --
 src/mainboard/intel/jarrell/mainboard.c            |    1 -
 src/mainboard/intel/mtarvon/chip.h                 |   22 ---------------
 src/mainboard/intel/mtarvon/mainboard.c            |    1 -
 src/mainboard/intel/truxton/chip.h                 |   22 ---------------
 src/mainboard/intel/truxton/mainboard.c            |    1 -
 src/mainboard/intel/xe7501devkit/chip.h            |    3 --
 src/mainboard/intel/xe7501devkit/mainboard.c       |    1 -
 src/mainboard/iwave/iWRainbowG6/chip.h             |   21 --------------
 src/mainboard/iwave/iWRainbowG6/mainboard.c        |    1 -
 src/mainboard/iwill/dk8_htx/chip.h                 |    3 --
 src/mainboard/iwill/dk8_htx/mainboard.c            |    1 -
 src/mainboard/iwill/dk8s2/chip.h                   |    3 --
 src/mainboard/iwill/dk8s2/mainboard.c              |    1 -
 src/mainboard/iwill/dk8x/chip.h                    |    3 --
 src/mainboard/iwill/dk8x/mainboard.c               |    1 -
 src/mainboard/jetway/j7f24/chip.h                  |   24 ----------------
 src/mainboard/jetway/j7f24/mainboard.c             |    1 -
 src/mainboard/jetway/pa78vm5/chip.h                |   24 ----------------
 src/mainboard/jetway/pa78vm5/mainboard.c           |    1 -
 src/mainboard/kontron/986lcd-m/chip.h              |   21 --------------
 src/mainboard/kontron/986lcd-m/mainboard.c         |    1 -
 src/mainboard/kontron/kt690/chip.h                 |   23 ---------------
 src/mainboard/kontron/kt690/mainboard.c            |    1 -
 src/mainboard/lanner/em8510/chip.h                 |   23 ---------------
 src/mainboard/lanner/em8510/mainboard.c            |    1 -
 src/mainboard/lenovo/t60/chip.h                    |   21 --------------
 src/mainboard/lenovo/t60/mainboard.c               |    1 -
 src/mainboard/lenovo/x60/chip.h                    |   21 --------------
 src/mainboard/lenovo/x60/mainboard.c               |    1 -
 src/mainboard/lippert/frontrunner/chip.h           |    3 --
 src/mainboard/lippert/frontrunner/mainboard.c      |    1 -
 src/mainboard/lippert/hurricane-lx/chip.h          |   23 ---------------
 src/mainboard/lippert/hurricane-lx/mainboard.c     |    1 -
 src/mainboard/lippert/literunner-lx/chip.h         |   23 ---------------
 src/mainboard/lippert/literunner-lx/mainboard.c    |    1 -
 src/mainboard/lippert/roadrunner-lx/chip.h         |   23 ---------------
 src/mainboard/lippert/roadrunner-lx/mainboard.c    |    1 -
 src/mainboard/lippert/spacerunner-lx/chip.h        |   23 ---------------
 src/mainboard/lippert/spacerunner-lx/mainboard.c   |    1 -
 src/mainboard/mitac/6513wu/chip.h                  |   22 ---------------
 src/mainboard/mitac/6513wu/mainboard.c             |    1 -
 src/mainboard/msi/ms6119/chip.h                    |   22 ---------------
 src/mainboard/msi/ms6119/mainboard.c               |    1 -
 src/mainboard/msi/ms6147/chip.h                    |   22 ---------------
 src/mainboard/msi/ms6147/mainboard.c               |    1 -
 src/mainboard/msi/ms6156/chip.h                    |   22 ---------------
 src/mainboard/msi/ms6156/mainboard.c               |    1 -
 src/mainboard/msi/ms6178/chip.h                    |   23 ---------------
 src/mainboard/msi/ms6178/mainboard.c               |    1 -
 src/mainboard/msi/ms7135/chip.h                    |   23 ---------------
 src/mainboard/msi/ms7135/mainboard.c               |    1 -
 src/mainboard/msi/ms7260/chip.h                    |   23 ---------------
 src/mainboard/msi/ms7260/mainboard.c               |    1 -
 src/mainboard/msi/ms9185/chip.h                    |   25 -----------------
 src/mainboard/msi/ms9185/mainboard.c               |    1 -
 src/mainboard/msi/ms9282/chip.h                    |   24 ----------------
 src/mainboard/msi/ms9282/mainboard.c               |    1 -
 src/mainboard/msi/ms9652_fam10/chip.h              |   24 ----------------
 src/mainboard/msi/ms9652_fam10/mainboard.c         |    1 -
 src/mainboard/nec/powermate2000/chip.h             |   23 ---------------
 src/mainboard/nec/powermate2000/mainboard.c        |    1 -
 src/mainboard/newisys/khepri/chip.h                |    3 --
 src/mainboard/newisys/khepri/mainboard.c           |    1 -
 src/mainboard/nokia/ip530/chip.h                   |   22 ---------------
 src/mainboard/nokia/ip530/mainboard.c              |    1 -
 src/mainboard/nvidia/l1_2pvv/chip.h                |   24 ----------------
 src/mainboard/nvidia/l1_2pvv/mainboard.c           |    1 -
 src/mainboard/pcengines/alix1c/chip.h              |   22 ---------------
 src/mainboard/pcengines/alix1c/mainboard.c         |    1 -
 src/mainboard/pcengines/alix2d/chip.h              |   22 ---------------
 src/mainboard/pcengines/alix2d/mainboard.c         |    1 -
 src/mainboard/rca/rm4100/chip.h                    |   23 ---------------
 src/mainboard/rca/rm4100/mainboard.c               |    1 -
 src/mainboard/roda/rk886ex/chip.h                  |   21 --------------
 src/mainboard/roda/rk886ex/mainboard.c             |    1 -
 src/mainboard/samsung/lumpy/chip.h                 |   21 --------------
 src/mainboard/samsung/lumpy/mainboard.c            |    1 -
 src/mainboard/samsung/stumpy/chip.h                |   21 --------------
 src/mainboard/samsung/stumpy/mainboard.c           |    1 -
 src/mainboard/siemens/sitemp_g1p1/chip.h           |   29 --------------------
 src/mainboard/siemens/sitemp_g1p1/mainboard.c      |   16 +++++-----
 src/mainboard/soyo/sy-6ba-plus-iii/chip.h          |   22 ---------------
 src/mainboard/soyo/sy-6ba-plus-iii/mainboard.c     |    1 -
 src/mainboard/sunw/ultra40/chip.h                  |    3 --
 src/mainboard/sunw/ultra40/mainboard.c             |    1 -
 src/mainboard/supermicro/h8dme/chip.h              |   21 --------------
 src/mainboard/supermicro/h8dme/mainboard.c         |    1 -
 src/mainboard/supermicro/h8dmr/chip.h              |   24 ----------------
 src/mainboard/supermicro/h8dmr/mainboard.c         |    1 -
 src/mainboard/supermicro/h8dmr_fam10/chip.h        |   24 ----------------
 src/mainboard/supermicro/h8dmr_fam10/mainboard.c   |    1 -
 src/mainboard/supermicro/h8qgi/chip.h              |   23 ---------------
 src/mainboard/supermicro/h8qgi/mainboard.c         |    1 -
 src/mainboard/supermicro/h8qme_fam10/chip.h        |   24 ----------------
 src/mainboard/supermicro/h8qme_fam10/mainboard.c   |    1 -
 src/mainboard/supermicro/h8scm_fam10/chip.h        |   23 ---------------
 src/mainboard/supermicro/h8scm_fam10/mainboard.c   |    5 ---
 src/mainboard/supermicro/x6dai_g/chip.h            |    3 --
 src/mainboard/supermicro/x6dai_g/mainboard.c       |    1 -
 src/mainboard/supermicro/x6dhe_g/chip.h            |    3 --
 src/mainboard/supermicro/x6dhe_g/mainboard.c       |    1 -
 src/mainboard/supermicro/x6dhe_g2/chip.h           |    3 --
 src/mainboard/supermicro/x6dhe_g2/mainboard.c      |    1 -
 src/mainboard/supermicro/x6dhr_ig/chip.h           |    3 --
 src/mainboard/supermicro/x6dhr_ig/mainboard.c      |    1 -
 src/mainboard/supermicro/x6dhr_ig2/chip.h          |    3 --
 src/mainboard/supermicro/x6dhr_ig2/mainboard.c     |    1 -
 src/mainboard/supermicro/x7db8/chip.h              |   21 --------------
 src/mainboard/supermicro/x7db8/mainboard.c         |    1 -
 src/mainboard/technexion/tim5690/chip.h            |   23 ---------------
 src/mainboard/technexion/tim5690/mainboard.c       |    1 -
 src/mainboard/technexion/tim8690/chip.h            |   23 ---------------
 src/mainboard/technexion/tim8690/mainboard.c       |    1 -
 src/mainboard/technologic/ts5300/chip.h            |    3 --
 src/mainboard/technologic/ts5300/mainboard.c       |    1 -
 src/mainboard/televideo/tc7020/chip.h              |   23 ---------------
 src/mainboard/televideo/tc7020/mainboard.c         |    1 -
 src/mainboard/thomson/ip1000/chip.h                |   23 ---------------
 src/mainboard/thomson/ip1000/mainboard.c           |    1 -
 src/mainboard/traverse/geos/chip.h                 |   23 ---------------
 src/mainboard/traverse/geos/mainboard.c            |    1 -
 src/mainboard/tyan/s1846/chip.h                    |   22 ---------------
 src/mainboard/tyan/s1846/mainboard.c               |    1 -
 src/mainboard/tyan/s2735/chip.h                    |    3 --
 src/mainboard/tyan/s2735/mainboard.c               |    1 -
 src/mainboard/tyan/s2850/chip.h                    |    3 --
 src/mainboard/tyan/s2850/mainboard.c               |    1 -
 src/mainboard/tyan/s2875/chip.h                    |    3 --
 src/mainboard/tyan/s2875/mainboard.c               |    1 -
 src/mainboard/tyan/s2880/chip.h                    |    3 --
 src/mainboard/tyan/s2880/mainboard.c               |    1 -
 src/mainboard/tyan/s2881/chip.h                    |    3 --
 src/mainboard/tyan/s2881/mainboard.c               |    1 -
 src/mainboard/tyan/s2882/chip.h                    |    3 --
 src/mainboard/tyan/s2882/mainboard.c               |    1 -
 src/mainboard/tyan/s2885/chip.h                    |    3 --
 src/mainboard/tyan/s2885/mainboard.c               |    1 -
 src/mainboard/tyan/s2891/chip.h                    |    3 --
 src/mainboard/tyan/s2891/mainboard.c               |    1 -
 src/mainboard/tyan/s2892/chip.h                    |    3 --
 src/mainboard/tyan/s2892/mainboard.c               |    1 -
 src/mainboard/tyan/s2895/chip.h                    |    3 --
 src/mainboard/tyan/s2895/mainboard.c               |    1 -
 src/mainboard/tyan/s2912/chip.h                    |   24 ----------------
 src/mainboard/tyan/s2912/mainboard.c               |    1 -
 src/mainboard/tyan/s2912_fam10/chip.h              |   24 ----------------
 src/mainboard/tyan/s2912_fam10/mainboard.c         |    1 -
 src/mainboard/tyan/s4880/chip.h                    |    3 --
 src/mainboard/tyan/s4880/mainboard.c               |    1 -
 src/mainboard/tyan/s4882/chip.h                    |    3 --
 src/mainboard/tyan/s4882/mainboard.c               |    1 -
 src/mainboard/via/epia-cn/chip.h                   |   24 ----------------
 src/mainboard/via/epia-cn/mainboard.c              |    1 -
 src/mainboard/via/epia-m/chip.h                    |    3 --
 src/mainboard/via/epia-m/mainboard.c               |    1 -
 src/mainboard/via/epia-m700/chip.h                 |   23 ---------------
 src/mainboard/via/epia-m700/mainboard.c            |    1 -
 src/mainboard/via/epia-n/chip.h                    |   24 ----------------
 src/mainboard/via/epia-n/mainboard.c               |    1 -
 src/mainboard/via/epia/chip.h                      |    3 --
 src/mainboard/via/epia/mainboard.c                 |    1 -
 src/mainboard/via/pc2500e/chip.h                   |   23 ---------------
 src/mainboard/via/pc2500e/mainboard.c              |    1 -
 src/mainboard/via/vt8454c/chip.h                   |   22 ---------------
 src/mainboard/via/vt8454c/mainboard.c              |    1 -
 src/mainboard/winent/pl6064/chip.h                 |   23 ---------------
 src/mainboard/winent/pl6064/mainboard.c            |    1 -
 src/mainboard/wyse/s50/chip.h                      |   22 ---------------
 src/mainboard/wyse/s50/mainboard.c                 |    1 -
 util/sconfig/main.c                                |   13 +++++++-
 348 files changed, 21 insertions(+), 3343 deletions(-)

diff --git a/src/mainboard/a-trend/atc-6220/chip.h b/src/mainboard/a-trend/atc-6220/chip.h
deleted file mode 100644
index dc9bed3..0000000
--- a/src/mainboard/a-trend/atc-6220/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/a-trend/atc-6220/mainboard.c b/src/mainboard/a-trend/atc-6220/mainboard.c
index f30ebfa..26f18dd 100644
--- a/src/mainboard/a-trend/atc-6220/mainboard.c
+++ b/src/mainboard/a-trend/atc-6220/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("A-Trend ATC-6220 Mainboard")
diff --git a/src/mainboard/a-trend/atc-6240/chip.h b/src/mainboard/a-trend/atc-6240/chip.h
deleted file mode 100644
index 56e17ca..0000000
--- a/src/mainboard/a-trend/atc-6240/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/a-trend/atc-6240/mainboard.c b/src/mainboard/a-trend/atc-6240/mainboard.c
index 0e09ea3..13f6e3f 100644
--- a/src/mainboard/a-trend/atc-6240/mainboard.c
+++ b/src/mainboard/a-trend/atc-6240/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("A-Trend ATC-6240 Mainboard")
diff --git a/src/mainboard/aaeon/pfm-540i_revb/chip.h b/src/mainboard/aaeon/pfm-540i_revb/chip.h
deleted file mode 100644
index c8c54b0..0000000
--- a/src/mainboard/aaeon/pfm-540i_revb/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Mark Norman <mpnorman at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/aaeon/pfm-540i_revb/mainboard.c b/src/mainboard/aaeon/pfm-540i_revb/mainboard.c
index 72e500c..8f1412f 100644
--- a/src/mainboard/aaeon/pfm-540i_revb/mainboard.c
+++ b/src/mainboard/aaeon/pfm-540i_revb/mainboard.c
@@ -19,7 +19,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include "chip.h"
 
 static void init(struct device *dev)
 {
diff --git a/src/mainboard/abit/be6-ii_v2_0/chip.h b/src/mainboard/abit/be6-ii_v2_0/chip.h
deleted file mode 100644
index dc9bed3..0000000
--- a/src/mainboard/abit/be6-ii_v2_0/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/abit/be6-ii_v2_0/mainboard.c b/src/mainboard/abit/be6-ii_v2_0/mainboard.c
index 6fc23ec..c70df95 100644
--- a/src/mainboard/abit/be6-ii_v2_0/mainboard.c
+++ b/src/mainboard/abit/be6-ii_v2_0/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Abit BE6-II V2.0 Mainboard")
diff --git a/src/mainboard/advansus/a785e-i/chip.h b/src/mainboard/advansus/a785e-i/chip.h
deleted file mode 100644
index 5957589..0000000
--- a/src/mainboard/advansus/a785e-i/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/advansus/a785e-i/mainboard.c b/src/mainboard/advansus/a785e-i/mainboard.c
index d3530cf..6c190f0 100644
--- a/src/mainboard/advansus/a785e-i/mainboard.c
+++ b/src/mainboard/advansus/a785e-i/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
 #include "SBPLATFORM.h"
-#include "chip.h"
 
 
 u8 is_dev3_present(void);
@@ -77,10 +76,6 @@ u8 is_dev3_present(void)
 *************************************************/
 static void a785e_i_enable(device_t dev)
 {
-	/* Leave it for furture use. */
-	/* struct mainboard_config *mainboard =
-	   (struct mainboard_config *)dev->chip_info; */
-
 	printk(BIOS_INFO, "Mainboard A785E-I Enable. dev=0x%p\n", dev);
 
 	setup_uma_memory();
diff --git a/src/mainboard/advantech/pcm-5820/chip.h b/src/mainboard/advantech/pcm-5820/chip.h
deleted file mode 100644
index dc9bed3..0000000
--- a/src/mainboard/advantech/pcm-5820/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/advantech/pcm-5820/mainboard.c b/src/mainboard/advantech/pcm-5820/mainboard.c
index 4256059..345c6f8 100644
--- a/src/mainboard/advantech/pcm-5820/mainboard.c
+++ b/src/mainboard/advantech/pcm-5820/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Advantech PCM-5820 Mainboard")
diff --git a/src/mainboard/amd/bimini_fam10/chip.h b/src/mainboard/amd/bimini_fam10/chip.h
deleted file mode 100644
index 2013516..0000000
--- a/src/mainboard/amd/bimini_fam10/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/amd/bimini_fam10/mainboard.c b/src/mainboard/amd/bimini_fam10/mainboard.c
index e2706c5..f587ac1 100644
--- a/src/mainboard/amd/bimini_fam10/mainboard.c
+++ b/src/mainboard/amd/bimini_fam10/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
 #include <southbridge/amd/sb800/sb800.h>
-#include "chip.h"
 
 
 u8 is_dev3_present(void);
@@ -127,10 +126,6 @@ static void get_ide_dma66(void)
 *************************************************/
 static void bimini_enable(device_t dev)
 {
-	/* Leave it for furture use. */
-	/* struct mainboard_config *mainboard =
-	   (struct mainboard_config *)dev->chip_info; */
-
 	printk(BIOS_INFO, "Mainboard BIMINI Enable. dev=0x%p\n", dev);
 
 	setup_uma_memory();
diff --git a/src/mainboard/amd/db800/chip.h b/src/mainboard/amd/db800/chip.h
deleted file mode 100644
index ae69536..0000000
--- a/src/mainboard/amd/db800/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/amd/db800/mainboard.c b/src/mainboard/amd/db800/mainboard.c
index f95ea22..e841d07 100644
--- a/src/mainboard/amd/db800/mainboard.c
+++ b/src/mainboard/amd/db800/mainboard.c
@@ -19,7 +19,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include "chip.h"
 
 static void init(struct device *dev)
 {
diff --git a/src/mainboard/amd/dbm690t/chip.h b/src/mainboard/amd/dbm690t/chip.h
deleted file mode 100644
index 9ee2dc8..0000000
--- a/src/mainboard/amd/dbm690t/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/amd/dbm690t/mainboard.c b/src/mainboard/amd/dbm690t/mainboard.c
index df79b34..fbff55b 100644
--- a/src/mainboard/amd/dbm690t/mainboard.c
+++ b/src/mainboard/amd/dbm690t/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
 #include <southbridge/amd/sb600/sb600.h>
-#include "chip.h"
 
 #define ADT7461_ADDRESS 0x4C
 #define ARA_ADDRESS     0x0C /* Alert Response Address */
diff --git a/src/mainboard/amd/dinar/chip.h b/src/mainboard/amd/dinar/chip.h
deleted file mode 100644
index 42630fa..0000000
--- a/src/mainboard/amd/dinar/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/amd/dinar/mainboard.c b/src/mainboard/amd/dinar/mainboard.c
index 0d4015b..6301b4f 100644
--- a/src/mainboard/amd/dinar/mainboard.c
+++ b/src/mainboard/amd/dinar/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
 #include <NbPlatform.h>
-#include "chip.h"
 
 //#define SMBUS_IO_BASE 0x6000
 
diff --git a/src/mainboard/amd/inagua/chip.h b/src/mainboard/amd/inagua/chip.h
deleted file mode 100644
index a252705..0000000
--- a/src/mainboard/amd/inagua/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/amd/inagua/mainboard.c b/src/mainboard/amd/inagua/mainboard.c
index 5291165..dc83258 100644
--- a/src/mainboard/amd/inagua/mainboard.c
+++ b/src/mainboard/amd/inagua/mainboard.c
@@ -27,7 +27,6 @@
 #include <device/pci_def.h>
 //#include <southbridge/amd/sb800/sb800.h>
 #include "SBPLATFORM.h" 	/* Platfrom Specific Definitions */
-#include "chip.h"
 
 void set_pcie_reset(void);
 void set_pcie_dereset(void);
diff --git a/src/mainboard/amd/mahogany/chip.h b/src/mainboard/amd/mahogany/chip.h
deleted file mode 100644
index 42664d0..0000000
--- a/src/mainboard/amd/mahogany/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/amd/mahogany/mainboard.c b/src/mainboard/amd/mahogany/mainboard.c
index 46ce2d2..43ea66f 100644
--- a/src/mainboard/amd/mahogany/mainboard.c
+++ b/src/mainboard/amd/mahogany/mainboard.c
@@ -27,7 +27,6 @@
 #include <device/pci_def.h>
 #include "southbridge/amd/sb700/sb700.h"
 #include "southbridge/amd/sb700/smbus.h"
-#include "chip.h"
 
 void set_pcie_dereset(void);
 void set_pcie_reset(void);
diff --git a/src/mainboard/amd/mahogany_fam10/chip.h b/src/mainboard/amd/mahogany_fam10/chip.h
deleted file mode 100644
index a98b97e..0000000
--- a/src/mainboard/amd/mahogany_fam10/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/amd/mahogany_fam10/mainboard.c b/src/mainboard/amd/mahogany_fam10/mainboard.c
index 6245e5f..b47cdff 100644
--- a/src/mainboard/amd/mahogany_fam10/mainboard.c
+++ b/src/mainboard/amd/mahogany_fam10/mainboard.c
@@ -27,7 +27,6 @@
 #include <device/pci_def.h>
 #include "southbridge/amd/sb700/sb700.h"
 #include "southbridge/amd/sb700/smbus.h"
-#include "chip.h"
 
 void set_pcie_dereset(void);
 void set_pcie_reset(void);
diff --git a/src/mainboard/amd/norwich/chip.h b/src/mainboard/amd/norwich/chip.h
deleted file mode 100644
index ae69536..0000000
--- a/src/mainboard/amd/norwich/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/amd/norwich/mainboard.c b/src/mainboard/amd/norwich/mainboard.c
index 0814a16..c735abb 100644
--- a/src/mainboard/amd/norwich/mainboard.c
+++ b/src/mainboard/amd/norwich/mainboard.c
@@ -19,7 +19,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include "chip.h"
 
 static void init(struct device *dev)
 {
diff --git a/src/mainboard/amd/parmer/chip.h b/src/mainboard/amd/parmer/chip.h
deleted file mode 100644
index 352a6ff..0000000
--- a/src/mainboard/amd/parmer/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/amd/parmer/mainboard.c b/src/mainboard/amd/parmer/mainboard.c
index bf04d30..dae70c1 100644
--- a/src/mainboard/amd/parmer/mainboard.c
+++ b/src/mainboard/amd/parmer/mainboard.c
@@ -28,7 +28,6 @@
 #include <arch/acpi.h>
 #include "BiosCallOuts.h"
 #include <cpu/amd/agesa/s3_resume.h>
-#include "chip.h"
 #include "agesawrapper.h"
 
 /*************************************************
diff --git a/src/mainboard/amd/persimmon/chip.h b/src/mainboard/amd/persimmon/chip.h
deleted file mode 100644
index a252705..0000000
--- a/src/mainboard/amd/persimmon/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/amd/persimmon/mainboard.c b/src/mainboard/amd/persimmon/mainboard.c
index 86172ba..aa3bc1b 100644
--- a/src/mainboard/amd/persimmon/mainboard.c
+++ b/src/mainboard/amd/persimmon/mainboard.c
@@ -26,7 +26,6 @@
 #include <device/pci_def.h>
 #include <southbridge/amd/sb800/sb800.h>
 #include <arch/acpi.h>
-#include "chip.h"
 #include "BiosCallOuts.h"
 #include <cpu/amd/agesa/s3_resume.h>
 #include <cpu/amd/mtrr.h>
diff --git a/src/mainboard/amd/pistachio/chip.h b/src/mainboard/amd/pistachio/chip.h
deleted file mode 100644
index 05e1582..0000000
--- a/src/mainboard/amd/pistachio/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
-
diff --git a/src/mainboard/amd/pistachio/mainboard.c b/src/mainboard/amd/pistachio/mainboard.c
index 4cd1c94..1355c37 100644
--- a/src/mainboard/amd/pistachio/mainboard.c
+++ b/src/mainboard/amd/pistachio/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
 #include <southbridge/amd/sb600/sb600.h>
-#include "chip.h"
 
 #define ADT7475_ADDRESS 0x2E
 #define SMBUS_IO_BASE 0x1000
diff --git a/src/mainboard/amd/rumba/chip.h b/src/mainboard/amd/rumba/chip.h
deleted file mode 100644
index 2094b23..0000000
--- a/src/mainboard/amd/rumba/chip.h
+++ /dev/null
@@ -1,5 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {
-	int nicirq;
-};
diff --git a/src/mainboard/amd/rumba/mainboard.c b/src/mainboard/amd/rumba/mainboard.c
index 0e7bbb6..42547cc 100644
--- a/src/mainboard/amd/rumba/mainboard.c
+++ b/src/mainboard/amd/rumba/mainboard.c
@@ -4,18 +4,14 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <arch/io.h>
-#include "chip.h"
 
-static void init(struct device *dev) {
-	struct mainboard_config  *mainboard = (struct mainboard_config*)dev->chip_info;
+static void init(struct device *dev)
+{
 	device_t nic = NULL;
 	unsigned bus = 0;
 	unsigned devfn = PCI_DEVFN(0xd, 0);
 	int nicirq = 1;
 
-	if (mainboard->nicirq)
-		nicirq = mainboard->nicirq;
-
 	printk(BIOS_DEBUG, "AMD RUMBA ENTER %s\n", __func__);
 
 	if (nicirq) {
diff --git a/src/mainboard/amd/serengeti_cheetah/chip.h b/src/mainboard/amd/serengeti_cheetah/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/amd/serengeti_cheetah/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/amd/serengeti_cheetah/mainboard.c b/src/mainboard/amd/serengeti_cheetah/mainboard.c
index 4fb715f..a156f2e 100644
--- a/src/mainboard/amd/serengeti_cheetah/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("AMD Serengeti Cheetah Mainboard")
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/chip.h b/src/mainboard/amd/serengeti_cheetah_fam10/chip.h
deleted file mode 100644
index df1a3eb..0000000
--- a/src/mainboard/amd/serengeti_cheetah_fam10/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
index ba1ee9c..9984bd6 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
@@ -23,7 +23,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("AMD family 10 Cheetah mainboard")
diff --git a/src/mainboard/amd/south_station/chip.h b/src/mainboard/amd/south_station/chip.h
deleted file mode 100644
index a252705..0000000
--- a/src/mainboard/amd/south_station/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/amd/south_station/mainboard.c b/src/mainboard/amd/south_station/mainboard.c
index 3d5137c..715b40a 100644
--- a/src/mainboard/amd/south_station/mainboard.c
+++ b/src/mainboard/amd/south_station/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
 #include "SBPLATFORM.h" 	/* Platfrom Specific Definitions */
-#include "chip.h"
 
 
 void set_pcie_reset(void);
diff --git a/src/mainboard/amd/tilapia_fam10/chip.h b/src/mainboard/amd/tilapia_fam10/chip.h
deleted file mode 100644
index a98b97e..0000000
--- a/src/mainboard/amd/tilapia_fam10/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/amd/tilapia_fam10/mainboard.c b/src/mainboard/amd/tilapia_fam10/mainboard.c
index 03735f4..cf3e3d3 100644
--- a/src/mainboard/amd/tilapia_fam10/mainboard.c
+++ b/src/mainboard/amd/tilapia_fam10/mainboard.c
@@ -27,7 +27,6 @@
 #include <device/pci_def.h>
 #include <southbridge/amd/sb700/sb700.h>
 #include "southbridge/amd/sb700/smbus.h"
-#include "chip.h"
 
 #define ADT7461_ADDRESS 0x4C
 #define ARA_ADDRESS     0x0C /* Alert Response Address */
diff --git a/src/mainboard/amd/torpedo/chip.h b/src/mainboard/amd/torpedo/chip.h
deleted file mode 100644
index a252705..0000000
--- a/src/mainboard/amd/torpedo/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/amd/torpedo/mainboard.c b/src/mainboard/amd/torpedo/mainboard.c
index 29909b0..839ec5c 100644
--- a/src/mainboard/amd/torpedo/mainboard.c
+++ b/src/mainboard/amd/torpedo/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
 //#include <southbridge/amd/sb900/sb900.h>
-#include "chip.h"
 
 #define ONE_MB  0x100000
 //#define SMBUS_IO_BASE 0x6000
diff --git a/src/mainboard/amd/union_station/chip.h b/src/mainboard/amd/union_station/chip.h
deleted file mode 100644
index a252705..0000000
--- a/src/mainboard/amd/union_station/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/amd/union_station/mainboard.c b/src/mainboard/amd/union_station/mainboard.c
index a08938c..f0f610a 100644
--- a/src/mainboard/amd/union_station/mainboard.c
+++ b/src/mainboard/amd/union_station/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
 #include "SBPLATFORM.h" 	/* Platfrom Specific Definitions */
-#include "chip.h"
 
 void set_pcie_reset(void);
 void set_pcie_dereset(void);
diff --git a/src/mainboard/aopen/dxplplusu/chip.h b/src/mainboard/aopen/dxplplusu/chip.h
deleted file mode 100644
index 06f11d0..0000000
--- a/src/mainboard/aopen/dxplplusu/chip.h
+++ /dev/null
@@ -1,4 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {
-};
diff --git a/src/mainboard/aopen/dxplplusu/mainboard.c b/src/mainboard/aopen/dxplplusu/mainboard.c
index 2d41509..0688914 100644
--- a/src/mainboard/aopen/dxplplusu/mainboard.c
+++ b/src/mainboard/aopen/dxplplusu/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("AOpen DXPL Plus-U Mainboard")
diff --git a/src/mainboard/arima/hdama/chip.h b/src/mainboard/arima/hdama/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/arima/hdama/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/arima/hdama/mainboard.c b/src/mainboard/arima/hdama/mainboard.c
index 688a01c..df658e2 100644
--- a/src/mainboard/arima/hdama/mainboard.c
+++ b/src/mainboard/arima/hdama/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Arima HDAMA Mainboard")
diff --git a/src/mainboard/artecgroup/dbe61/chip.h b/src/mainboard/artecgroup/dbe61/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/artecgroup/dbe61/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/artecgroup/dbe61/mainboard.c b/src/mainboard/artecgroup/dbe61/mainboard.c
index f49c215..649f955 100644
--- a/src/mainboard/artecgroup/dbe61/mainboard.c
+++ b/src/mainboard/artecgroup/dbe61/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/lxdef.h>
 #include "southbridge/amd/cs5536/cs5536.h"
-#include "chip.h"
 
 static void init_gpio(void)
 {
diff --git a/src/mainboard/asi/mb_5blgp/chip.h b/src/mainboard/asi/mb_5blgp/chip.h
deleted file mode 100644
index 56e17ca..0000000
--- a/src/mainboard/asi/mb_5blgp/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/asi/mb_5blgp/mainboard.c b/src/mainboard/asi/mb_5blgp/mainboard.c
index 22bc52d..7a466bd 100644
--- a/src/mainboard/asi/mb_5blgp/mainboard.c
+++ b/src/mainboard/asi/mb_5blgp/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASI MB-5BLGP Mainboard")
diff --git a/src/mainboard/asi/mb_5blmp/chip.h b/src/mainboard/asi/mb_5blmp/chip.h
deleted file mode 100644
index 982cfb3..0000000
--- a/src/mainboard/asi/mb_5blmp/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/asi/mb_5blmp/mainboard.c b/src/mainboard/asi/mb_5blmp/mainboard.c
index 78366ba..9aaf14d 100644
--- a/src/mainboard/asi/mb_5blmp/mainboard.c
+++ b/src/mainboard/asi/mb_5blmp/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASI/BCom MB-5BLMP Mainboard")
diff --git a/src/mainboard/asrock/939a785gmh/chip.h b/src/mainboard/asrock/939a785gmh/chip.h
deleted file mode 100644
index be42783..0000000
--- a/src/mainboard/asrock/939a785gmh/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
-
diff --git a/src/mainboard/asrock/939a785gmh/mainboard.c b/src/mainboard/asrock/939a785gmh/mainboard.c
index ec050cb..d3ea27e 100644
--- a/src/mainboard/asrock/939a785gmh/mainboard.c
+++ b/src/mainboard/asrock/939a785gmh/mainboard.c
@@ -27,7 +27,6 @@
 #include <device/pci_def.h>
 #include "southbridge/amd/sb700/sb700.h"
 #include "southbridge/amd/sb700/smbus.h"
-#include "chip.h"
 
 void set_pcie_dereset(void);
 void set_pcie_reset(void);
diff --git a/src/mainboard/asrock/e350m1/chip.h b/src/mainboard/asrock/e350m1/chip.h
deleted file mode 100644
index a252705..0000000
--- a/src/mainboard/asrock/e350m1/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/asrock/e350m1/mainboard.c b/src/mainboard/asrock/e350m1/mainboard.c
index 5859ae4..d0151be 100644
--- a/src/mainboard/asrock/e350m1/mainboard.c
+++ b/src/mainboard/asrock/e350m1/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
 //#include <southbridge/amd/sb800/sb800.h>
-#include "chip.h"
 
 //#define SMBUS_IO_BASE 0x6000
 
diff --git a/src/mainboard/asus/a8n_e/chip.h b/src/mainboard/asus/a8n_e/chip.h
deleted file mode 100644
index 1b910e6..0000000
--- a/src/mainboard/asus/a8n_e/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Philipp Degler <pdegler at rumms.uni-mannheim.de>
- * (Thanks to LSRA University of Mannheim for their support)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/asus/a8n_e/mainboard.c b/src/mainboard/asus/a8n_e/mainboard.c
index 4bd6311..aedca67 100644
--- a/src/mainboard/asus/a8n_e/mainboard.c
+++ b/src/mainboard/asus/a8n_e/mainboard.c
@@ -20,7 +20,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS A8N-E Mainboard")
diff --git a/src/mainboard/asus/a8v-e_deluxe/chip.h b/src/mainboard/asus/a8v-e_deluxe/chip.h
deleted file mode 100644
index c2849ef..0000000
--- a/src/mainboard/asus/a8v-e_deluxe/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Rudolf Marek <r.marek at assembler.cz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/asus/a8v-e_deluxe/mainboard.c b/src/mainboard/asus/a8v-e_deluxe/mainboard.c
index 0180a2f..cb38be2 100644
--- a/src/mainboard/asus/a8v-e_deluxe/mainboard.c
+++ b/src/mainboard/asus/a8v-e_deluxe/mainboard.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS A8V-E Deluxe Mainboard")
diff --git a/src/mainboard/asus/a8v-e_se/chip.h b/src/mainboard/asus/a8v-e_se/chip.h
deleted file mode 100644
index c2849ef..0000000
--- a/src/mainboard/asus/a8v-e_se/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Rudolf Marek <r.marek at assembler.cz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/asus/a8v-e_se/mainboard.c b/src/mainboard/asus/a8v-e_se/mainboard.c
index b70f396..c119e1c 100644
--- a/src/mainboard/asus/a8v-e_se/mainboard.c
+++ b/src/mainboard/asus/a8v-e_se/mainboard.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS A8V-E SE Mainboard")
diff --git a/src/mainboard/asus/dsbf/chip.h b/src/mainboard/asus/dsbf/chip.h
deleted file mode 100644
index 70f9bb4..0000000
--- a/src/mainboard/asus/dsbf/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (c) 2011 Sven Schnelle <svens at stackframe.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/asus/dsbf/mainboard.c b/src/mainboard/asus/dsbf/mainboard.c
index 27a26f9..618eca9 100644
--- a/src/mainboard/asus/dsbf/mainboard.c
+++ b/src/mainboard/asus/dsbf/mainboard.c
@@ -25,7 +25,6 @@
 #include <boot/tables.h>
 #include <delay.h>
 #include <arch/coreboot_tables.h>
-#include "chip.h"
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <arch/io.h>
diff --git a/src/mainboard/asus/k8v-x/chip.h b/src/mainboard/asus/k8v-x/chip.h
deleted file mode 100644
index c2849ef..0000000
--- a/src/mainboard/asus/k8v-x/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Rudolf Marek <r.marek at assembler.cz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/asus/k8v-x/mainboard.c b/src/mainboard/asus/k8v-x/mainboard.c
index 3e294b8..82d8ba0 100644
--- a/src/mainboard/asus/k8v-x/mainboard.c
+++ b/src/mainboard/asus/k8v-x/mainboard.c
@@ -24,7 +24,6 @@
 #include <device/pci_ids.h>
 #include <arch/io.h>
 #include "southbridge/via/vt8237r/vt8237r.h"
-#include "chip.h"
 
 u32 vt8237_ide_80pin_detect(struct device *dev)
 {
diff --git a/src/mainboard/asus/m2n-e/chip.h b/src/mainboard/asus/m2n-e/chip.h
deleted file mode 100644
index a69b9ef..0000000
--- a/src/mainboard/asus/m2n-e/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/asus/m2n-e/mainboard.c b/src/mainboard/asus/m2n-e/mainboard.c
index aa0cc5c..0d7013f 100644
--- a/src/mainboard/asus/m2n-e/mainboard.c
+++ b/src/mainboard/asus/m2n-e/mainboard.c
@@ -20,7 +20,6 @@
 
 #include <device/device.h>
 #include "hda_verb.h"
-#include "chip.h"
 
 static void verb_setup(void)
 {
diff --git a/src/mainboard/asus/m2v-mx_se/chip.h b/src/mainboard/asus/m2v-mx_se/chip.h
deleted file mode 100644
index c2849ef..0000000
--- a/src/mainboard/asus/m2v-mx_se/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Rudolf Marek <r.marek at assembler.cz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/asus/m2v-mx_se/mainboard.c b/src/mainboard/asus/m2v-mx_se/mainboard.c
index c592282..5e3c720 100644
--- a/src/mainboard/asus/m2v-mx_se/mainboard.c
+++ b/src/mainboard/asus/m2v-mx_se/mainboard.c
@@ -22,7 +22,6 @@
 #include <device/pci_ids.h>
 #include <boot/tables.h>
 #include <southbridge/via/k8t890/k8t890.h>
-#include "chip.h"
 
 int add_mainboard_resources(struct lb_memory *mem)
 {
diff --git a/src/mainboard/asus/m2v/chip.h b/src/mainboard/asus/m2v/chip.h
deleted file mode 100644
index c2849ef..0000000
--- a/src/mainboard/asus/m2v/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Rudolf Marek <r.marek at assembler.cz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/asus/m2v/mainboard.c b/src/mainboard/asus/m2v/mainboard.c
index 2f20fe0..2a44851 100644
--- a/src/mainboard/asus/m2v/mainboard.c
+++ b/src/mainboard/asus/m2v/mainboard.c
@@ -23,7 +23,6 @@
 #include <device/pci_ids.h>
 #include <console/console.h>
 #include "southbridge/via/vt8237r/vt8237r.h"
-#include "chip.h"
 
 u32 vt8237_ide_80pin_detect(struct device *dev)
 {
diff --git a/src/mainboard/asus/m4a78-em/chip.h b/src/mainboard/asus/m4a78-em/chip.h
deleted file mode 100644
index a98b97e..0000000
--- a/src/mainboard/asus/m4a78-em/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/asus/m4a78-em/mainboard.c b/src/mainboard/asus/m4a78-em/mainboard.c
index 6b87177..eea8c0d 100644
--- a/src/mainboard/asus/m4a78-em/mainboard.c
+++ b/src/mainboard/asus/m4a78-em/mainboard.c
@@ -26,7 +26,6 @@
 #include <device/pci_def.h>
 #include "southbridge/amd/sb700/sb700.h"
 #include "southbridge/amd/sb700/smbus.h"
-#include "chip.h"
 
 
 void set_pcie_dereset(void);
diff --git a/src/mainboard/asus/m4a785-m/chip.h b/src/mainboard/asus/m4a785-m/chip.h
deleted file mode 100644
index a98b97e..0000000
--- a/src/mainboard/asus/m4a785-m/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/asus/m4a785-m/mainboard.c b/src/mainboard/asus/m4a785-m/mainboard.c
index 1bfeda5..45af025 100644
--- a/src/mainboard/asus/m4a785-m/mainboard.c
+++ b/src/mainboard/asus/m4a785-m/mainboard.c
@@ -26,7 +26,6 @@
 #include <device/pci_def.h>
 #include "southbridge/amd/sb700/sb700.h"
 #include "southbridge/amd/sb700/smbus.h"
-#include "chip.h"
 
 #define ADT7461_ADDRESS 0x4C
 #define ARA_ADDRESS     0x0C /* Alert Response Address */
diff --git a/src/mainboard/asus/m4a785t-m/chip.h b/src/mainboard/asus/m4a785t-m/chip.h
deleted file mode 100644
index a98b97e..0000000
--- a/src/mainboard/asus/m4a785t-m/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/asus/m5a88-v/chip.h b/src/mainboard/asus/m5a88-v/chip.h
deleted file mode 100644
index d5b991d..0000000
--- a/src/mainboard/asus/m5a88-v/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 QingPei Wang <wangqingpei at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/asus/m5a88-v/mainboard.c b/src/mainboard/asus/m5a88-v/mainboard.c
index 2042f9b..866e8c2 100644
--- a/src/mainboard/asus/m5a88-v/mainboard.c
+++ b/src/mainboard/asus/m5a88-v/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
 #include "SBPLATFORM.h"
-#include "chip.h"
 
 
 u8 is_dev3_present(void);
diff --git a/src/mainboard/asus/mew-am/chip.h b/src/mainboard/asus/mew-am/chip.h
deleted file mode 100644
index dc9bed3..0000000
--- a/src/mainboard/asus/mew-am/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/asus/mew-am/mainboard.c b/src/mainboard/asus/mew-am/mainboard.c
index e5008b9..8887218 100644
--- a/src/mainboard/asus/mew-am/mainboard.c
+++ b/src/mainboard/asus/mew-am/mainboard.c
@@ -20,7 +20,6 @@
 
 #include <device/device.h>
 #include <boot/tables.h>
-#include "chip.h"
 
 int add_mainboard_resources(struct lb_memory *mem)
 {
diff --git a/src/mainboard/asus/mew-vm/chip.h b/src/mainboard/asus/mew-vm/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/asus/mew-vm/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/asus/mew-vm/mainboard.c b/src/mainboard/asus/mew-vm/mainboard.c
index 831be01..e278565 100644
--- a/src/mainboard/asus/mew-vm/mainboard.c
+++ b/src/mainboard/asus/mew-vm/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 #include <boot/tables.h>
-#include "chip.h"
 
 int add_mainboard_resources(struct lb_memory *mem)
 {
diff --git a/src/mainboard/asus/p2b-d/chip.h b/src/mainboard/asus/p2b-d/chip.h
deleted file mode 100644
index 1c3876d..0000000
--- a/src/mainboard/asus/p2b-d/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/asus/p2b-d/mainboard.c b/src/mainboard/asus/p2b-d/mainboard.c
index 58cce0a..3fe9dc4 100644
--- a/src/mainboard/asus/p2b-d/mainboard.c
+++ b/src/mainboard/asus/p2b-d/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS P2B-D Mainboard")
diff --git a/src/mainboard/asus/p2b-ds/chip.h b/src/mainboard/asus/p2b-ds/chip.h
deleted file mode 100644
index 56e17ca..0000000
--- a/src/mainboard/asus/p2b-ds/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/asus/p2b-ds/mainboard.c b/src/mainboard/asus/p2b-ds/mainboard.c
index 910b130..c874137 100644
--- a/src/mainboard/asus/p2b-ds/mainboard.c
+++ b/src/mainboard/asus/p2b-ds/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS P2B-DS Mainboard")
diff --git a/src/mainboard/asus/p2b-f/chip.h b/src/mainboard/asus/p2b-f/chip.h
deleted file mode 100644
index dc9bed3..0000000
--- a/src/mainboard/asus/p2b-f/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/asus/p2b-f/mainboard.c b/src/mainboard/asus/p2b-f/mainboard.c
index e2b022a..e5d2e14 100644
--- a/src/mainboard/asus/p2b-f/mainboard.c
+++ b/src/mainboard/asus/p2b-f/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS P2B-F Mainboard")
diff --git a/src/mainboard/asus/p2b-ls/chip.h b/src/mainboard/asus/p2b-ls/chip.h
deleted file mode 100644
index dc9bed3..0000000
--- a/src/mainboard/asus/p2b-ls/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/asus/p2b-ls/mainboard.c b/src/mainboard/asus/p2b-ls/mainboard.c
index fec75e3..9f250f4 100644
--- a/src/mainboard/asus/p2b-ls/mainboard.c
+++ b/src/mainboard/asus/p2b-ls/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS P2B-LS Mainboard")
diff --git a/src/mainboard/asus/p2b/chip.h b/src/mainboard/asus/p2b/chip.h
deleted file mode 100644
index dc9bed3..0000000
--- a/src/mainboard/asus/p2b/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/asus/p2b/mainboard.c b/src/mainboard/asus/p2b/mainboard.c
index 21e5a4e..527dc7a 100644
--- a/src/mainboard/asus/p2b/mainboard.c
+++ b/src/mainboard/asus/p2b/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS P2B Mainboard")
diff --git a/src/mainboard/asus/p3b-f/chip.h b/src/mainboard/asus/p3b-f/chip.h
deleted file mode 100644
index dc9bed3..0000000
--- a/src/mainboard/asus/p3b-f/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/asus/p3b-f/mainboard.c b/src/mainboard/asus/p3b-f/mainboard.c
index c234fc2..9b41c79 100644
--- a/src/mainboard/asus/p3b-f/mainboard.c
+++ b/src/mainboard/asus/p3b-f/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("ASUS P3B-F Mainboard")
diff --git a/src/mainboard/avalue/eax-785e/chip.h b/src/mainboard/avalue/eax-785e/chip.h
deleted file mode 100644
index 5957589..0000000
--- a/src/mainboard/avalue/eax-785e/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/avalue/eax-785e/mainboard.c b/src/mainboard/avalue/eax-785e/mainboard.c
index 0aa20e1..5e50efa 100644
--- a/src/mainboard/avalue/eax-785e/mainboard.c
+++ b/src/mainboard/avalue/eax-785e/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
 #include "SBPLATFORM.h"
-#include "chip.h"
 
 
 u8 is_dev3_present(void);
@@ -77,10 +76,6 @@ u8 is_dev3_present(void)
 *************************************************/
 static void eax_785e(device_t dev)
 {
-	/* Leave it for furture use. */
-	/* struct mainboard_config *mainboard =
-	   (struct mainboard_config *)dev->chip_info; */
-
 	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 
 	setup_uma_memory();
diff --git a/src/mainboard/axus/tc320/chip.h b/src/mainboard/axus/tc320/chip.h
deleted file mode 100644
index 6e6f190..0000000
--- a/src/mainboard/axus/tc320/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Juergen Beisert <juergen at kreuzholzen.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/axus/tc320/mainboard.c b/src/mainboard/axus/tc320/mainboard.c
index 89c3dca..af52755 100644
--- a/src/mainboard/axus/tc320/mainboard.c
+++ b/src/mainboard/axus/tc320/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("AXUS TC320 Mainboard")
diff --git a/src/mainboard/azza/pt-6ibd/chip.h b/src/mainboard/azza/pt-6ibd/chip.h
deleted file mode 100644
index dc9bed3..0000000
--- a/src/mainboard/azza/pt-6ibd/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/azza/pt-6ibd/mainboard.c b/src/mainboard/azza/pt-6ibd/mainboard.c
index 45efc16..483f328 100644
--- a/src/mainboard/azza/pt-6ibd/mainboard.c
+++ b/src/mainboard/azza/pt-6ibd/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("AZZA PT-6IBD Mainboard")
diff --git a/src/mainboard/bachmann/ot200/chip.h b/src/mainboard/bachmann/ot200/chip.h
deleted file mode 100644
index 6acb1ff..0000000
--- a/src/mainboard/bachmann/ot200/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Bachmann electronic GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/bcom/winnet100/chip.h b/src/mainboard/bcom/winnet100/chip.h
deleted file mode 100644
index 4bce558..0000000
--- a/src/mainboard/bcom/winnet100/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Juergen Beisert <juergen at kreuzholzen.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/bcom/winnet100/mainboard.c b/src/mainboard/bcom/winnet100/mainboard.c
index 279701d..13089df 100644
--- a/src/mainboard/bcom/winnet100/mainboard.c
+++ b/src/mainboard/bcom/winnet100/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("BCOM WinNET100 Mainboard")
diff --git a/src/mainboard/bcom/winnetp680/chip.h b/src/mainboard/bcom/winnetp680/chip.h
deleted file mode 100644
index 0a2badb..0000000
--- a/src/mainboard/bcom/winnetp680/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 VIA Technologies, Inc.
- * (Written by Aaron Lwe <aaron.lwe at gmail.com> for VIA)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/bcom/winnetp680/mainboard.c b/src/mainboard/bcom/winnetp680/mainboard.c
index f467e1b..26fc5e3 100644
--- a/src/mainboard/bcom/winnetp680/mainboard.c
+++ b/src/mainboard/bcom/winnetp680/mainboard.c
@@ -20,7 +20,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("BCOM WinNET P680 Mainboard")
diff --git a/src/mainboard/bifferos/bifferboard/chip.h b/src/mainboard/bifferos/bifferboard/chip.h
deleted file mode 100644
index be42783..0000000
--- a/src/mainboard/bifferos/bifferboard/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
-
diff --git a/src/mainboard/bifferos/bifferboard/mainboard.c b/src/mainboard/bifferos/bifferboard/mainboard.c
index 5840f95..f3387a3 100644
--- a/src/mainboard/bifferos/bifferboard/mainboard.c
+++ b/src/mainboard/bifferos/bifferboard/mainboard.c
@@ -18,7 +18,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Bifferos Bifferboard")
diff --git a/src/mainboard/biostar/m6tba/chip.h b/src/mainboard/biostar/m6tba/chip.h
deleted file mode 100644
index dc9bed3..0000000
--- a/src/mainboard/biostar/m6tba/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/biostar/m6tba/mainboard.c b/src/mainboard/biostar/m6tba/mainboard.c
index fb6896a..6795284 100644
--- a/src/mainboard/biostar/m6tba/mainboard.c
+++ b/src/mainboard/biostar/m6tba/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Biostar M6TBA Mainboard")
diff --git a/src/mainboard/broadcom/blast/chip.h b/src/mainboard/broadcom/blast/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/broadcom/blast/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/broadcom/blast/mainboard.c b/src/mainboard/broadcom/blast/mainboard.c
index 5f4b525..c556bd5 100644
--- a/src/mainboard/broadcom/blast/mainboard.c
+++ b/src/mainboard/broadcom/blast/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Broadcom Blast Mainboard")
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/chip.h b/src/mainboard/compaq/deskpro_en_sff_p600/chip.h
deleted file mode 100644
index dc9bed3..0000000
--- a/src/mainboard/compaq/deskpro_en_sff_p600/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c b/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c
index 75d7876..d4abb63 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Compaq Deskpro EN SFF P600 Mainboard")
diff --git a/src/mainboard/digitallogic/adl855pc/chip.h b/src/mainboard/digitallogic/adl855pc/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/digitallogic/adl855pc/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/digitallogic/adl855pc/mainboard.c b/src/mainboard/digitallogic/adl855pc/mainboard.c
index c6ab63e..41c34e4 100644
--- a/src/mainboard/digitallogic/adl855pc/mainboard.c
+++ b/src/mainboard/digitallogic/adl855pc/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("DIGITAL-LOGIC ADL855PC Mainboard")
diff --git a/src/mainboard/digitallogic/msm586seg/chip.h b/src/mainboard/digitallogic/msm586seg/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/digitallogic/msm586seg/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/digitallogic/msm586seg/mainboard.c b/src/mainboard/digitallogic/msm586seg/mainboard.c
index 2361059..8f2d8c6 100644
--- a/src/mainboard/digitallogic/msm586seg/mainboard.c
+++ b/src/mainboard/digitallogic/msm586seg/mainboard.c
@@ -4,7 +4,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <cpu/amd/sc520.h>
-#include "chip.h"
 
 
 static void irqdump(void)
diff --git a/src/mainboard/digitallogic/msm800sev/chip.h b/src/mainboard/digitallogic/msm800sev/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/digitallogic/msm800sev/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/digitallogic/msm800sev/mainboard.c b/src/mainboard/digitallogic/msm800sev/mainboard.c
index f4d0e0e..3ade3d6 100644
--- a/src/mainboard/digitallogic/msm800sev/mainboard.c
+++ b/src/mainboard/digitallogic/msm800sev/mainboard.c
@@ -19,7 +19,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include "chip.h"
 
 static void init(struct device *dev)
 {
diff --git a/src/mainboard/eaglelion/5bcm/chip.h b/src/mainboard/eaglelion/5bcm/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/eaglelion/5bcm/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/eaglelion/5bcm/mainboard.c b/src/mainboard/eaglelion/5bcm/mainboard.c
index c0b3ae0..e1c499e 100644
--- a/src/mainboard/eaglelion/5bcm/mainboard.c
+++ b/src/mainboard/eaglelion/5bcm/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Eaglelion 5BCM Mainboard")
diff --git a/src/mainboard/ecs/p6iwp-fe/chip.h b/src/mainboard/ecs/p6iwp-fe/chip.h
deleted file mode 100644
index dc9bed3..0000000
--- a/src/mainboard/ecs/p6iwp-fe/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/ecs/p6iwp-fe/mainboard.c b/src/mainboard/ecs/p6iwp-fe/mainboard.c
index aec1250..9031ac7 100644
--- a/src/mainboard/ecs/p6iwp-fe/mainboard.c
+++ b/src/mainboard/ecs/p6iwp-fe/mainboard.c
@@ -20,7 +20,6 @@
 
 #include <device/device.h>
 #include <boot/tables.h>
-#include "chip.h"
 
 int add_mainboard_resources(struct lb_memory *mem)
 {
diff --git a/src/mainboard/emulation/qemu-x86/mainboard.c b/src/mainboard/emulation/qemu-x86/mainboard.c
index e4c9785..f8d0da7 100644
--- a/src/mainboard/emulation/qemu-x86/mainboard.c
+++ b/src/mainboard/emulation/qemu-x86/mainboard.c
@@ -5,7 +5,6 @@
 #include <device/pci_ops.h>
 #include <pc80/keyboard.h>
 #include <arch/io.h>
-#include "chip.h"
 
 /* not sure how these are routed in qemu */
 static const unsigned char enetIrqs[4] = { 11, 0, 0, 0 };
diff --git a/src/mainboard/getac/p470/chip.h b/src/mainboard/getac/p470/chip.h
deleted file mode 100644
index b75c381..0000000
--- a/src/mainboard/getac/p470/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2009 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of
- * the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/getac/p470/mainboard.c b/src/mainboard/getac/p470/mainboard.c
index b7a248d..83b4718 100644
--- a/src/mainboard/getac/p470/mainboard.c
+++ b/src/mainboard/getac/p470/mainboard.c
@@ -25,7 +25,6 @@
 #include <arch/io.h>
 #include <boot/tables.h>
 #include <delay.h>
-#include "chip.h"
 #include "hda_verb.h"
 
 #include "ec_oem.c"
diff --git a/src/mainboard/gigabyte/ga-6bxc/chip.h b/src/mainboard/gigabyte/ga-6bxc/chip.h
deleted file mode 100644
index dc9bed3..0000000
--- a/src/mainboard/gigabyte/ga-6bxc/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/gigabyte/ga-6bxc/mainboard.c b/src/mainboard/gigabyte/ga-6bxc/mainboard.c
index 01411f3..d43a577 100644
--- a/src/mainboard/gigabyte/ga-6bxc/mainboard.c
+++ b/src/mainboard/gigabyte/ga-6bxc/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("GIGABYTE GA-6BXC Mainboard")
diff --git a/src/mainboard/gigabyte/ga-6bxe/chip.h b/src/mainboard/gigabyte/ga-6bxe/chip.h
deleted file mode 100644
index 8e3af56..0000000
--- a/src/mainboard/gigabyte/ga-6bxe/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Anders Jenbo <anders at jenbo.dk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/gigabyte/ga-6bxe/mainboard.c b/src/mainboard/gigabyte/ga-6bxe/mainboard.c
index 2d04794..281d841 100644
--- a/src/mainboard/gigabyte/ga-6bxe/mainboard.c
+++ b/src/mainboard/gigabyte/ga-6bxe/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("GIGABYTE GA-6BXE Mainboard")
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/chip.h b/src/mainboard/gigabyte/ga_2761gxdk/chip.h
deleted file mode 100644
index 3c303ee..0000000
--- a/src/mainboard/gigabyte/ga_2761gxdk/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Silicon Integrated Systems Corp. (SiS)
- * Written by Morgan Tsai <my_tsai at sis.com> for SiS.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c b/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c
index e365575..e8b8969 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c
@@ -24,7 +24,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("GIGABYTE GA-2761GXDK Mainboard")
diff --git a/src/mainboard/gigabyte/m57sli/chip.h b/src/mainboard/gigabyte/m57sli/chip.h
deleted file mode 100644
index ebd990b..0000000
--- a/src/mainboard/gigabyte/m57sli/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 AMD
- * Written by Yinghai Lu <yinghailu at amd.com> for AMD.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/gigabyte/m57sli/mainboard.c b/src/mainboard/gigabyte/m57sli/mainboard.c
index b198fb6..dffa769 100644
--- a/src/mainboard/gigabyte/m57sli/mainboard.c
+++ b/src/mainboard/gigabyte/m57sli/mainboard.c
@@ -25,7 +25,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 // #include "hda_verb.h"
-#include "chip.h"
 
 static void verb_setup(void)
 {
diff --git a/src/mainboard/gigabyte/ma785gm/chip.h b/src/mainboard/gigabyte/ma785gm/chip.h
deleted file mode 100644
index 70102aa..0000000
--- a/src/mainboard/gigabyte/ma785gm/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Wang Qing Pei <wangqingpei at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/gigabyte/ma785gm/mainboard.c b/src/mainboard/gigabyte/ma785gm/mainboard.c
index 6303778..680bb2e 100644
--- a/src/mainboard/gigabyte/ma785gm/mainboard.c
+++ b/src/mainboard/gigabyte/ma785gm/mainboard.c
@@ -27,7 +27,6 @@
 #include <device/pci_def.h>
 #include "southbridge/amd/sb700/sb700.h"
 #include "southbridge/amd/sb700/smbus.h"
-#include "chip.h"
 
 void set_pcie_dereset(void);
 void set_pcie_reset(void);
diff --git a/src/mainboard/gigabyte/ma785gmt/chip.h b/src/mainboard/gigabyte/ma785gmt/chip.h
deleted file mode 100644
index 70102aa..0000000
--- a/src/mainboard/gigabyte/ma785gmt/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Wang Qing Pei <wangqingpei at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/gigabyte/ma785gmt/mainboard.c b/src/mainboard/gigabyte/ma785gmt/mainboard.c
index fdfe38b..b7ecf9f 100644
--- a/src/mainboard/gigabyte/ma785gmt/mainboard.c
+++ b/src/mainboard/gigabyte/ma785gmt/mainboard.c
@@ -27,7 +27,6 @@
 #include <device/pci_def.h>
 #include "southbridge/amd/sb700/sb700.h"
 #include "southbridge/amd/sb700/smbus.h"
-#include "chip.h"
 
 #define ADT7461_ADDRESS 0x4C
 #define ARA_ADDRESS     0x0C /* Alert Response Address */
diff --git a/src/mainboard/gigabyte/ma78gm/chip.h b/src/mainboard/gigabyte/ma78gm/chip.h
deleted file mode 100644
index a98b97e..0000000
--- a/src/mainboard/gigabyte/ma78gm/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/gigabyte/ma78gm/mainboard.c b/src/mainboard/gigabyte/ma78gm/mainboard.c
index 6ab63ac..6756690 100644
--- a/src/mainboard/gigabyte/ma78gm/mainboard.c
+++ b/src/mainboard/gigabyte/ma78gm/mainboard.c
@@ -28,7 +28,6 @@
 #include <device/pci_def.h>
 #include "southbridge/amd/sb700/sb700.h"
 #include "southbridge/amd/sb700/smbus.h"
-#include "chip.h"
 
 void set_pcie_dereset(void);
 void set_pcie_reset(void);
diff --git a/src/mainboard/hp/dl145_g1/chip.h b/src/mainboard/hp/dl145_g1/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/hp/dl145_g1/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/hp/dl145_g1/mainboard.c b/src/mainboard/hp/dl145_g1/mainboard.c
index d68e720..fde9d22 100644
--- a/src/mainboard/hp/dl145_g1/mainboard.c
+++ b/src/mainboard/hp/dl145_g1/mainboard.c
@@ -22,7 +22,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("HP ProLiant DL145 G1 Mainboard")
diff --git a/src/mainboard/hp/dl145_g3/chip.h b/src/mainboard/hp/dl145_g3/chip.h
deleted file mode 100644
index 04039f1..0000000
--- a/src/mainboard/hp/dl145_g3/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 University of Mannheim
- * Written by Philipp Degler <pdegler at rumms.uni-mannheim.de> for University of Mannheim.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/hp/dl145_g3/mainboard.c b/src/mainboard/hp/dl145_g3/mainboard.c
index 7799c16..81f074e 100644
--- a/src/mainboard/hp/dl145_g3/mainboard.c
+++ b/src/mainboard/hp/dl145_g3/mainboard.c
@@ -27,7 +27,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("HP ProLiant DL145 G3 Mainboard")
diff --git a/src/mainboard/hp/dl165_g6_fam10/chip.h b/src/mainboard/hp/dl165_g6_fam10/chip.h
deleted file mode 100644
index 6c54f71..0000000
--- a/src/mainboard/hp/dl165_g6_fam10/chip.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 University of Mannheim
- * Written by Philipp Degler <pdegler at rumms.uni-mannheim.de> for University of Mannheim.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {
-};
-
diff --git a/src/mainboard/hp/dl165_g6_fam10/mainboard.c b/src/mainboard/hp/dl165_g6_fam10/mainboard.c
index d84ba47..97f2fb7 100644
--- a/src/mainboard/hp/dl165_g6_fam10/mainboard.c
+++ b/src/mainboard/hp/dl165_g6_fam10/mainboard.c
@@ -27,7 +27,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("HP ProLiant DL165 G6 Mainboard (Fam10h)")
diff --git a/src/mainboard/hp/e_vectra_p2706t/chip.h b/src/mainboard/hp/e_vectra_p2706t/chip.h
deleted file mode 100644
index f354ee8..0000000
--- a/src/mainboard/hp/e_vectra_p2706t/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/hp/e_vectra_p2706t/mainboard.c b/src/mainboard/hp/e_vectra_p2706t/mainboard.c
index 74339e9..0f9b75e 100644
--- a/src/mainboard/hp/e_vectra_p2706t/mainboard.c
+++ b/src/mainboard/hp/e_vectra_p2706t/mainboard.c
@@ -20,7 +20,6 @@
 
 #include <device/device.h>
 #include <boot/tables.h>
-#include "chip.h"
 
 int add_mainboard_resources(struct lb_memory *mem)
 {
diff --git a/src/mainboard/ibase/mb899/chip.h b/src/mainboard/ibase/mb899/chip.h
deleted file mode 100644
index 831a973..0000000
--- a/src/mainboard/ibase/mb899/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2008 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/ibase/mb899/mainboard.c b/src/mainboard/ibase/mb899/mainboard.c
index 5989685..4e3d606 100644
--- a/src/mainboard/ibase/mb899/mainboard.c
+++ b/src/mainboard/ibase/mb899/mainboard.c
@@ -27,7 +27,6 @@
 #include <pc80/mc146818rtc.h>
 #include <arch/io.h>
 #include <arch/coreboot_tables.h>
-#include "chip.h"
 
 #if CONFIG_PCI_OPTION_ROM_RUN_YABEL
 static int int15_handler(void)
diff --git a/src/mainboard/ibm/e325/chip.h b/src/mainboard/ibm/e325/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/ibm/e325/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/ibm/e325/mainboard.c b/src/mainboard/ibm/e325/mainboard.c
index 49a8c41..136ffaf 100644
--- a/src/mainboard/ibm/e325/mainboard.c
+++ b/src/mainboard/ibm/e325/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("IBM eServer 325 Mainboard")
diff --git a/src/mainboard/ibm/e326/chip.h b/src/mainboard/ibm/e326/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/ibm/e326/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/ibm/e326/mainboard.c b/src/mainboard/ibm/e326/mainboard.c
index 70b59a9..bd5ebc5 100644
--- a/src/mainboard/ibm/e326/mainboard.c
+++ b/src/mainboard/ibm/e326/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("IBM eServer 326 Mainboard")
diff --git a/src/mainboard/iei/juki-511p/chip.h b/src/mainboard/iei/juki-511p/chip.h
deleted file mode 100644
index f5f5b7a..0000000
--- a/src/mainboard/iei/juki-511p/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Nikolay Petukhov <nikolay.petukhov at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/iei/juki-511p/mainboard.c b/src/mainboard/iei/juki-511p/mainboard.c
index e44a07c..e5714cf 100644
--- a/src/mainboard/iei/juki-511p/mainboard.c
+++ b/src/mainboard/iei/juki-511p/mainboard.c
@@ -24,7 +24,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <arch/io.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("IEI JUKI-511P Mainboard")
diff --git a/src/mainboard/iei/kino-780am2-fam10/chip.h b/src/mainboard/iei/kino-780am2-fam10/chip.h
deleted file mode 100644
index a98b97e..0000000
--- a/src/mainboard/iei/kino-780am2-fam10/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/iei/kino-780am2-fam10/mainboard.c b/src/mainboard/iei/kino-780am2-fam10/mainboard.c
index b18e5a6..e9ef596 100644
--- a/src/mainboard/iei/kino-780am2-fam10/mainboard.c
+++ b/src/mainboard/iei/kino-780am2-fam10/mainboard.c
@@ -27,7 +27,6 @@
 #include <device/pci_def.h>
 #include "southbridge/amd/sb700/sb700.h"
 #include "southbridge/amd/sb700/smbus.h"
-#include "chip.h"
 
 void set_pcie_dereset(void);
 void set_pcie_reset(void);
diff --git a/src/mainboard/iei/nova4899r/chip.h b/src/mainboard/iei/nova4899r/chip.h
deleted file mode 100644
index 271b02c..0000000
--- a/src/mainboard/iei/nova4899r/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Luis Correia <luis.f.correia at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/iei/nova4899r/mainboard.c b/src/mainboard/iei/nova4899r/mainboard.c
index 7ca0a14..85c6521 100644
--- a/src/mainboard/iei/nova4899r/mainboard.c
+++ b/src/mainboard/iei/nova4899r/mainboard.c
@@ -24,7 +24,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <arch/io.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("IEI NOVA-4899R Mainboard")
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/chip.h b/src/mainboard/iei/pcisa-lx-800-r10/chip.h
deleted file mode 100644
index f5f5b7a..0000000
--- a/src/mainboard/iei/pcisa-lx-800-r10/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Nikolay Petukhov <nikolay.petukhov at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/iei/pm-lx-800-r11/chip.h b/src/mainboard/iei/pm-lx-800-r11/chip.h
deleted file mode 100644
index d69f9b6..0000000
--- a/src/mainboard/iei/pm-lx-800-r11/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 Ricardo Martins <rasmartins at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/intel/d810e2cb/chip.h b/src/mainboard/intel/d810e2cb/chip.h
deleted file mode 100644
index 1f9a793..0000000
--- a/src/mainboard/intel/d810e2cb/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Joseph Smith <joe at settoplinux.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/intel/d810e2cb/mainboard.c b/src/mainboard/intel/d810e2cb/mainboard.c
index c55a680..7589d6e 100644
--- a/src/mainboard/intel/d810e2cb/mainboard.c
+++ b/src/mainboard/intel/d810e2cb/mainboard.c
@@ -19,7 +19,6 @@
 
 #include <device/device.h>
 #include <boot/tables.h>
-#include "chip.h"
 
 int add_mainboard_resources(struct lb_memory *mem)
 {
diff --git a/src/mainboard/intel/d945gclf/chip.h b/src/mainboard/intel/d945gclf/chip.h
deleted file mode 100644
index 491eebd..0000000
--- a/src/mainboard/intel/d945gclf/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2008 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/intel/d945gclf/mainboard.c b/src/mainboard/intel/d945gclf/mainboard.c
index ff08b8a..ca920bc 100644
--- a/src/mainboard/intel/d945gclf/mainboard.c
+++ b/src/mainboard/intel/d945gclf/mainboard.c
@@ -21,7 +21,6 @@
 #include <console/console.h>
 #include <boot/tables.h>
 #include <arch/coreboot_tables.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Intel D945GCLF Mainboard")
diff --git a/src/mainboard/intel/eagleheights/chip.h b/src/mainboard/intel/eagleheights/chip.h
deleted file mode 100644
index 3ae8657..0000000
--- a/src/mainboard/intel/eagleheights/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2008 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/intel/eagleheights/mainboard.c b/src/mainboard/intel/eagleheights/mainboard.c
index 7974dbc..d6bc10f 100644
--- a/src/mainboard/intel/eagleheights/mainboard.c
+++ b/src/mainboard/intel/eagleheights/mainboard.c
@@ -23,7 +23,6 @@
 #include <device/device.h>
 #include <boot/tables.h>
 #include <arch/coreboot_tables.h>
-#include "chip.h"
 
 int add_mainboard_resources(struct lb_memory *mem)
 {
diff --git a/src/mainboard/intel/emeraldlake2/chip.h b/src/mainboard/intel/emeraldlake2/chip.h
deleted file mode 100644
index fbe2477..0000000
--- a/src/mainboard/intel/emeraldlake2/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 The Chromium OS Authors. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c
index 0bf33fc..5717edf 100644
--- a/src/mainboard/intel/emeraldlake2/mainboard.c
+++ b/src/mainboard/intel/emeraldlake2/mainboard.c
@@ -34,7 +34,6 @@
 #include <arch/interrupt.h>
 #include <arch/coreboot_tables.h>
 #include "hda_verb.h"
-#include "chip.h"
 #include <southbridge/intel/bd82x6x/pch.h>
 
 void mainboard_suspend_resume(void)
diff --git a/src/mainboard/intel/jarrell/chip.h b/src/mainboard/intel/jarrell/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/intel/jarrell/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/intel/jarrell/mainboard.c b/src/mainboard/intel/jarrell/mainboard.c
index ba2bfc5..f66431d 100644
--- a/src/mainboard/intel/jarrell/mainboard.c
+++ b/src/mainboard/intel/jarrell/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Intel Jarell Mainboard")
diff --git a/src/mainboard/intel/mtarvon/chip.h b/src/mainboard/intel/mtarvon/chip.h
deleted file mode 100644
index 9c9114d..0000000
--- a/src/mainboard/intel/mtarvon/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Arastra, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/intel/mtarvon/mainboard.c b/src/mainboard/intel/mtarvon/mainboard.c
index 26111f5..b69df9b 100644
--- a/src/mainboard/intel/mtarvon/mainboard.c
+++ b/src/mainboard/intel/mtarvon/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Intel Mt. Arvon Mainboard")
diff --git a/src/mainboard/intel/truxton/chip.h b/src/mainboard/intel/truxton/chip.h
deleted file mode 100644
index 9c9114d..0000000
--- a/src/mainboard/intel/truxton/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Arastra, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/intel/truxton/mainboard.c b/src/mainboard/intel/truxton/mainboard.c
index 78a16a9..754ba0d 100644
--- a/src/mainboard/intel/truxton/mainboard.c
+++ b/src/mainboard/intel/truxton/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Intel Truxton Mainboard")
diff --git a/src/mainboard/intel/xe7501devkit/chip.h b/src/mainboard/intel/xe7501devkit/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/intel/xe7501devkit/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/intel/xe7501devkit/mainboard.c b/src/mainboard/intel/xe7501devkit/mainboard.c
index 3b757d6..c605624 100644
--- a/src/mainboard/intel/xe7501devkit/mainboard.c
+++ b/src/mainboard/intel/xe7501devkit/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Intel Xeon E7501 DevKit Mainboard")
diff --git a/src/mainboard/iwave/iWRainbowG6/chip.h b/src/mainboard/iwave/iWRainbowG6/chip.h
deleted file mode 100644
index 831a973..0000000
--- a/src/mainboard/iwave/iWRainbowG6/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2008 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/iwave/iWRainbowG6/mainboard.c b/src/mainboard/iwave/iWRainbowG6/mainboard.c
index 7d0c61d..f3fc20f 100644
--- a/src/mainboard/iwave/iWRainbowG6/mainboard.c
+++ b/src/mainboard/iwave/iWRainbowG6/mainboard.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <console/console.h>
 #include <boot/tables.h>
-#include "chip.h"
 #include "hda_verb.h"
 
 static void verb_setup(void)
diff --git a/src/mainboard/iwill/dk8_htx/chip.h b/src/mainboard/iwill/dk8_htx/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/iwill/dk8_htx/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/iwill/dk8_htx/mainboard.c b/src/mainboard/iwill/dk8_htx/mainboard.c
index cbbd3f2..251852f 100644
--- a/src/mainboard/iwill/dk8_htx/mainboard.c
+++ b/src/mainboard/iwill/dk8_htx/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("IWILL DK8-HTX Mainboard")
diff --git a/src/mainboard/iwill/dk8s2/chip.h b/src/mainboard/iwill/dk8s2/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/iwill/dk8s2/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/iwill/dk8s2/mainboard.c b/src/mainboard/iwill/dk8s2/mainboard.c
index 7559da6..18ab152 100644
--- a/src/mainboard/iwill/dk8s2/mainboard.c
+++ b/src/mainboard/iwill/dk8s2/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("IWILL DK8S2 Mainboard")
diff --git a/src/mainboard/iwill/dk8x/chip.h b/src/mainboard/iwill/dk8x/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/iwill/dk8x/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/iwill/dk8x/mainboard.c b/src/mainboard/iwill/dk8x/mainboard.c
index a936f40..3e062de 100644
--- a/src/mainboard/iwill/dk8x/mainboard.c
+++ b/src/mainboard/iwill/dk8x/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("IWILL DK8X Mainboard")
diff --git a/src/mainboard/jetway/j7f24/chip.h b/src/mainboard/jetway/j7f24/chip.h
deleted file mode 100644
index 0a2badb..0000000
--- a/src/mainboard/jetway/j7f24/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 VIA Technologies, Inc.
- * (Written by Aaron Lwe <aaron.lwe at gmail.com> for VIA)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/jetway/j7f24/mainboard.c b/src/mainboard/jetway/j7f24/mainboard.c
index 6693747..4b1ee39 100644
--- a/src/mainboard/jetway/j7f24/mainboard.c
+++ b/src/mainboard/jetway/j7f24/mainboard.c
@@ -20,7 +20,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Jetway J7F[24]* Mainboard")
diff --git a/src/mainboard/jetway/pa78vm5/chip.h b/src/mainboard/jetway/pa78vm5/chip.h
deleted file mode 100644
index d081720..0000000
--- a/src/mainboard/jetway/pa78vm5/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Wang Qing Pei <wangqingpei at gmail.com>
- * Copyright (C) 2010 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/jetway/pa78vm5/mainboard.c b/src/mainboard/jetway/pa78vm5/mainboard.c
index 585a2a4..cb37c11 100644
--- a/src/mainboard/jetway/pa78vm5/mainboard.c
+++ b/src/mainboard/jetway/pa78vm5/mainboard.c
@@ -28,7 +28,6 @@
 #include <device/pci_def.h>
 #include "southbridge/amd/sb700/sb700.h"
 #include "southbridge/amd/sb700/smbus.h"
-#include "chip.h"
 
 void set_pcie_dereset(void);
 void set_pcie_reset(void);
diff --git a/src/mainboard/kontron/986lcd-m/chip.h b/src/mainboard/kontron/986lcd-m/chip.h
deleted file mode 100644
index 831a973..0000000
--- a/src/mainboard/kontron/986lcd-m/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2008 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c
index d7b1f13..b9686bd 100644
--- a/src/mainboard/kontron/986lcd-m/mainboard.c
+++ b/src/mainboard/kontron/986lcd-m/mainboard.c
@@ -26,7 +26,6 @@
 #include <pc80/mc146818rtc.h>
 #include <arch/io.h>
 #include <arch/interrupt.h>
-#include "chip.h"
 
 #if CONFIG_PCI_OPTION_ROM_RUN_YABEL
 static int int15_handler(void)
diff --git a/src/mainboard/kontron/kt690/chip.h b/src/mainboard/kontron/kt690/chip.h
deleted file mode 100644
index 05e1582..0000000
--- a/src/mainboard/kontron/kt690/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
-
diff --git a/src/mainboard/kontron/kt690/mainboard.c b/src/mainboard/kontron/kt690/mainboard.c
index d24d97d..dbd4141 100644
--- a/src/mainboard/kontron/kt690/mainboard.c
+++ b/src/mainboard/kontron/kt690/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
 #include <southbridge/amd/sb600/sb600.h>
-#include "chip.h"
 
 #define ADT7461_ADDRESS 0x4C
 #define ARA_ADDRESS     0x0C /* Alert Response Address */
diff --git a/src/mainboard/lanner/em8510/chip.h b/src/mainboard/lanner/em8510/chip.h
deleted file mode 100644
index 96d8705..0000000
--- a/src/mainboard/lanner/em8510/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Travelping GmbH <info at travelping.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/lanner/em8510/mainboard.c b/src/mainboard/lanner/em8510/mainboard.c
index 4a20d25..9317944 100644
--- a/src/mainboard/lanner/em8510/mainboard.c
+++ b/src/mainboard/lanner/em8510/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("LANNER EM-8510 Mainboard")
diff --git a/src/mainboard/lenovo/t60/chip.h b/src/mainboard/lenovo/t60/chip.h
deleted file mode 100644
index 70f9bb4..0000000
--- a/src/mainboard/lenovo/t60/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (c) 2011 Sven Schnelle <svens at stackframe.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c
index a9f4117..bd4c4a7 100644
--- a/src/mainboard/lenovo/t60/mainboard.c
+++ b/src/mainboard/lenovo/t60/mainboard.c
@@ -26,7 +26,6 @@
 #include <boot/tables.h>
 #include <delay.h>
 #include <arch/coreboot_tables.h>
-#include "chip.h"
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/x60/chip.h b/src/mainboard/lenovo/x60/chip.h
deleted file mode 100644
index 70f9bb4..0000000
--- a/src/mainboard/lenovo/x60/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (c) 2011 Sven Schnelle <svens at stackframe.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c
index 453cf38..4ded239 100644
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -26,7 +26,6 @@
 #include <boot/tables.h>
 #include <delay.h>
 #include <arch/coreboot_tables.h>
-#include "chip.h"
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <device/pci_ids.h>
diff --git a/src/mainboard/lippert/frontrunner/chip.h b/src/mainboard/lippert/frontrunner/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/lippert/frontrunner/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/lippert/frontrunner/mainboard.c b/src/mainboard/lippert/frontrunner/mainboard.c
index 7cd9f1d..ec1503e 100644
--- a/src/mainboard/lippert/frontrunner/mainboard.c
+++ b/src/mainboard/lippert/frontrunner/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Lippert Cool Frontrunner Mainboard")
diff --git a/src/mainboard/lippert/hurricane-lx/chip.h b/src/mainboard/lippert/hurricane-lx/chip.h
deleted file mode 100644
index 0c70fcd..0000000
--- a/src/mainboard/lippert/hurricane-lx/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 LiPPERT Embedded Computers GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/lippert/hurricane-lx/mainboard.c b/src/mainboard/lippert/hurricane-lx/mainboard.c
index 959966c..9b7ad98 100644
--- a/src/mainboard/lippert/hurricane-lx/mainboard.c
+++ b/src/mainboard/lippert/hurricane-lx/mainboard.c
@@ -27,7 +27,6 @@
 #include <arch/io.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include "chip.h"
 
 /* Bit1 switches Com1 to RS485, bit2 same for Com2. */
 #if CONFIG_ONBOARD_UARTS_RS485
diff --git a/src/mainboard/lippert/literunner-lx/chip.h b/src/mainboard/lippert/literunner-lx/chip.h
deleted file mode 100644
index 0c70fcd..0000000
--- a/src/mainboard/lippert/literunner-lx/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 LiPPERT Embedded Computers GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/lippert/literunner-lx/mainboard.c b/src/mainboard/lippert/literunner-lx/mainboard.c
index 65ea12a..cfec2a8 100644
--- a/src/mainboard/lippert/literunner-lx/mainboard.c
+++ b/src/mainboard/lippert/literunner-lx/mainboard.c
@@ -27,7 +27,6 @@
 #include <arch/io.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include "chip.h"
 
 /* Bit0 turns off the Live LED, bit1 switches Com1 to RS485, bit2 same for Com2. */
 #if CONFIG_ONBOARD_UARTS_RS485
diff --git a/src/mainboard/lippert/roadrunner-lx/chip.h b/src/mainboard/lippert/roadrunner-lx/chip.h
deleted file mode 100644
index 398d424..0000000
--- a/src/mainboard/lippert/roadrunner-lx/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 LiPPERT Embedded Computers GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/lippert/roadrunner-lx/mainboard.c b/src/mainboard/lippert/roadrunner-lx/mainboard.c
index 31fdd46..26adb2f 100644
--- a/src/mainboard/lippert/roadrunner-lx/mainboard.c
+++ b/src/mainboard/lippert/roadrunner-lx/mainboard.c
@@ -27,7 +27,6 @@
 #include <arch/io.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include "chip.h"
 
 /* Bit1 switches Com1 to RS485, bit2 same for Com2, bit5 turns off the Live LED. */
 #if CONFIG_ONBOARD_UARTS_RS485
diff --git a/src/mainboard/lippert/spacerunner-lx/chip.h b/src/mainboard/lippert/spacerunner-lx/chip.h
deleted file mode 100644
index 398d424..0000000
--- a/src/mainboard/lippert/spacerunner-lx/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 LiPPERT Embedded Computers GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/lippert/spacerunner-lx/mainboard.c b/src/mainboard/lippert/spacerunner-lx/mainboard.c
index 34cd8c4..f2aeb10 100644
--- a/src/mainboard/lippert/spacerunner-lx/mainboard.c
+++ b/src/mainboard/lippert/spacerunner-lx/mainboard.c
@@ -27,7 +27,6 @@
 #include <arch/io.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include "chip.h"
 
 /* Bit0 turns off the Live LED, bit1 switches Com1 to RS485, bit2 same for Com2. */
 #if CONFIG_ONBOARD_UARTS_RS485
diff --git a/src/mainboard/mitac/6513wu/chip.h b/src/mainboard/mitac/6513wu/chip.h
deleted file mode 100644
index 0421977..0000000
--- a/src/mainboard/mitac/6513wu/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 Michael Gold <mgold at ncf.ca>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/mitac/6513wu/mainboard.c b/src/mainboard/mitac/6513wu/mainboard.c
index 9e4ec8d..968b9e9 100644
--- a/src/mainboard/mitac/6513wu/mainboard.c
+++ b/src/mainboard/mitac/6513wu/mainboard.c
@@ -20,7 +20,6 @@
 
 #include <device/device.h>
 #include <boot/tables.h>
-#include "chip.h"
 
 int add_mainboard_resources(struct lb_memory *mem)
 {
diff --git a/src/mainboard/msi/ms6119/chip.h b/src/mainboard/msi/ms6119/chip.h
deleted file mode 100644
index 56e17ca..0000000
--- a/src/mainboard/msi/ms6119/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/msi/ms6119/mainboard.c b/src/mainboard/msi/ms6119/mainboard.c
index 9c4ef29..7ef3d4b 100644
--- a/src/mainboard/msi/ms6119/mainboard.c
+++ b/src/mainboard/msi/ms6119/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("MSI MS-6119 Mainboard")
diff --git a/src/mainboard/msi/ms6147/chip.h b/src/mainboard/msi/ms6147/chip.h
deleted file mode 100644
index fbf5d32..0000000
--- a/src/mainboard/msi/ms6147/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Mats Erik Andersson <mats.andersson at gisladisker.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/msi/ms6147/mainboard.c b/src/mainboard/msi/ms6147/mainboard.c
index b7c7386..091de54 100644
--- a/src/mainboard/msi/ms6147/mainboard.c
+++ b/src/mainboard/msi/ms6147/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("MSI MS-6147 Mainboard")
diff --git a/src/mainboard/msi/ms6156/chip.h b/src/mainboard/msi/ms6156/chip.h
deleted file mode 100644
index 1c3876d..0000000
--- a/src/mainboard/msi/ms6156/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/msi/ms6156/mainboard.c b/src/mainboard/msi/ms6156/mainboard.c
index 1864f0b..28b5e81 100644
--- a/src/mainboard/msi/ms6156/mainboard.c
+++ b/src/mainboard/msi/ms6156/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("MSI MS-6156 Mainboard")
diff --git a/src/mainboard/msi/ms6178/chip.h b/src/mainboard/msi/ms6178/chip.h
deleted file mode 100644
index 982cfb3..0000000
--- a/src/mainboard/msi/ms6178/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/msi/ms6178/mainboard.c b/src/mainboard/msi/ms6178/mainboard.c
index e4ba148..0aeedb8 100644
--- a/src/mainboard/msi/ms6178/mainboard.c
+++ b/src/mainboard/msi/ms6178/mainboard.c
@@ -20,7 +20,6 @@
 
 #include <device/device.h>
 #include <boot/tables.h>
-#include "chip.h"
 
 int add_mainboard_resources(struct lb_memory *mem)
 {
diff --git a/src/mainboard/msi/ms7135/chip.h b/src/mainboard/msi/ms7135/chip.h
deleted file mode 100644
index 063d25b..0000000
--- a/src/mainboard/msi/ms7135/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Jonathan A. Kollasch <jakllsch at kollasch.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/msi/ms7135/mainboard.c b/src/mainboard/msi/ms7135/mainboard.c
index 586f9c5..3ed0c6b 100644
--- a/src/mainboard/msi/ms7135/mainboard.c
+++ b/src/mainboard/msi/ms7135/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("MSI MS7135 Mainboard")
diff --git a/src/mainboard/msi/ms7260/chip.h b/src/mainboard/msi/ms7260/chip.h
deleted file mode 100644
index 982cfb3..0000000
--- a/src/mainboard/msi/ms7260/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/msi/ms7260/mainboard.c b/src/mainboard/msi/ms7260/mainboard.c
index 2b61736..06d606f 100644
--- a/src/mainboard/msi/ms7260/mainboard.c
+++ b/src/mainboard/msi/ms7260/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 #if 0
 #include "hda_verb.h"
diff --git a/src/mainboard/msi/ms9185/chip.h b/src/mainboard/msi/ms9185/chip.h
deleted file mode 100644
index 6638ef1..0000000
--- a/src/mainboard/msi/ms9185/chip.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2006 MSI
- * Written by bxshi <bingxunshi at gmail.com> for MSI.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
-
diff --git a/src/mainboard/msi/ms9185/mainboard.c b/src/mainboard/msi/ms9185/mainboard.c
index 873a490..f3e28d4 100644
--- a/src/mainboard/msi/ms9185/mainboard.c
+++ b/src/mainboard/msi/ms9185/mainboard.c
@@ -24,7 +24,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
        CHIP_NAME("MSI MS-9185 Mainboard")
diff --git a/src/mainboard/msi/ms9282/chip.h b/src/mainboard/msi/ms9282/chip.h
deleted file mode 100644
index 0831119..0000000
--- a/src/mainboard/msi/ms9282/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2006 MSI
- * Written by Bingxun Shi <bingxunshi at gmail.com> for MSI.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/msi/ms9282/mainboard.c b/src/mainboard/msi/ms9282/mainboard.c
index 99f7e22..800fd25 100644
--- a/src/mainboard/msi/ms9282/mainboard.c
+++ b/src/mainboard/msi/ms9282/mainboard.c
@@ -25,7 +25,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 // #include "hda_verb.h"
-#include "chip.h"
 
 static void verb_setup(void)
 {
diff --git a/src/mainboard/msi/ms9652_fam10/chip.h b/src/mainboard/msi/ms9652_fam10/chip.h
deleted file mode 100644
index ebd990b..0000000
--- a/src/mainboard/msi/ms9652_fam10/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 AMD
- * Written by Yinghai Lu <yinghailu at amd.com> for AMD.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/msi/ms9652_fam10/mainboard.c b/src/mainboard/msi/ms9652_fam10/mainboard.c
index 255b22d..e570607 100644
--- a/src/mainboard/msi/ms9652_fam10/mainboard.c
+++ b/src/mainboard/msi/ms9652_fam10/mainboard.c
@@ -25,7 +25,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 // #include "hda_verb.h"
-#include "chip.h"
 
 static void verb_setup(void)
 {
diff --git a/src/mainboard/nec/powermate2000/chip.h b/src/mainboard/nec/powermate2000/chip.h
deleted file mode 100644
index 41784c9..0000000
--- a/src/mainboard/nec/powermate2000/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/nec/powermate2000/mainboard.c b/src/mainboard/nec/powermate2000/mainboard.c
index a26e8df..3b29c7c 100644
--- a/src/mainboard/nec/powermate2000/mainboard.c
+++ b/src/mainboard/nec/powermate2000/mainboard.c
@@ -20,7 +20,6 @@
 
 #include <device/device.h>
 #include <boot/tables.h>
-#include "chip.h"
 
 int add_mainboard_resources(struct lb_memory *mem)
 {
diff --git a/src/mainboard/newisys/khepri/chip.h b/src/mainboard/newisys/khepri/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/newisys/khepri/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/newisys/khepri/mainboard.c b/src/mainboard/newisys/khepri/mainboard.c
index d278fd2..11e7032 100644
--- a/src/mainboard/newisys/khepri/mainboard.c
+++ b/src/mainboard/newisys/khepri/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Newisys 2100 Mainboard")
diff --git a/src/mainboard/nokia/ip530/chip.h b/src/mainboard/nokia/ip530/chip.h
deleted file mode 100644
index 1046412..0000000
--- a/src/mainboard/nokia/ip530/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Marc Bertens <mbertens at xs4all.nl>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/nokia/ip530/mainboard.c b/src/mainboard/nokia/ip530/mainboard.c
index b0dd27b..8b934ff 100644
--- a/src/mainboard/nokia/ip530/mainboard.c
+++ b/src/mainboard/nokia/ip530/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Nokia IP530 Mainboard")
diff --git a/src/mainboard/nvidia/l1_2pvv/chip.h b/src/mainboard/nvidia/l1_2pvv/chip.h
deleted file mode 100644
index ebd990b..0000000
--- a/src/mainboard/nvidia/l1_2pvv/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 AMD
- * Written by Yinghai Lu <yinghailu at amd.com> for AMD.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/nvidia/l1_2pvv/mainboard.c b/src/mainboard/nvidia/l1_2pvv/mainboard.c
index b425c3d..5836571 100644
--- a/src/mainboard/nvidia/l1_2pvv/mainboard.c
+++ b/src/mainboard/nvidia/l1_2pvv/mainboard.c
@@ -25,7 +25,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include "hda_verb.h"
-#include "chip.h"
 
 static void verb_setup(void)
 {
diff --git a/src/mainboard/pcengines/alix1c/chip.h b/src/mainboard/pcengines/alix1c/chip.h
deleted file mode 100644
index fb321d5..0000000
--- a/src/mainboard/pcengines/alix1c/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/pcengines/alix1c/mainboard.c b/src/mainboard/pcengines/alix1c/mainboard.c
index a32cb14..74c1cc4 100644
--- a/src/mainboard/pcengines/alix1c/mainboard.c
+++ b/src/mainboard/pcengines/alix1c/mainboard.c
@@ -19,7 +19,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include "chip.h"
 
 static void init(struct device *dev)
 {
diff --git a/src/mainboard/pcengines/alix2d/chip.h b/src/mainboard/pcengines/alix2d/chip.h
deleted file mode 100644
index fb321d5..0000000
--- a/src/mainboard/pcengines/alix2d/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/pcengines/alix2d/mainboard.c b/src/mainboard/pcengines/alix2d/mainboard.c
index b227d66..1b526c9 100644
--- a/src/mainboard/pcengines/alix2d/mainboard.c
+++ b/src/mainboard/pcengines/alix2d/mainboard.c
@@ -19,7 +19,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include "chip.h"
 
 static void init(struct device *dev)
 {
diff --git a/src/mainboard/rca/rm4100/chip.h b/src/mainboard/rca/rm4100/chip.h
deleted file mode 100644
index 4aec17f..0000000
--- a/src/mainboard/rca/rm4100/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Joseph Smith <joe at settoplinux.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/rca/rm4100/mainboard.c b/src/mainboard/rca/rm4100/mainboard.c
index 653b22a..613c1d7 100644
--- a/src/mainboard/rca/rm4100/mainboard.c
+++ b/src/mainboard/rca/rm4100/mainboard.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <boot/tables.h>
 #include <arch/coreboot_tables.h>
-#include "chip.h"
 
 int add_mainboard_resources(struct lb_memory *mem)
 {
diff --git a/src/mainboard/roda/rk886ex/chip.h b/src/mainboard/roda/rk886ex/chip.h
deleted file mode 100644
index 6f24f71..0000000
--- a/src/mainboard/roda/rk886ex/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2009 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c
index d87d712..1f4ebc7 100644
--- a/src/mainboard/roda/rk886ex/mainboard.c
+++ b/src/mainboard/roda/rk886ex/mainboard.c
@@ -29,7 +29,6 @@
 #include <x86emu/x86emu.h>
 #endif
 #include <arch/coreboot_tables.h>
-#include "chip.h"
 
 #include <ec/acpi/ec.h>
 #include "m3885.h"
diff --git a/src/mainboard/samsung/lumpy/chip.h b/src/mainboard/samsung/lumpy/chip.h
deleted file mode 100644
index 831a973..0000000
--- a/src/mainboard/samsung/lumpy/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2008 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c
index c5db0d3..20b59b7 100644
--- a/src/mainboard/samsung/lumpy/mainboard.c
+++ b/src/mainboard/samsung/lumpy/mainboard.c
@@ -34,7 +34,6 @@
 #include <arch/coreboot_tables.h>
 #include <ec/smsc/mec1308/ec.h>
 #include "hda_verb.h"
-#include "chip.h"
 #include "ec.h"
 #include "onboard.h"
 #include <southbridge/intel/bd82x6x/pch.h>
diff --git a/src/mainboard/samsung/stumpy/chip.h b/src/mainboard/samsung/stumpy/chip.h
deleted file mode 100644
index 831a973..0000000
--- a/src/mainboard/samsung/stumpy/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2008 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/samsung/stumpy/mainboard.c b/src/mainboard/samsung/stumpy/mainboard.c
index 9152a3b..2456e70 100644
--- a/src/mainboard/samsung/stumpy/mainboard.c
+++ b/src/mainboard/samsung/stumpy/mainboard.c
@@ -34,7 +34,6 @@
 #include <arch/interrupt.h>
 #include <arch/coreboot_tables.h>
 #include "hda_verb.h"
-#include "chip.h"
 #include <southbridge/intel/bd82x6x/pch.h>
 
 void mainboard_suspend_resume(void)
diff --git a/src/mainboard/siemens/sitemp_g1p1/chip.h b/src/mainboard/siemens/sitemp_g1p1/chip.h
deleted file mode 100644
index ff426e0..0000000
--- a/src/mainboard/siemens/sitemp_g1p1/chip.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Advanced Micro Devices, Inc.
- * Copyright (C) 2010 Siemens AG, Inc.
- * (Written by Josef Kellermann <joseph.kellermann at heitec.de> for Siemens AG, Inc.)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config
-{
-	u32 uma_size;			/* How many UMA should be used in memory for TOP. */
-	unsigned int plx_present : 1;
-};
-
diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.c b/src/mainboard/siemens/sitemp_g1p1/mainboard.c
index 05435d8..905d23f 100644
--- a/src/mainboard/siemens/sitemp_g1p1/mainboard.c
+++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.c
@@ -34,7 +34,6 @@
 #include <southbridge/amd/rs690/chip.h>
 #include <southbridge/amd/rs690/rs690.h>
 #include <superio/ite/it8712f/it8712f.h>
-#include "chip.h"
 #if CONFIG_PCI_OPTION_ROM_RUN_YABEL
 #include <x86emu/x86emu.h>
 #endif
@@ -673,13 +672,14 @@ struct {
 };
 
 
-static void update_subsystemid( device_t dev ) {
+unsigned int plx_present = 0;
 
+static void update_subsystemid( device_t dev )
+{
 	int i;
-	struct mainboard_config *mb = dev->chip_info;
 
 	dev->subsystem_vendor = 0x110a;
-	if( mb->plx_present ){
+	if( plx_present ){
 		dev->subsystem_device = 0x4076; // U1P1 = 0x4076, U1P0 = 0x4077
 	} else {
 		dev->subsystem_device = 0x4077; // U1P0 = 0x4077
@@ -701,12 +701,12 @@ static void update_subsystemid( device_t dev ) {
  * @param
  */
 
-static void detect_hw_variant( device_t dev ) {
+static void detect_hw_variant( device_t dev )
+{
 
 	device_t nb_dev =0, dev2 = 0;
 	struct southbridge_amd_rs690_config *cfg;
 	u32 lc_state, id = 0;
-	struct mainboard_config *mb = dev->chip_info;
 
 	printk(BIOS_INFO, "Scan for PLX device ...\n");
 	nb_dev = dev_find_slot(0, PCI_DEVFN(0, 0));
@@ -782,10 +782,10 @@ static void detect_hw_variant( device_t dev ) {
 		break;
 	}
 
-	mb->plx_present = 0;
+	plx_present = 0;
 	if( id == PLX_VIDDID ){
 		printk(BIOS_INFO, "found PLX device\n");
-		mb->plx_present = 1;
+		plx_present = 1;
 		cfg = (struct southbridge_amd_rs690_config *)dev2->chip_info;
 		if( cfg->gfx_tmds ) {
 			printk(BIOS_INFO, "Disable 'gfx_tmds' support\n");
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/chip.h b/src/mainboard/soyo/sy-6ba-plus-iii/chip.h
deleted file mode 100644
index 1c3876d..0000000
--- a/src/mainboard/soyo/sy-6ba-plus-iii/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/mainboard.c b/src/mainboard/soyo/sy-6ba-plus-iii/mainboard.c
index 4cead76..9e7b1f2 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/mainboard.c
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Soyo SY-6BA+ III Mainboard")
diff --git a/src/mainboard/sunw/ultra40/chip.h b/src/mainboard/sunw/ultra40/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/sunw/ultra40/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/sunw/ultra40/mainboard.c b/src/mainboard/sunw/ultra40/mainboard.c
index b5e865d..d46ea38 100644
--- a/src/mainboard/sunw/ultra40/mainboard.c
+++ b/src/mainboard/sunw/ultra40/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Sun Ultra 40 Mainboard")
diff --git a/src/mainboard/supermicro/h8dme/chip.h b/src/mainboard/supermicro/h8dme/chip.h
deleted file mode 100644
index 2076c6f..0000000
--- a/src/mainboard/supermicro/h8dme/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/supermicro/h8dme/mainboard.c b/src/mainboard/supermicro/h8dme/mainboard.c
index c1b9635..c092c71 100644
--- a/src/mainboard/supermicro/h8dme/mainboard.c
+++ b/src/mainboard/supermicro/h8dme/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Supermicro H8DME Mainboard")
diff --git a/src/mainboard/supermicro/h8dmr/chip.h b/src/mainboard/supermicro/h8dmr/chip.h
deleted file mode 100644
index ebd990b..0000000
--- a/src/mainboard/supermicro/h8dmr/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 AMD
- * Written by Yinghai Lu <yinghailu at amd.com> for AMD.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/supermicro/h8dmr/mainboard.c b/src/mainboard/supermicro/h8dmr/mainboard.c
index a00d9e8..45536af 100644
--- a/src/mainboard/supermicro/h8dmr/mainboard.c
+++ b/src/mainboard/supermicro/h8dmr/mainboard.c
@@ -20,7 +20,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Supermicro H8DMR Mainboard")
diff --git a/src/mainboard/supermicro/h8dmr_fam10/chip.h b/src/mainboard/supermicro/h8dmr_fam10/chip.h
deleted file mode 100644
index ebd990b..0000000
--- a/src/mainboard/supermicro/h8dmr_fam10/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 AMD
- * Written by Yinghai Lu <yinghailu at amd.com> for AMD.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/supermicro/h8dmr_fam10/mainboard.c b/src/mainboard/supermicro/h8dmr_fam10/mainboard.c
index e59a980..24736a9 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/mainboard.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/mainboard.c
@@ -20,7 +20,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Supermicro H8DMR Mainboard (Family 10)")
diff --git a/src/mainboard/supermicro/h8qgi/chip.h b/src/mainboard/supermicro/h8qgi/chip.h
deleted file mode 100644
index a252705..0000000
--- a/src/mainboard/supermicro/h8qgi/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/supermicro/h8qgi/mainboard.c b/src/mainboard/supermicro/h8qgi/mainboard.c
index f6d437e..1f02c73 100644
--- a/src/mainboard/supermicro/h8qgi/mainboard.c
+++ b/src/mainboard/supermicro/h8qgi/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
 #include <NbPlatform.h>
-#include "chip.h"
 
 void set_pcie_dereset(void *nbconfig);
 void set_pcie_reset(void *nbconfig);
diff --git a/src/mainboard/supermicro/h8qme_fam10/chip.h b/src/mainboard/supermicro/h8qme_fam10/chip.h
deleted file mode 100644
index ebd990b..0000000
--- a/src/mainboard/supermicro/h8qme_fam10/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 AMD
- * Written by Yinghai Lu <yinghailu at amd.com> for AMD.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/supermicro/h8qme_fam10/mainboard.c b/src/mainboard/supermicro/h8qme_fam10/mainboard.c
index 45b0920..647f623 100644
--- a/src/mainboard/supermicro/h8qme_fam10/mainboard.c
+++ b/src/mainboard/supermicro/h8qme_fam10/mainboard.c
@@ -20,7 +20,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Supermicro H8QME-2+ Mainboard (Family 10)")
diff --git a/src/mainboard/supermicro/h8scm_fam10/chip.h b/src/mainboard/supermicro/h8scm_fam10/chip.h
deleted file mode 100644
index a98b97e..0000000
--- a/src/mainboard/supermicro/h8scm_fam10/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/supermicro/h8scm_fam10/mainboard.c b/src/mainboard/supermicro/h8scm_fam10/mainboard.c
index d0fb541..e5a58fe 100644
--- a/src/mainboard/supermicro/h8scm_fam10/mainboard.c
+++ b/src/mainboard/supermicro/h8scm_fam10/mainboard.c
@@ -27,7 +27,6 @@
 #include <device/pci_def.h>
 #include <southbridge/amd/sb700/sb700.h>
 #include <southbridge/amd/sr5650/cmn.h>
-#include "chip.h"
 
 
 void set_pcie_reset(void);
@@ -73,10 +72,6 @@ void set_pcie_dereset(void)
 *************************************************/
 static void h8scm_enable(device_t dev)
 {
-	/* Leave it for furture use. */
-	/* struct mainboard_config *mainboard =
-	   (struct mainboard_config *)dev->chip_info; */
-
 	printk(BIOS_INFO, "Mainboard H8SCM Enable. dev=0x%p\n", dev);
 
 	msr_t msr, msr2;
diff --git a/src/mainboard/supermicro/x6dai_g/chip.h b/src/mainboard/supermicro/x6dai_g/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/supermicro/x6dai_g/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/supermicro/x6dai_g/mainboard.c b/src/mainboard/supermicro/x6dai_g/mainboard.c
index 1db8cd4..d9b4bc4 100644
--- a/src/mainboard/supermicro/x6dai_g/mainboard.c
+++ b/src/mainboard/supermicro/x6dai_g/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Supermicro X6DAi-G Mainboard")
diff --git a/src/mainboard/supermicro/x6dhe_g/chip.h b/src/mainboard/supermicro/x6dhe_g/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/supermicro/x6dhe_g/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/supermicro/x6dhe_g/mainboard.c b/src/mainboard/supermicro/x6dhe_g/mainboard.c
index a242ddd..c09c95a 100644
--- a/src/mainboard/supermicro/x6dhe_g/mainboard.c
+++ b/src/mainboard/supermicro/x6dhe_g/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
     CHIP_NAME("Supermicro X6DHE-G Mainboard")
diff --git a/src/mainboard/supermicro/x6dhe_g2/chip.h b/src/mainboard/supermicro/x6dhe_g2/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/supermicro/x6dhe_g2/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/supermicro/x6dhe_g2/mainboard.c b/src/mainboard/supermicro/x6dhe_g2/mainboard.c
index fdb67cc..c20a842 100644
--- a/src/mainboard/supermicro/x6dhe_g2/mainboard.c
+++ b/src/mainboard/supermicro/x6dhe_g2/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
     CHIP_NAME("Supermicro X6DHE-G2 Mainboard")
diff --git a/src/mainboard/supermicro/x6dhr_ig/chip.h b/src/mainboard/supermicro/x6dhr_ig/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/supermicro/x6dhr_ig/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/supermicro/x6dhr_ig/mainboard.c b/src/mainboard/supermicro/x6dhr_ig/mainboard.c
index 51acb86..3875fe0 100644
--- a/src/mainboard/supermicro/x6dhr_ig/mainboard.c
+++ b/src/mainboard/supermicro/x6dhr_ig/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Supermicro X6DHR-iG Mainboard")
diff --git a/src/mainboard/supermicro/x6dhr_ig2/chip.h b/src/mainboard/supermicro/x6dhr_ig2/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/supermicro/x6dhr_ig2/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
index 6b6c64f..981aee8 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Supermicro X6DHR-iG2 Mainboard")
diff --git a/src/mainboard/supermicro/x7db8/chip.h b/src/mainboard/supermicro/x7db8/chip.h
deleted file mode 100644
index 70f9bb4..0000000
--- a/src/mainboard/supermicro/x7db8/chip.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (c) 2011 Sven Schnelle <svens at stackframe.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/supermicro/x7db8/mainboard.c b/src/mainboard/supermicro/x7db8/mainboard.c
index 27a26f9..618eca9 100644
--- a/src/mainboard/supermicro/x7db8/mainboard.c
+++ b/src/mainboard/supermicro/x7db8/mainboard.c
@@ -25,7 +25,6 @@
 #include <boot/tables.h>
 #include <delay.h>
 #include <arch/coreboot_tables.h>
-#include "chip.h"
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <arch/io.h>
diff --git a/src/mainboard/technexion/tim5690/chip.h b/src/mainboard/technexion/tim5690/chip.h
deleted file mode 100644
index 05e1582..0000000
--- a/src/mainboard/technexion/tim5690/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
-
diff --git a/src/mainboard/technexion/tim5690/mainboard.c b/src/mainboard/technexion/tim5690/mainboard.c
index 5a22182..2975e86 100644
--- a/src/mainboard/technexion/tim5690/mainboard.c
+++ b/src/mainboard/technexion/tim5690/mainboard.c
@@ -27,7 +27,6 @@
 #include <device/pci_def.h>
 #include <southbridge/amd/sb600/sb600.h>
 #include <superio/ite/it8712f/it8712f.h>
-#include "chip.h"
 #include "tn_post_code.h"
 #include "vgabios.h"
 
diff --git a/src/mainboard/technexion/tim8690/chip.h b/src/mainboard/technexion/tim8690/chip.h
deleted file mode 100644
index 05e1582..0000000
--- a/src/mainboard/technexion/tim8690/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
-
diff --git a/src/mainboard/technexion/tim8690/mainboard.c b/src/mainboard/technexion/tim8690/mainboard.c
index f7ec110..40ab345 100644
--- a/src/mainboard/technexion/tim8690/mainboard.c
+++ b/src/mainboard/technexion/tim8690/mainboard.c
@@ -26,7 +26,6 @@
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
 #include <southbridge/amd/sb600/sb600.h>
-#include "chip.h"
 
 #define ADT7461_ADDRESS 0x4C
 #define ARA_ADDRESS     0x0C /* Alert Response Address */
diff --git a/src/mainboard/technologic/ts5300/chip.h b/src/mainboard/technologic/ts5300/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/technologic/ts5300/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/technologic/ts5300/mainboard.c b/src/mainboard/technologic/ts5300/mainboard.c
index 58333b8..164b7e8 100644
--- a/src/mainboard/technologic/ts5300/mainboard.c
+++ b/src/mainboard/technologic/ts5300/mainboard.c
@@ -4,7 +4,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <cpu/amd/sc520.h>
-#include "chip.h"
 
 
 #if 0
diff --git a/src/mainboard/televideo/tc7020/chip.h b/src/mainboard/televideo/tc7020/chip.h
deleted file mode 100644
index 6b6d455..0000000
--- a/src/mainboard/televideo/tc7020/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Kenji Noguchi <tokyo246 at gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/televideo/tc7020/mainboard.c b/src/mainboard/televideo/tc7020/mainboard.c
index a0919dc..ee41109 100644
--- a/src/mainboard/televideo/tc7020/mainboard.c
+++ b/src/mainboard/televideo/tc7020/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("TeleVideo TC7020 Mainboard")
diff --git a/src/mainboard/thomson/ip1000/chip.h b/src/mainboard/thomson/ip1000/chip.h
deleted file mode 100644
index 4aec17f..0000000
--- a/src/mainboard/thomson/ip1000/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Joseph Smith <joe at settoplinux.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/thomson/ip1000/mainboard.c b/src/mainboard/thomson/ip1000/mainboard.c
index f6eee68..e5c3ea1 100644
--- a/src/mainboard/thomson/ip1000/mainboard.c
+++ b/src/mainboard/thomson/ip1000/mainboard.c
@@ -27,7 +27,6 @@
 #endif
 #include <arch/coreboot_tables.h>
 #include <arch/io.h>
-#include "chip.h"
 
 int add_mainboard_resources(struct lb_memory *mem)
 {
diff --git a/src/mainboard/traverse/geos/chip.h b/src/mainboard/traverse/geos/chip.h
deleted file mode 100644
index ae69536..0000000
--- a/src/mainboard/traverse/geos/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/traverse/geos/mainboard.c b/src/mainboard/traverse/geos/mainboard.c
index b578959..c299bc8 100644
--- a/src/mainboard/traverse/geos/mainboard.c
+++ b/src/mainboard/traverse/geos/mainboard.c
@@ -19,7 +19,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include "chip.h"
 
 static void init(struct device *dev)
 {
diff --git a/src/mainboard/tyan/s1846/chip.h b/src/mainboard/tyan/s1846/chip.h
deleted file mode 100644
index dc9bed3..0000000
--- a/src/mainboard/tyan/s1846/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s1846/mainboard.c b/src/mainboard/tyan/s1846/mainboard.c
index e5ab1c9..fb2034c 100644
--- a/src/mainboard/tyan/s1846/mainboard.c
+++ b/src/mainboard/tyan/s1846/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S1846 Mainboard")
diff --git a/src/mainboard/tyan/s2735/chip.h b/src/mainboard/tyan/s2735/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/tyan/s2735/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s2735/mainboard.c b/src/mainboard/tyan/s2735/mainboard.c
index 267755c..5456b9e 100644
--- a/src/mainboard/tyan/s2735/mainboard.c
+++ b/src/mainboard/tyan/s2735/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2735 Mainboard")
diff --git a/src/mainboard/tyan/s2850/chip.h b/src/mainboard/tyan/s2850/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/tyan/s2850/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s2850/mainboard.c b/src/mainboard/tyan/s2850/mainboard.c
index 8afa8f0..137aa57 100644
--- a/src/mainboard/tyan/s2850/mainboard.c
+++ b/src/mainboard/tyan/s2850/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2850 Mainboard")
diff --git a/src/mainboard/tyan/s2875/chip.h b/src/mainboard/tyan/s2875/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/tyan/s2875/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s2875/mainboard.c b/src/mainboard/tyan/s2875/mainboard.c
index 49e1092..cbc4c6c 100644
--- a/src/mainboard/tyan/s2875/mainboard.c
+++ b/src/mainboard/tyan/s2875/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2875 Mainboard")
diff --git a/src/mainboard/tyan/s2880/chip.h b/src/mainboard/tyan/s2880/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/tyan/s2880/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s2880/mainboard.c b/src/mainboard/tyan/s2880/mainboard.c
index 7fc8615..96e3cf2 100644
--- a/src/mainboard/tyan/s2880/mainboard.c
+++ b/src/mainboard/tyan/s2880/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2880 Mainboard")
diff --git a/src/mainboard/tyan/s2881/chip.h b/src/mainboard/tyan/s2881/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/tyan/s2881/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s2881/mainboard.c b/src/mainboard/tyan/s2881/mainboard.c
index 9da5fe8..5034c5d 100644
--- a/src/mainboard/tyan/s2881/mainboard.c
+++ b/src/mainboard/tyan/s2881/mainboard.c
@@ -21,7 +21,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2881 Mainboard")
diff --git a/src/mainboard/tyan/s2882/chip.h b/src/mainboard/tyan/s2882/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/tyan/s2882/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s2882/mainboard.c b/src/mainboard/tyan/s2882/mainboard.c
index 0779df1..771d8b6 100644
--- a/src/mainboard/tyan/s2882/mainboard.c
+++ b/src/mainboard/tyan/s2882/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2882 Mainboard")
diff --git a/src/mainboard/tyan/s2885/chip.h b/src/mainboard/tyan/s2885/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/tyan/s2885/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s2885/mainboard.c b/src/mainboard/tyan/s2885/mainboard.c
index 27da722..446460d 100644
--- a/src/mainboard/tyan/s2885/mainboard.c
+++ b/src/mainboard/tyan/s2885/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2885 Mainboard")
diff --git a/src/mainboard/tyan/s2891/chip.h b/src/mainboard/tyan/s2891/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/tyan/s2891/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s2891/mainboard.c b/src/mainboard/tyan/s2891/mainboard.c
index c529c0a..155f084 100644
--- a/src/mainboard/tyan/s2891/mainboard.c
+++ b/src/mainboard/tyan/s2891/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2891 Mainboard")
diff --git a/src/mainboard/tyan/s2892/chip.h b/src/mainboard/tyan/s2892/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/tyan/s2892/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s2892/mainboard.c b/src/mainboard/tyan/s2892/mainboard.c
index 299f836..10fd0c0 100644
--- a/src/mainboard/tyan/s2892/mainboard.c
+++ b/src/mainboard/tyan/s2892/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2892 Mainboard")
diff --git a/src/mainboard/tyan/s2895/chip.h b/src/mainboard/tyan/s2895/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/tyan/s2895/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s2895/mainboard.c b/src/mainboard/tyan/s2895/mainboard.c
index f152eae..4de60af 100644
--- a/src/mainboard/tyan/s2895/mainboard.c
+++ b/src/mainboard/tyan/s2895/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2895 Mainboard")
diff --git a/src/mainboard/tyan/s2912/chip.h b/src/mainboard/tyan/s2912/chip.h
deleted file mode 100644
index ebd990b..0000000
--- a/src/mainboard/tyan/s2912/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 AMD
- * Written by Yinghai Lu <yinghailu at amd.com> for AMD.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s2912/mainboard.c b/src/mainboard/tyan/s2912/mainboard.c
index 6084b3d..bfdb75e 100644
--- a/src/mainboard/tyan/s2912/mainboard.c
+++ b/src/mainboard/tyan/s2912/mainboard.c
@@ -20,7 +20,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2912 Mainboard")
diff --git a/src/mainboard/tyan/s2912_fam10/chip.h b/src/mainboard/tyan/s2912_fam10/chip.h
deleted file mode 100644
index ebd990b..0000000
--- a/src/mainboard/tyan/s2912_fam10/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 AMD
- * Written by Yinghai Lu <yinghailu at amd.com> for AMD.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s2912_fam10/mainboard.c b/src/mainboard/tyan/s2912_fam10/mainboard.c
index f976b14..3fed2f8 100644
--- a/src/mainboard/tyan/s2912_fam10/mainboard.c
+++ b/src/mainboard/tyan/s2912_fam10/mainboard.c
@@ -20,7 +20,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S2912 Mainboard (Family 10)")
diff --git a/src/mainboard/tyan/s4880/chip.h b/src/mainboard/tyan/s4880/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/tyan/s4880/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s4880/mainboard.c b/src/mainboard/tyan/s4880/mainboard.c
index f2f865b..ad9adab 100644
--- a/src/mainboard/tyan/s4880/mainboard.c
+++ b/src/mainboard/tyan/s4880/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S4880 Mainboard")
diff --git a/src/mainboard/tyan/s4882/chip.h b/src/mainboard/tyan/s4882/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/tyan/s4882/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/tyan/s4882/mainboard.c b/src/mainboard/tyan/s4882/mainboard.c
index 8d626c7..0595d59 100644
--- a/src/mainboard/tyan/s4882/mainboard.c
+++ b/src/mainboard/tyan/s4882/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("Tyan S4882 Mainboard")
diff --git a/src/mainboard/via/epia-cn/chip.h b/src/mainboard/via/epia-cn/chip.h
deleted file mode 100644
index 0a2badb..0000000
--- a/src/mainboard/via/epia-cn/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 VIA Technologies, Inc.
- * (Written by Aaron Lwe <aaron.lwe at gmail.com> for VIA)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/via/epia-cn/mainboard.c b/src/mainboard/via/epia-cn/mainboard.c
index 1a7210e..702b5b0 100644
--- a/src/mainboard/via/epia-cn/mainboard.c
+++ b/src/mainboard/via/epia-cn/mainboard.c
@@ -20,7 +20,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("VIA EPIA-CN Mainboard")
diff --git a/src/mainboard/via/epia-m/chip.h b/src/mainboard/via/epia-m/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/via/epia-m/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c
index 2e517a3..49f18df 100644
--- a/src/mainboard/via/epia-m/mainboard.c
+++ b/src/mainboard/via/epia-m/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("VIA EPIA-M Mainboard")
diff --git a/src/mainboard/via/epia-m700/chip.h b/src/mainboard/via/epia-m700/chip.h
deleted file mode 100644
index c44330b..0000000
--- a/src/mainboard/via/epia-m700/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2009 One Laptop per Child, Association, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/via/epia-m700/mainboard.c b/src/mainboard/via/epia-m700/mainboard.c
index 5a21b86..53537e0 100644
--- a/src/mainboard/via/epia-m700/mainboard.c
+++ b/src/mainboard/via/epia-m700/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("VIA EPIA-M700 Mainboard")
diff --git a/src/mainboard/via/epia-n/chip.h b/src/mainboard/via/epia-n/chip.h
deleted file mode 100644
index 0a2badb..0000000
--- a/src/mainboard/via/epia-n/chip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 VIA Technologies, Inc.
- * (Written by Aaron Lwe <aaron.lwe at gmail.com> for VIA)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/via/epia-n/mainboard.c b/src/mainboard/via/epia-n/mainboard.c
index cf5ae96..0dfbd3c 100644
--- a/src/mainboard/via/epia-n/mainboard.c
+++ b/src/mainboard/via/epia-n/mainboard.c
@@ -26,7 +26,6 @@
 #include <arch/ioapic.h>
 #include <southbridge/via/vt8237r/vt8237r.h>
 #include <cpu/x86/lapic_def.h>
-#include "chip.h"
 
 int add_mainboard_resources(struct lb_memory *mem)
 {
diff --git a/src/mainboard/via/epia/chip.h b/src/mainboard/via/epia/chip.h
deleted file mode 100644
index d138e51..0000000
--- a/src/mainboard/via/epia/chip.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/via/epia/mainboard.c b/src/mainboard/via/epia/mainboard.c
index 25d72a5..95edf46 100644
--- a/src/mainboard/via/epia/mainboard.c
+++ b/src/mainboard/via/epia/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("VIA EPIA Mainboard")
diff --git a/src/mainboard/via/pc2500e/chip.h b/src/mainboard/via/pc2500e/chip.h
deleted file mode 100644
index 41784c9..0000000
--- a/src/mainboard/via/pc2500e/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Uwe Hermann <uwe at hermann-uwe.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/via/pc2500e/mainboard.c b/src/mainboard/via/pc2500e/mainboard.c
index 9fcee55..65aed56 100644
--- a/src/mainboard/via/pc2500e/mainboard.c
+++ b/src/mainboard/via/pc2500e/mainboard.c
@@ -19,7 +19,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("VIA pc2500e Mainboard")
diff --git a/src/mainboard/via/vt8454c/chip.h b/src/mainboard/via/vt8454c/chip.h
deleted file mode 100644
index 5101c16..0000000
--- a/src/mainboard/via/vt8454c/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2009 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/via/vt8454c/mainboard.c b/src/mainboard/via/vt8454c/mainboard.c
index e931ccd..c6e1b92 100644
--- a/src/mainboard/via/vt8454c/mainboard.c
+++ b/src/mainboard/via/vt8454c/mainboard.c
@@ -20,7 +20,6 @@
  */
 
 #include <device/device.h>
-#include "chip.h"
 
 struct chip_operations mainboard_ops = {
 	CHIP_NAME("VIA VT8454c Mainboard")
diff --git a/src/mainboard/winent/pl6064/chip.h b/src/mainboard/winent/pl6064/chip.h
deleted file mode 100644
index ae69536..0000000
--- a/src/mainboard/winent/pl6064/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Advanced Micro Devices, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/winent/pl6064/mainboard.c b/src/mainboard/winent/pl6064/mainboard.c
index cd664f6..0293c7a 100644
--- a/src/mainboard/winent/pl6064/mainboard.c
+++ b/src/mainboard/winent/pl6064/mainboard.c
@@ -19,7 +19,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include "chip.h"
 
 static void init(struct device *dev)
 {
diff --git a/src/mainboard/wyse/s50/chip.h b/src/mainboard/wyse/s50/chip.h
deleted file mode 100644
index e0e9727..0000000
--- a/src/mainboard/wyse/s50/chip.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Nils Jacobs
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {};
diff --git a/src/mainboard/wyse/s50/mainboard.c b/src/mainboard/wyse/s50/mainboard.c
index 8497b24..99dfb42 100644
--- a/src/mainboard/wyse/s50/mainboard.c
+++ b/src/mainboard/wyse/s50/mainboard.c
@@ -21,7 +21,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include "chip.h"
 
 static void init(struct device *dev)
 {
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index 989f747..824bc6c 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -45,7 +45,11 @@ static struct device mainboard = {
 	.id = 0,
 	.chip = &mainboard,
 	.type = chip,
+#ifdef MAINBOARDS_HAVE_CHIP_H
 	.chiph_exists = 1,
+#else
+	.chiph_exists = 0,
+#endif
 	.children = &root
 };
 
@@ -561,12 +565,14 @@ int main(int argc, char** argv) {
 	}
 
 	headers.next = 0;
+#ifdef MAINBOARDS_HAVE_CHIP_H
 	if (scan_mode == STATIC_MODE) {
 		headers.next = malloc(sizeof(struct header));
 		headers.next->name = malloc(strlen(mainboard)+12);
 		headers.next->next = 0;
 		sprintf(headers.next->name, "mainboard/%s", mainboard);
 	}
+#endif
 
 	FILE *filec = fopen(devtree, "r");
 	if (!filec) {
@@ -610,8 +616,11 @@ int main(int argc, char** argv) {
 		walk_device_tree(autogen, &root, inherit_subsystem_ids, NULL);
 		fprintf(autogen, "\n/* pass 0 */\n");
 		walk_device_tree(autogen, &root, pass0, NULL);
-		fprintf(autogen, "\n/* pass 1 */\nstruct mainboard_config mainboard_info_0;\n"
-						"struct device *last_dev = &%s;\n", lastdev->name);
+		fprintf(autogen, "\n/* pass 1 */\n"
+			    "struct device *last_dev = &%s;\n", lastdev->name);
+#ifdef MAINBOARDS_HAVE_CHIP_H
+		fprintf(autogen, "struct mainboard_config mainboard_info_0;\n");
+#endif
 		walk_device_tree(autogen, &root, pass1, NULL);
 
 	} else if (scan_mode == BOOTBLOCK_MODE) {




More information about the coreboot mailing list