[coreboot] New patch to review for coreboot: 801576f Drop redundant CHIP_NAME in mainboard.c

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Sat Oct 27 10:03:06 CEST 2012


Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1635

-gerrit

commit 801576f9a79ff866c2f3af766ea21794ccd7afea
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Tue Oct 9 22:28:56 2012 +0300

    Drop redundant CHIP_NAME in mainboard.c
    
    Compose the name from Kconfig strings instead.
    
    As the field is for debug print use only, a minor change in the output
    should do no harm. The strings no longer include word "Mainboard".
    
    Change-Id: Ifd24f408271eb5a5d1a08a317512ef00cb537ee2
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/devices/root_device.c                             | 2 ++
 src/include/device/device.h                           | 2 ++
 src/mainboard/a-trend/atc-6220/mainboard.c            | 1 -
 src/mainboard/a-trend/atc-6240/mainboard.c            | 1 -
 src/mainboard/aaeon/pfm-540i_revb/mainboard.c         | 1 -
 src/mainboard/abit/be6-ii_v2_0/mainboard.c            | 1 -
 src/mainboard/advansus/a785e-i/mainboard.c            | 1 -
 src/mainboard/advantech/pcm-5820/mainboard.c          | 1 -
 src/mainboard/amd/bimini_fam10/mainboard.c            | 1 -
 src/mainboard/amd/db800/mainboard.c                   | 1 -
 src/mainboard/amd/dbm690t/mainboard.c                 | 1 -
 src/mainboard/amd/dinar/mainboard.c                   | 1 -
 src/mainboard/amd/inagua/mainboard.c                  | 1 -
 src/mainboard/amd/mahogany/mainboard.c                | 1 -
 src/mainboard/amd/mahogany_fam10/mainboard.c          | 1 -
 src/mainboard/amd/norwich/mainboard.c                 | 1 -
 src/mainboard/amd/parmer/mainboard.c                  | 1 -
 src/mainboard/amd/persimmon/mainboard.c               | 1 -
 src/mainboard/amd/pistachio/mainboard.c               | 1 -
 src/mainboard/amd/rumba/mainboard.c                   | 1 -
 src/mainboard/amd/serengeti_cheetah/mainboard.c       | 1 -
 src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c | 1 -
 src/mainboard/amd/south_station/mainboard.c           | 1 -
 src/mainboard/amd/thatcher/mainboard.c                | 1 -
 src/mainboard/amd/tilapia_fam10/mainboard.c           | 1 -
 src/mainboard/amd/torpedo/mainboard.c                 | 1 -
 src/mainboard/amd/union_station/mainboard.c           | 1 -
 src/mainboard/aopen/dxplplusu/mainboard.c             | 1 -
 src/mainboard/arima/hdama/mainboard.c                 | 1 -
 src/mainboard/artecgroup/dbe61/mainboard.c            | 1 -
 src/mainboard/asi/mb_5blgp/mainboard.c                | 1 -
 src/mainboard/asi/mb_5blmp/mainboard.c                | 1 -
 src/mainboard/asrock/939a785gmh/mainboard.c           | 1 -
 src/mainboard/asrock/e350m1/mainboard.c               | 1 -
 src/mainboard/asus/a8n_e/mainboard.c                  | 1 -
 src/mainboard/asus/a8v-e_deluxe/mainboard.c           | 1 -
 src/mainboard/asus/a8v-e_se/mainboard.c               | 1 -
 src/mainboard/asus/dsbf/mainboard.c                   | 1 -
 src/mainboard/asus/k8v-x/mainboard.c                  | 1 -
 src/mainboard/asus/m2n-e/mainboard.c                  | 1 -
 src/mainboard/asus/m2v-mx_se/mainboard.c              | 1 -
 src/mainboard/asus/m2v/mainboard.c                    | 1 -
 src/mainboard/asus/m4a78-em/mainboard.c               | 1 -
 src/mainboard/asus/m4a785-m/mainboard.c               | 5 -----
 src/mainboard/asus/m5a88-v/mainboard.c                | 1 -
 src/mainboard/asus/mew-am/mainboard.c                 | 1 -
 src/mainboard/asus/mew-vm/mainboard.c                 | 1 -
 src/mainboard/asus/p2b-d/mainboard.c                  | 1 -
 src/mainboard/asus/p2b-ds/mainboard.c                 | 1 -
 src/mainboard/asus/p2b-f/mainboard.c                  | 1 -
 src/mainboard/asus/p2b-ls/mainboard.c                 | 1 -
 src/mainboard/asus/p2b/mainboard.c                    | 1 -
 src/mainboard/asus/p3b-f/mainboard.c                  | 1 -
 src/mainboard/avalue/eax-785e/mainboard.c             | 1 -
 src/mainboard/axus/tc320/mainboard.c                  | 1 -
 src/mainboard/azza/pt-6ibd/mainboard.c                | 1 -
 src/mainboard/bachmann/ot200/mainboard.c              | 1 -
 src/mainboard/bcom/winnet100/mainboard.c              | 1 -
 src/mainboard/bcom/winnetp680/mainboard.c             | 1 -
 src/mainboard/bifferos/bifferboard/mainboard.c        | 1 -
 src/mainboard/biostar/m6tba/mainboard.c               | 1 -
 src/mainboard/broadcom/blast/mainboard.c              | 1 -
 src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c  | 1 -
 src/mainboard/digitallogic/adl855pc/mainboard.c       | 1 -
 src/mainboard/digitallogic/msm586seg/mainboard.c      | 1 -
 src/mainboard/digitallogic/msm800sev/mainboard.c      | 1 -
 src/mainboard/eaglelion/5bcm/mainboard.c              | 1 -
 src/mainboard/ecs/p6iwp-fe/mainboard.c                | 1 -
 src/mainboard/emulation/qemu-x86/mainboard.c          | 1 -
 src/mainboard/getac/p470/mainboard.c                  | 1 -
 src/mainboard/gigabyte/ga-6bxc/mainboard.c            | 1 -
 src/mainboard/gigabyte/ga-6bxe/mainboard.c            | 1 -
 src/mainboard/gigabyte/ga_2761gxdk/mainboard.c        | 1 -
 src/mainboard/gigabyte/m57sli/mainboard.c             | 1 -
 src/mainboard/gigabyte/ma785gm/mainboard.c            | 1 -
 src/mainboard/gigabyte/ma785gmt/mainboard.c           | 1 -
 src/mainboard/gigabyte/ma78gm/mainboard.c             | 1 -
 src/mainboard/hp/dl145_g1/mainboard.c                 | 1 -
 src/mainboard/hp/dl145_g3/mainboard.c                 | 1 -
 src/mainboard/hp/dl165_g6_fam10/mainboard.c           | 1 -
 src/mainboard/hp/e_vectra_p2706t/mainboard.c          | 1 -
 src/mainboard/ibase/mb899/mainboard.c                 | 1 -
 src/mainboard/ibm/e325/mainboard.c                    | 1 -
 src/mainboard/ibm/e326/mainboard.c                    | 1 -
 src/mainboard/iei/juki-511p/mainboard.c               | 1 -
 src/mainboard/iei/kino-780am2-fam10/mainboard.c       | 1 -
 src/mainboard/iei/nova4899r/mainboard.c               | 1 -
 src/mainboard/iei/pcisa-lx-800-r10/mainboard.c        | 1 -
 src/mainboard/iei/pm-lx-800-r11/mainboard.c           | 1 -
 src/mainboard/intel/d810e2cb/mainboard.c              | 1 -
 src/mainboard/intel/d945gclf/mainboard.c              | 1 -
 src/mainboard/intel/eagleheights/mainboard.c          | 1 -
 src/mainboard/intel/emeraldlake2/mainboard.c          | 1 -
 src/mainboard/intel/jarrell/mainboard.c               | 1 -
 src/mainboard/intel/mtarvon/mainboard.c               | 1 -
 src/mainboard/intel/truxton/mainboard.c               | 1 -
 src/mainboard/intel/xe7501devkit/mainboard.c          | 1 -
 src/mainboard/iwave/iWRainbowG6/mainboard.c           | 1 -
 src/mainboard/iwill/dk8_htx/mainboard.c               | 1 -
 src/mainboard/iwill/dk8s2/mainboard.c                 | 1 -
 src/mainboard/iwill/dk8x/mainboard.c                  | 1 -
 src/mainboard/jetway/j7f24/mainboard.c                | 1 -
 src/mainboard/jetway/pa78vm5/mainboard.c              | 1 -
 src/mainboard/kontron/986lcd-m/mainboard.c            | 1 -
 src/mainboard/kontron/kt690/mainboard.c               | 1 -
 src/mainboard/lanner/em8510/mainboard.c               | 1 -
 src/mainboard/lenovo/t60/mainboard.c                  | 1 -
 src/mainboard/lenovo/x60/mainboard.c                  | 1 -
 src/mainboard/lippert/frontrunner/mainboard.c         | 1 -
 src/mainboard/lippert/hurricane-lx/mainboard.c        | 1 -
 src/mainboard/lippert/literunner-lx/mainboard.c       | 1 -
 src/mainboard/lippert/roadrunner-lx/mainboard.c       | 1 -
 src/mainboard/lippert/spacerunner-lx/mainboard.c      | 1 -
 src/mainboard/mitac/6513wu/mainboard.c                | 1 -
 src/mainboard/msi/ms6119/mainboard.c                  | 1 -
 src/mainboard/msi/ms6147/mainboard.c                  | 1 -
 src/mainboard/msi/ms6156/mainboard.c                  | 1 -
 src/mainboard/msi/ms6178/mainboard.c                  | 1 -
 src/mainboard/msi/ms7135/mainboard.c                  | 1 -
 src/mainboard/msi/ms7260/mainboard.c                  | 1 -
 src/mainboard/msi/ms9185/mainboard.c                  | 1 -
 src/mainboard/msi/ms9282/mainboard.c                  | 1 -
 src/mainboard/msi/ms9652_fam10/mainboard.c            | 1 -
 src/mainboard/nec/powermate2000/mainboard.c           | 1 -
 src/mainboard/newisys/khepri/mainboard.c              | 1 -
 src/mainboard/nokia/ip530/mainboard.c                 | 1 -
 src/mainboard/nvidia/l1_2pvv/mainboard.c              | 1 -
 src/mainboard/pcengines/alix1c/mainboard.c            | 1 -
 src/mainboard/pcengines/alix2d/mainboard.c            | 1 -
 src/mainboard/rca/rm4100/mainboard.c                  | 1 -
 src/mainboard/roda/rk886ex/mainboard.c                | 1 -
 src/mainboard/samsung/lumpy/mainboard.c               | 1 -
 src/mainboard/samsung/stumpy/mainboard.c              | 1 -
 src/mainboard/siemens/sitemp_g1p1/mainboard.c         | 1 -
 src/mainboard/soyo/sy-6ba-plus-iii/mainboard.c        | 1 -
 src/mainboard/sunw/ultra40/mainboard.c                | 1 -
 src/mainboard/supermicro/h8dme/mainboard.c            | 1 -
 src/mainboard/supermicro/h8dmr/mainboard.c            | 1 -
 src/mainboard/supermicro/h8dmr_fam10/mainboard.c      | 1 -
 src/mainboard/supermicro/h8qgi/mainboard.c            | 1 -
 src/mainboard/supermicro/h8qme_fam10/mainboard.c      | 1 -
 src/mainboard/supermicro/h8scm_fam10/mainboard.c      | 1 -
 src/mainboard/supermicro/x6dai_g/mainboard.c          | 1 -
 src/mainboard/supermicro/x6dhe_g/mainboard.c          | 1 -
 src/mainboard/supermicro/x6dhe_g2/mainboard.c         | 1 -
 src/mainboard/supermicro/x6dhr_ig/mainboard.c         | 1 -
 src/mainboard/supermicro/x6dhr_ig2/mainboard.c        | 1 -
 src/mainboard/supermicro/x7db8/mainboard.c            | 1 -
 src/mainboard/technexion/tim5690/mainboard.c          | 1 -
 src/mainboard/technexion/tim8690/mainboard.c          | 1 -
 src/mainboard/technologic/ts5300/mainboard.c          | 1 -
 src/mainboard/televideo/tc7020/mainboard.c            | 1 -
 src/mainboard/thomson/ip1000/mainboard.c              | 1 -
 src/mainboard/traverse/geos/mainboard.c               | 1 -
 src/mainboard/tyan/s1846/mainboard.c                  | 1 -
 src/mainboard/tyan/s2735/mainboard.c                  | 1 -
 src/mainboard/tyan/s2850/mainboard.c                  | 1 -
 src/mainboard/tyan/s2875/mainboard.c                  | 1 -
 src/mainboard/tyan/s2880/mainboard.c                  | 1 -
 src/mainboard/tyan/s2881/mainboard.c                  | 1 -
 src/mainboard/tyan/s2882/mainboard.c                  | 1 -
 src/mainboard/tyan/s2885/mainboard.c                  | 1 -
 src/mainboard/tyan/s2891/mainboard.c                  | 1 -
 src/mainboard/tyan/s2892/mainboard.c                  | 1 -
 src/mainboard/tyan/s2895/mainboard.c                  | 1 -
 src/mainboard/tyan/s2912/mainboard.c                  | 1 -
 src/mainboard/tyan/s2912_fam10/mainboard.c            | 1 -
 src/mainboard/tyan/s4880/mainboard.c                  | 1 -
 src/mainboard/tyan/s4882/mainboard.c                  | 1 -
 src/mainboard/tyan/s8226/mainboard.c                  | 1 -
 src/mainboard/via/epia-cn/mainboard.c                 | 1 -
 src/mainboard/via/epia-m/mainboard.c                  | 1 -
 src/mainboard/via/epia-m700/mainboard.c               | 1 -
 src/mainboard/via/epia-n/mainboard.c                  | 1 -
 src/mainboard/via/epia/mainboard.c                    | 1 -
 src/mainboard/via/pc2500e/mainboard.c                 | 1 -
 src/mainboard/via/vt8454c/mainboard.c                 | 1 -
 src/mainboard/winent/pl6064/mainboard.c               | 1 -
 src/mainboard/wyse/s50/mainboard.c                    | 1 -
 util/sconfig/main.c                                   | 2 ++
 180 files changed, 6 insertions(+), 181 deletions(-)

diff --git a/src/devices/root_device.c b/src/devices/root_device.c
index 591ba66..8ff2fde 100644
--- a/src/devices/root_device.c
+++ b/src/devices/root_device.c
@@ -27,6 +27,8 @@
 #include <device/pci.h>
 #include <reset.h>
 
+const char mainboard_name[] = CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER;
+
 /**
  * Read the resources for the root device, that encompass the resources for
  * the entire system.
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 6ab2db4..d31edab 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -120,6 +120,8 @@ extern struct device	*all_devices;	/* list of all devices */
 extern struct resource	*free_resources;
 extern struct bus	*free_links;
 
+extern const char mainboard_name[];
+
 /* IGD UMA memory */
 extern uint64_t uma_memory_base;
 extern uint64_t uma_memory_size;
diff --git a/src/mainboard/a-trend/atc-6220/mainboard.c b/src/mainboard/a-trend/atc-6220/mainboard.c
index 26f18dd..7b22b87 100644
--- a/src/mainboard/a-trend/atc-6220/mainboard.c
+++ b/src/mainboard/a-trend/atc-6220/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("A-Trend ATC-6220 Mainboard")
 };
diff --git a/src/mainboard/a-trend/atc-6240/mainboard.c b/src/mainboard/a-trend/atc-6240/mainboard.c
index 13f6e3f..443b375 100644
--- a/src/mainboard/a-trend/atc-6240/mainboard.c
+++ b/src/mainboard/a-trend/atc-6240/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("A-Trend ATC-6240 Mainboard")
 };
diff --git a/src/mainboard/aaeon/pfm-540i_revb/mainboard.c b/src/mainboard/aaeon/pfm-540i_revb/mainboard.c
index 8f1412f..ba64b9e 100644
--- a/src/mainboard/aaeon/pfm-540i_revb/mainboard.c
+++ b/src/mainboard/aaeon/pfm-540i_revb/mainboard.c
@@ -32,6 +32,5 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AAEON PFM-540I_REVB Mainboard")
 	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/abit/be6-ii_v2_0/mainboard.c b/src/mainboard/abit/be6-ii_v2_0/mainboard.c
index c70df95..7b22b87 100644
--- a/src/mainboard/abit/be6-ii_v2_0/mainboard.c
+++ b/src/mainboard/abit/be6-ii_v2_0/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Abit BE6-II V2.0 Mainboard")
 };
diff --git a/src/mainboard/advansus/a785e-i/mainboard.c b/src/mainboard/advansus/a785e-i/mainboard.c
index 44def89..e0f7c3b 100644
--- a/src/mainboard/advansus/a785e-i/mainboard.c
+++ b/src/mainboard/advansus/a785e-i/mainboard.c
@@ -82,6 +82,5 @@ static void a785e_i_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ADVANSUS A785E-I Mainboard")
 	.enable_dev = a785e_i_enable,
 };
diff --git a/src/mainboard/advantech/pcm-5820/mainboard.c b/src/mainboard/advantech/pcm-5820/mainboard.c
index 345c6f8..7b22b87 100644
--- a/src/mainboard/advantech/pcm-5820/mainboard.c
+++ b/src/mainboard/advantech/pcm-5820/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Advantech PCM-5820 Mainboard")
 };
diff --git a/src/mainboard/amd/bimini_fam10/mainboard.c b/src/mainboard/amd/bimini_fam10/mainboard.c
index d18a24e..c9f0732 100644
--- a/src/mainboard/amd/bimini_fam10/mainboard.c
+++ b/src/mainboard/amd/bimini_fam10/mainboard.c
@@ -133,6 +133,5 @@ static void bimini_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AMD Bimini Mainboard")
 	.enable_dev = bimini_enable,
 };
diff --git a/src/mainboard/amd/db800/mainboard.c b/src/mainboard/amd/db800/mainboard.c
index e841d07..e34990b 100644
--- a/src/mainboard/amd/db800/mainboard.c
+++ b/src/mainboard/amd/db800/mainboard.c
@@ -32,6 +32,5 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AMD DB800 Mainboard")
 	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/amd/dbm690t/mainboard.c b/src/mainboard/amd/dbm690t/mainboard.c
index fe441e9..39475ce 100644
--- a/src/mainboard/amd/dbm690t/mainboard.c
+++ b/src/mainboard/amd/dbm690t/mainboard.c
@@ -190,6 +190,5 @@ static void dbm690t_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AMD DBM690T   Mainboard")
 	.enable_dev = dbm690t_enable,
 };
diff --git a/src/mainboard/amd/dinar/mainboard.c b/src/mainboard/amd/dinar/mainboard.c
index ea196ed..ce9f2ca 100644
--- a/src/mainboard/amd/dinar/mainboard.c
+++ b/src/mainboard/amd/dinar/mainboard.c
@@ -74,6 +74,5 @@ static void dinar_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AMD DINAR Mainboard")
 		.enable_dev = dinar_enable,
 };
diff --git a/src/mainboard/amd/inagua/mainboard.c b/src/mainboard/amd/inagua/mainboard.c
index e71e5b6..9a5e00c 100644
--- a/src/mainboard/amd/inagua/mainboard.c
+++ b/src/mainboard/amd/inagua/mainboard.c
@@ -82,6 +82,5 @@ static void inagua_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard")
 		.enable_dev = inagua_enable,
 };
diff --git a/src/mainboard/amd/mahogany/mainboard.c b/src/mainboard/amd/mahogany/mainboard.c
index b292d33..c8405fc 100644
--- a/src/mainboard/amd/mahogany/mainboard.c
+++ b/src/mainboard/amd/mahogany/mainboard.c
@@ -106,6 +106,5 @@ static void mahogany_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AMD MAHOGANY   Mainboard")
 	.enable_dev = mahogany_enable,
 };
diff --git a/src/mainboard/amd/mahogany_fam10/mainboard.c b/src/mainboard/amd/mahogany_fam10/mainboard.c
index c0e7c34..f944bd3 100644
--- a/src/mainboard/amd/mahogany_fam10/mainboard.c
+++ b/src/mainboard/amd/mahogany_fam10/mainboard.c
@@ -107,6 +107,5 @@ static void mahogany_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AMD MAHOGANY   Mainboard")
 	.enable_dev = mahogany_enable,
 };
diff --git a/src/mainboard/amd/norwich/mainboard.c b/src/mainboard/amd/norwich/mainboard.c
index c735abb..e3bea15 100644
--- a/src/mainboard/amd/norwich/mainboard.c
+++ b/src/mainboard/amd/norwich/mainboard.c
@@ -32,6 +32,5 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AMD Norwich Mainboard")
 	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/amd/parmer/mainboard.c b/src/mainboard/amd/parmer/mainboard.c
index 99699c3..40ad8c5 100644
--- a/src/mainboard/amd/parmer/mainboard.c
+++ b/src/mainboard/amd/parmer/mainboard.c
@@ -47,6 +47,5 @@ static void parmer_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard")
 	.enable_dev = parmer_enable,
 };
diff --git a/src/mainboard/amd/persimmon/mainboard.c b/src/mainboard/amd/persimmon/mainboard.c
index 72edd10..4c52dc3 100644
--- a/src/mainboard/amd/persimmon/mainboard.c
+++ b/src/mainboard/amd/persimmon/mainboard.c
@@ -66,6 +66,5 @@ static void persimmon_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard")
 	.enable_dev = persimmon_enable,
 };
diff --git a/src/mainboard/amd/pistachio/mainboard.c b/src/mainboard/amd/pistachio/mainboard.c
index 9d22e1b..f59e2bc 100644
--- a/src/mainboard/amd/pistachio/mainboard.c
+++ b/src/mainboard/amd/pistachio/mainboard.c
@@ -259,6 +259,5 @@ static void pistachio_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AMD Pistachio Mainboard")
 	.enable_dev = pistachio_enable,
 };
diff --git a/src/mainboard/amd/rumba/mainboard.c b/src/mainboard/amd/rumba/mainboard.c
index 42547cc..71d2d68 100644
--- a/src/mainboard/amd/rumba/mainboard.c
+++ b/src/mainboard/amd/rumba/mainboard.c
@@ -33,7 +33,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AMD Rumba Mainboard")
         .enable_dev = enable_dev,
 };
 
diff --git a/src/mainboard/amd/serengeti_cheetah/mainboard.c b/src/mainboard/amd/serengeti_cheetah/mainboard.c
index a156f2e..0c310fb 100644
--- a/src/mainboard/amd/serengeti_cheetah/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AMD Serengeti Cheetah Mainboard")
 };
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
index 9984bd6..bf28738 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.c
@@ -25,5 +25,4 @@
 #include <device/pci_ops.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AMD family 10 Cheetah mainboard")
 };
diff --git a/src/mainboard/amd/south_station/mainboard.c b/src/mainboard/amd/south_station/mainboard.c
index 831e57f..5f31e03 100644
--- a/src/mainboard/amd/south_station/mainboard.c
+++ b/src/mainboard/amd/south_station/mainboard.c
@@ -82,6 +82,5 @@ static void southstation_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard")
 	.enable_dev = southstation_enable,
 };
diff --git a/src/mainboard/amd/thatcher/mainboard.c b/src/mainboard/amd/thatcher/mainboard.c
index 2ca3c36..8d4eae2 100644
--- a/src/mainboard/amd/thatcher/mainboard.c
+++ b/src/mainboard/amd/thatcher/mainboard.c
@@ -64,6 +64,5 @@ static void thatcher_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard")
 	.enable_dev = thatcher_enable,
 };
diff --git a/src/mainboard/amd/tilapia_fam10/mainboard.c b/src/mainboard/amd/tilapia_fam10/mainboard.c
index c130ad9..79fdbc2 100644
--- a/src/mainboard/amd/tilapia_fam10/mainboard.c
+++ b/src/mainboard/amd/tilapia_fam10/mainboard.c
@@ -284,6 +284,5 @@ static void tilapia_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AMD TILAPIA   Mainboard")
 	.enable_dev = tilapia_enable,
 };
diff --git a/src/mainboard/amd/torpedo/mainboard.c b/src/mainboard/amd/torpedo/mainboard.c
index adbb823..d0f3f2b 100644
--- a/src/mainboard/amd/torpedo/mainboard.c
+++ b/src/mainboard/amd/torpedo/mainboard.c
@@ -58,6 +58,5 @@ static void torpedo_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard")
   .enable_dev = torpedo_enable,
 };
diff --git a/src/mainboard/amd/union_station/mainboard.c b/src/mainboard/amd/union_station/mainboard.c
index 79a29db..063f9b4 100644
--- a/src/mainboard/amd/union_station/mainboard.c
+++ b/src/mainboard/amd/union_station/mainboard.c
@@ -55,6 +55,5 @@ static void unionstation_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard")
 	.enable_dev = unionstation_enable,
 };
diff --git a/src/mainboard/aopen/dxplplusu/mainboard.c b/src/mainboard/aopen/dxplplusu/mainboard.c
index 0688914..0c310fb 100644
--- a/src/mainboard/aopen/dxplplusu/mainboard.c
+++ b/src/mainboard/aopen/dxplplusu/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AOpen DXPL Plus-U Mainboard")
 };
 
diff --git a/src/mainboard/arima/hdama/mainboard.c b/src/mainboard/arima/hdama/mainboard.c
index df658e2..0c310fb 100644
--- a/src/mainboard/arima/hdama/mainboard.c
+++ b/src/mainboard/arima/hdama/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Arima HDAMA Mainboard")
 };
 
diff --git a/src/mainboard/artecgroup/dbe61/mainboard.c b/src/mainboard/artecgroup/dbe61/mainboard.c
index 649f955..07fd58c 100644
--- a/src/mainboard/artecgroup/dbe61/mainboard.c
+++ b/src/mainboard/artecgroup/dbe61/mainboard.c
@@ -52,6 +52,5 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Artec Group dbe61 Mainboard")
         .enable_dev = enable_dev,
 };
diff --git a/src/mainboard/asi/mb_5blgp/mainboard.c b/src/mainboard/asi/mb_5blgp/mainboard.c
index 7a466bd..443b375 100644
--- a/src/mainboard/asi/mb_5blgp/mainboard.c
+++ b/src/mainboard/asi/mb_5blgp/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASI MB-5BLGP Mainboard")
 };
diff --git a/src/mainboard/asi/mb_5blmp/mainboard.c b/src/mainboard/asi/mb_5blmp/mainboard.c
index 9aaf14d..20720d3 100644
--- a/src/mainboard/asi/mb_5blmp/mainboard.c
+++ b/src/mainboard/asi/mb_5blmp/mainboard.c
@@ -21,6 +21,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASI/BCom MB-5BLMP Mainboard")
 };
 
diff --git a/src/mainboard/asrock/939a785gmh/mainboard.c b/src/mainboard/asrock/939a785gmh/mainboard.c
index c24ee4c..d018696 100644
--- a/src/mainboard/asrock/939a785gmh/mainboard.c
+++ b/src/mainboard/asrock/939a785gmh/mainboard.c
@@ -104,7 +104,6 @@ static void mb_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Asrock 939A785GMH/128M Mainboard")
 	.enable_dev = mb_enable,
 };
 
diff --git a/src/mainboard/asrock/e350m1/mainboard.c b/src/mainboard/asrock/e350m1/mainboard.c
index 574e8d3..a17778a 100644
--- a/src/mainboard/asrock/e350m1/mainboard.c
+++ b/src/mainboard/asrock/e350m1/mainboard.c
@@ -54,6 +54,5 @@ static void e350m1_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard")
 	.enable_dev = e350m1_enable,
 };
diff --git a/src/mainboard/asus/a8n_e/mainboard.c b/src/mainboard/asus/a8n_e/mainboard.c
index aedca67..8ef928f 100644
--- a/src/mainboard/asus/a8n_e/mainboard.c
+++ b/src/mainboard/asus/a8n_e/mainboard.c
@@ -22,5 +22,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS A8N-E Mainboard")
 };
diff --git a/src/mainboard/asus/a8v-e_deluxe/mainboard.c b/src/mainboard/asus/a8v-e_deluxe/mainboard.c
index cb38be2..77d04da 100644
--- a/src/mainboard/asus/a8v-e_deluxe/mainboard.c
+++ b/src/mainboard/asus/a8v-e_deluxe/mainboard.c
@@ -23,5 +23,4 @@
 #include <device/pci_ids.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS A8V-E Deluxe Mainboard")
 };
diff --git a/src/mainboard/asus/a8v-e_se/mainboard.c b/src/mainboard/asus/a8v-e_se/mainboard.c
index c119e1c..77d04da 100644
--- a/src/mainboard/asus/a8v-e_se/mainboard.c
+++ b/src/mainboard/asus/a8v-e_se/mainboard.c
@@ -23,5 +23,4 @@
 #include <device/pci_ids.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS A8V-E SE Mainboard")
 };
diff --git a/src/mainboard/asus/dsbf/mainboard.c b/src/mainboard/asus/dsbf/mainboard.c
index e4057e5..34a355e 100644
--- a/src/mainboard/asus/dsbf/mainboard.c
+++ b/src/mainboard/asus/dsbf/mainboard.c
@@ -32,7 +32,6 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER)
 	.enable_dev = mainboard_enable,
 };
 
diff --git a/src/mainboard/asus/k8v-x/mainboard.c b/src/mainboard/asus/k8v-x/mainboard.c
index 82d8ba0..64d8174 100644
--- a/src/mainboard/asus/k8v-x/mainboard.c
+++ b/src/mainboard/asus/k8v-x/mainboard.c
@@ -59,5 +59,4 @@ u32 vt8237_ide_80pin_detect(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS K8V-X Mainboard")
 };
diff --git a/src/mainboard/asus/m2n-e/mainboard.c b/src/mainboard/asus/m2n-e/mainboard.c
index 0d7013f..a508f12 100644
--- a/src/mainboard/asus/m2n-e/mainboard.c
+++ b/src/mainboard/asus/m2n-e/mainboard.c
@@ -33,6 +33,5 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS M2N-E Mainboard")
 	.enable_dev = mainboard_enable,
 };
diff --git a/src/mainboard/asus/m2v-mx_se/mainboard.c b/src/mainboard/asus/m2v-mx_se/mainboard.c
index 4cb562b..3c735ae 100644
--- a/src/mainboard/asus/m2v-mx_se/mainboard.c
+++ b/src/mainboard/asus/m2v-mx_se/mainboard.c
@@ -23,5 +23,4 @@
 #include <southbridge/via/k8t890/k8t890.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS M2V-MX SE Mainboard")
 };
diff --git a/src/mainboard/asus/m2v/mainboard.c b/src/mainboard/asus/m2v/mainboard.c
index 2a44851..349c41c 100644
--- a/src/mainboard/asus/m2v/mainboard.c
+++ b/src/mainboard/asus/m2v/mainboard.c
@@ -55,5 +55,4 @@ u32 vt8237_ide_80pin_detect(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS M2V")
 };
diff --git a/src/mainboard/asus/m4a78-em/mainboard.c b/src/mainboard/asus/m4a78-em/mainboard.c
index 738e854..9b56277 100644
--- a/src/mainboard/asus/m4a78-em/mainboard.c
+++ b/src/mainboard/asus/m4a78-em/mainboard.c
@@ -128,6 +128,5 @@ static void m4a78em_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS M4A78-EM Mainboard")
 	.enable_dev = m4a78em_enable,
 };
diff --git a/src/mainboard/asus/m4a785-m/mainboard.c b/src/mainboard/asus/m4a785-m/mainboard.c
index 5230f84..a0b79fe 100644
--- a/src/mainboard/asus/m4a785-m/mainboard.c
+++ b/src/mainboard/asus/m4a785-m/mainboard.c
@@ -200,10 +200,5 @@ static void m4a785m_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-#ifdef CONFIG_BOARD_ASUS_M4A785TM
-	CHIP_NAME("ASUS M4A785T-M Mainboard")
-#else
-	CHIP_NAME("ASUS M4A785-M Mainboard")
-#endif
 	.enable_dev = m4a785m_enable,
 };
diff --git a/src/mainboard/asus/m5a88-v/mainboard.c b/src/mainboard/asus/m5a88-v/mainboard.c
index f2c31b3..d1e530f 100644
--- a/src/mainboard/asus/m5a88-v/mainboard.c
+++ b/src/mainboard/asus/m5a88-v/mainboard.c
@@ -83,6 +83,5 @@ static void m5a88pm_v_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS M5A88-V Mainboard")
 	.enable_dev = m5a88pm_v_enable,
 };
diff --git a/src/mainboard/asus/mew-am/mainboard.c b/src/mainboard/asus/mew-am/mainboard.c
index 09b6533..7b22b87 100644
--- a/src/mainboard/asus/mew-am/mainboard.c
+++ b/src/mainboard/asus/mew-am/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS MEW-AM Mainboard")
 };
diff --git a/src/mainboard/asus/mew-vm/mainboard.c b/src/mainboard/asus/mew-vm/mainboard.c
index 6705927..0fb0f5e 100644
--- a/src/mainboard/asus/mew-vm/mainboard.c
+++ b/src/mainboard/asus/mew-vm/mainboard.c
@@ -1,5 +1,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS MEW-VM Mainboard")
 };
diff --git a/src/mainboard/asus/p2b-d/mainboard.c b/src/mainboard/asus/p2b-d/mainboard.c
index 3fe9dc4..43f1738 100644
--- a/src/mainboard/asus/p2b-d/mainboard.c
+++ b/src/mainboard/asus/p2b-d/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS P2B-D Mainboard")
 };
diff --git a/src/mainboard/asus/p2b-ds/mainboard.c b/src/mainboard/asus/p2b-ds/mainboard.c
index c874137..443b375 100644
--- a/src/mainboard/asus/p2b-ds/mainboard.c
+++ b/src/mainboard/asus/p2b-ds/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS P2B-DS Mainboard")
 };
diff --git a/src/mainboard/asus/p2b-f/mainboard.c b/src/mainboard/asus/p2b-f/mainboard.c
index e5d2e14..7b22b87 100644
--- a/src/mainboard/asus/p2b-f/mainboard.c
+++ b/src/mainboard/asus/p2b-f/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS P2B-F Mainboard")
 };
diff --git a/src/mainboard/asus/p2b-ls/mainboard.c b/src/mainboard/asus/p2b-ls/mainboard.c
index 9f250f4..7b22b87 100644
--- a/src/mainboard/asus/p2b-ls/mainboard.c
+++ b/src/mainboard/asus/p2b-ls/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS P2B-LS Mainboard")
 };
diff --git a/src/mainboard/asus/p2b/mainboard.c b/src/mainboard/asus/p2b/mainboard.c
index 527dc7a..7b22b87 100644
--- a/src/mainboard/asus/p2b/mainboard.c
+++ b/src/mainboard/asus/p2b/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS P2B Mainboard")
 };
diff --git a/src/mainboard/asus/p3b-f/mainboard.c b/src/mainboard/asus/p3b-f/mainboard.c
index 9b41c79..7b22b87 100644
--- a/src/mainboard/asus/p3b-f/mainboard.c
+++ b/src/mainboard/asus/p3b-f/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ASUS P3B-F Mainboard")
 };
diff --git a/src/mainboard/avalue/eax-785e/mainboard.c b/src/mainboard/avalue/eax-785e/mainboard.c
index 476f09f..631891f 100644
--- a/src/mainboard/avalue/eax-785e/mainboard.c
+++ b/src/mainboard/avalue/eax-785e/mainboard.c
@@ -82,6 +82,5 @@ static void eax_785e(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard")
 	.enable_dev = eax_785e,
 };
diff --git a/src/mainboard/axus/tc320/mainboard.c b/src/mainboard/axus/tc320/mainboard.c
index af52755..38999a2 100644
--- a/src/mainboard/axus/tc320/mainboard.c
+++ b/src/mainboard/axus/tc320/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AXUS TC320 Mainboard")
 };
diff --git a/src/mainboard/azza/pt-6ibd/mainboard.c b/src/mainboard/azza/pt-6ibd/mainboard.c
index 483f328..7b22b87 100644
--- a/src/mainboard/azza/pt-6ibd/mainboard.c
+++ b/src/mainboard/azza/pt-6ibd/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AZZA PT-6IBD Mainboard")
 };
diff --git a/src/mainboard/bachmann/ot200/mainboard.c b/src/mainboard/bachmann/ot200/mainboard.c
index 74555b6..d846ffb 100644
--- a/src/mainboard/bachmann/ot200/mainboard.c
+++ b/src/mainboard/bachmann/ot200/mainboard.c
@@ -71,6 +71,5 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER)
 	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/bcom/winnet100/mainboard.c b/src/mainboard/bcom/winnet100/mainboard.c
index 13089df..38999a2 100644
--- a/src/mainboard/bcom/winnet100/mainboard.c
+++ b/src/mainboard/bcom/winnet100/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("BCOM WinNET100 Mainboard")
 };
diff --git a/src/mainboard/bcom/winnetp680/mainboard.c b/src/mainboard/bcom/winnetp680/mainboard.c
index 26fc5e3..96a521d 100644
--- a/src/mainboard/bcom/winnetp680/mainboard.c
+++ b/src/mainboard/bcom/winnetp680/mainboard.c
@@ -22,5 +22,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("BCOM WinNET P680 Mainboard")
 };
diff --git a/src/mainboard/bifferos/bifferboard/mainboard.c b/src/mainboard/bifferos/bifferboard/mainboard.c
index f3387a3..d269dc3 100644
--- a/src/mainboard/bifferos/bifferboard/mainboard.c
+++ b/src/mainboard/bifferos/bifferboard/mainboard.c
@@ -20,6 +20,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Bifferos Bifferboard")
 };
 
diff --git a/src/mainboard/biostar/m6tba/mainboard.c b/src/mainboard/biostar/m6tba/mainboard.c
index 6795284..7b22b87 100644
--- a/src/mainboard/biostar/m6tba/mainboard.c
+++ b/src/mainboard/biostar/m6tba/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Biostar M6TBA Mainboard")
 };
diff --git a/src/mainboard/broadcom/blast/mainboard.c b/src/mainboard/broadcom/blast/mainboard.c
index c556bd5..0c310fb 100644
--- a/src/mainboard/broadcom/blast/mainboard.c
+++ b/src/mainboard/broadcom/blast/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Broadcom Blast Mainboard")
 };
 
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c b/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c
index d4abb63..7b22b87 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Compaq Deskpro EN SFF P600 Mainboard")
 };
diff --git a/src/mainboard/digitallogic/adl855pc/mainboard.c b/src/mainboard/digitallogic/adl855pc/mainboard.c
index 41c34e4..0c310fb 100644
--- a/src/mainboard/digitallogic/adl855pc/mainboard.c
+++ b/src/mainboard/digitallogic/adl855pc/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("DIGITAL-LOGIC ADL855PC Mainboard")
 };
 
diff --git a/src/mainboard/digitallogic/msm586seg/mainboard.c b/src/mainboard/digitallogic/msm586seg/mainboard.c
index 8f2d8c6..f2902c8 100644
--- a/src/mainboard/digitallogic/msm586seg/mainboard.c
+++ b/src/mainboard/digitallogic/msm586seg/mainboard.c
@@ -129,7 +129,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("DIGITAL-LOGIC MSM586SEG Mainboard")
 	.enable_dev = enable_dev
 };
 
diff --git a/src/mainboard/digitallogic/msm800sev/mainboard.c b/src/mainboard/digitallogic/msm800sev/mainboard.c
index 3ade3d6..2b2b9fe 100644
--- a/src/mainboard/digitallogic/msm800sev/mainboard.c
+++ b/src/mainboard/digitallogic/msm800sev/mainboard.c
@@ -32,7 +32,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("DIGITAL-LOGIC MSM800SEV Mainboard")
         .enable_dev = enable_dev,
 };
 
diff --git a/src/mainboard/eaglelion/5bcm/mainboard.c b/src/mainboard/eaglelion/5bcm/mainboard.c
index e1c499e..0c310fb 100644
--- a/src/mainboard/eaglelion/5bcm/mainboard.c
+++ b/src/mainboard/eaglelion/5bcm/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Eaglelion 5BCM Mainboard")
 };
 
diff --git a/src/mainboard/ecs/p6iwp-fe/mainboard.c b/src/mainboard/ecs/p6iwp-fe/mainboard.c
index c576e47..e413367 100644
--- a/src/mainboard/ecs/p6iwp-fe/mainboard.c
+++ b/src/mainboard/ecs/p6iwp-fe/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("ECS P6IWP-Fe Mainboard")
 };
diff --git a/src/mainboard/emulation/qemu-x86/mainboard.c b/src/mainboard/emulation/qemu-x86/mainboard.c
index f8d0da7..20ba197 100644
--- a/src/mainboard/emulation/qemu-x86/mainboard.c
+++ b/src/mainboard/emulation/qemu-x86/mainboard.c
@@ -71,6 +71,5 @@ static const struct pci_driver vga_driver __pci_driver = {
 };
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("QEMU Mainboard")
 };
 
diff --git a/src/mainboard/getac/p470/mainboard.c b/src/mainboard/getac/p470/mainboard.c
index 1c408db..edaf301 100644
--- a/src/mainboard/getac/p470/mainboard.c
+++ b/src/mainboard/getac/p470/mainboard.c
@@ -97,7 +97,6 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Getac P470 Rugged Notebook")
 	.enable_dev = mainboard_enable,
 };
 
diff --git a/src/mainboard/gigabyte/ga-6bxc/mainboard.c b/src/mainboard/gigabyte/ga-6bxc/mainboard.c
index d43a577..7b22b87 100644
--- a/src/mainboard/gigabyte/ga-6bxc/mainboard.c
+++ b/src/mainboard/gigabyte/ga-6bxc/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("GIGABYTE GA-6BXC Mainboard")
 };
diff --git a/src/mainboard/gigabyte/ga-6bxe/mainboard.c b/src/mainboard/gigabyte/ga-6bxe/mainboard.c
index 281d841..e413367 100644
--- a/src/mainboard/gigabyte/ga-6bxe/mainboard.c
+++ b/src/mainboard/gigabyte/ga-6bxe/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("GIGABYTE GA-6BXE Mainboard")
 };
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c b/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c
index e8b8969..91f19cb 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c
@@ -26,5 +26,4 @@
 #include <device/pci_ops.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("GIGABYTE GA-2761GXDK Mainboard")
 };
diff --git a/src/mainboard/gigabyte/m57sli/mainboard.c b/src/mainboard/gigabyte/m57sli/mainboard.c
index dffa769..6fcdb38 100644
--- a/src/mainboard/gigabyte/m57sli/mainboard.c
+++ b/src/mainboard/gigabyte/m57sli/mainboard.c
@@ -39,6 +39,5 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("GIGABYTE GA-M57SLI Mainboard")
 	.enable_dev = mainboard_enable,
 };
diff --git a/src/mainboard/gigabyte/ma785gm/mainboard.c b/src/mainboard/gigabyte/ma785gm/mainboard.c
index 3a81396..3ce0db6 100644
--- a/src/mainboard/gigabyte/ma785gm/mainboard.c
+++ b/src/mainboard/gigabyte/ma785gm/mainboard.c
@@ -144,6 +144,5 @@ static void ma785gm_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("GIGABYTE MA785GM-US2H   Mainboard")
 	.enable_dev = ma785gm_enable,
 };
diff --git a/src/mainboard/gigabyte/ma785gmt/mainboard.c b/src/mainboard/gigabyte/ma785gmt/mainboard.c
index 91a804a..8961bc8 100644
--- a/src/mainboard/gigabyte/ma785gmt/mainboard.c
+++ b/src/mainboard/gigabyte/ma785gmt/mainboard.c
@@ -255,6 +255,5 @@ static void ma785gmt_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("GIGABYTE MA785GMT-UD2H   Mainboard")
 	.enable_dev = ma785gmt_enable,
 };
diff --git a/src/mainboard/gigabyte/ma78gm/mainboard.c b/src/mainboard/gigabyte/ma78gm/mainboard.c
index d146568..9a8e5dc 100644
--- a/src/mainboard/gigabyte/ma78gm/mainboard.c
+++ b/src/mainboard/gigabyte/ma78gm/mainboard.c
@@ -80,6 +80,5 @@ static void ma78gm_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("GIGABYTE MA78GM-US2H")
 	.enable_dev = ma78gm_enable,
 };
diff --git a/src/mainboard/hp/dl145_g1/mainboard.c b/src/mainboard/hp/dl145_g1/mainboard.c
index fde9d22..156ab49 100644
--- a/src/mainboard/hp/dl145_g1/mainboard.c
+++ b/src/mainboard/hp/dl145_g1/mainboard.c
@@ -24,5 +24,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("HP ProLiant DL145 G1 Mainboard")
 };
diff --git a/src/mainboard/hp/dl145_g3/mainboard.c b/src/mainboard/hp/dl145_g3/mainboard.c
index 81f074e..e0cffe9 100644
--- a/src/mainboard/hp/dl145_g3/mainboard.c
+++ b/src/mainboard/hp/dl145_g3/mainboard.c
@@ -29,5 +29,4 @@
 #include <device/pci_ops.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("HP ProLiant DL145 G3 Mainboard")
 };
diff --git a/src/mainboard/hp/dl165_g6_fam10/mainboard.c b/src/mainboard/hp/dl165_g6_fam10/mainboard.c
index 97f2fb7..e0cffe9 100644
--- a/src/mainboard/hp/dl165_g6_fam10/mainboard.c
+++ b/src/mainboard/hp/dl165_g6_fam10/mainboard.c
@@ -29,5 +29,4 @@
 #include <device/pci_ops.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("HP ProLiant DL165 G6 Mainboard (Fam10h)")
 };
diff --git a/src/mainboard/hp/e_vectra_p2706t/mainboard.c b/src/mainboard/hp/e_vectra_p2706t/mainboard.c
index aa9cc7a..43f1738 100644
--- a/src/mainboard/hp/e_vectra_p2706t/mainboard.c
+++ b/src/mainboard/hp/e_vectra_p2706t/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("HP e-Vectra P2706T Mainboard")
 };
diff --git a/src/mainboard/ibase/mb899/mainboard.c b/src/mainboard/ibase/mb899/mainboard.c
index 5922707..a6bc70f 100644
--- a/src/mainboard/ibase/mb899/mainboard.c
+++ b/src/mainboard/ibase/mb899/mainboard.c
@@ -222,7 +222,6 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("iBASE MB899 Mainboard")
 	.enable_dev = mainboard_enable,
 };
 
diff --git a/src/mainboard/ibm/e325/mainboard.c b/src/mainboard/ibm/e325/mainboard.c
index 136ffaf..0c310fb 100644
--- a/src/mainboard/ibm/e325/mainboard.c
+++ b/src/mainboard/ibm/e325/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("IBM eServer 325 Mainboard")
 };
 
diff --git a/src/mainboard/ibm/e326/mainboard.c b/src/mainboard/ibm/e326/mainboard.c
index bd5ebc5..0c310fb 100644
--- a/src/mainboard/ibm/e326/mainboard.c
+++ b/src/mainboard/ibm/e326/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("IBM eServer 326 Mainboard")
 };
 
diff --git a/src/mainboard/iei/juki-511p/mainboard.c b/src/mainboard/iei/juki-511p/mainboard.c
index e5714cf..b876c2f 100644
--- a/src/mainboard/iei/juki-511p/mainboard.c
+++ b/src/mainboard/iei/juki-511p/mainboard.c
@@ -26,5 +26,4 @@
 #include <arch/io.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("IEI JUKI-511P Mainboard")
 };
diff --git a/src/mainboard/iei/kino-780am2-fam10/mainboard.c b/src/mainboard/iei/kino-780am2-fam10/mainboard.c
index a77cc9d..a9458fd 100644
--- a/src/mainboard/iei/kino-780am2-fam10/mainboard.c
+++ b/src/mainboard/iei/kino-780am2-fam10/mainboard.c
@@ -62,6 +62,5 @@ static void kino_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("IEI Kino-780AM2 Mainboard")
 	.enable_dev = kino_enable,
 };
diff --git a/src/mainboard/iei/nova4899r/mainboard.c b/src/mainboard/iei/nova4899r/mainboard.c
index 85c6521..4cb86a4 100644
--- a/src/mainboard/iei/nova4899r/mainboard.c
+++ b/src/mainboard/iei/nova4899r/mainboard.c
@@ -26,5 +26,4 @@
 #include <arch/io.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("IEI NOVA-4899R Mainboard")
 };
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c b/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c
index 163e360..9d2fecb 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c
+++ b/src/mainboard/iei/pcisa-lx-800-r10/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("IEI PCISA-LX-800-R10 Mainboard")
 };
diff --git a/src/mainboard/iei/pm-lx-800-r11/mainboard.c b/src/mainboard/iei/pm-lx-800-r11/mainboard.c
index b598cac..ae699bf 100644
--- a/src/mainboard/iei/pm-lx-800-r11/mainboard.c
+++ b/src/mainboard/iei/pm-lx-800-r11/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("IEI PM-LX-800-R11 Mainboard")
 };
diff --git a/src/mainboard/intel/d810e2cb/mainboard.c b/src/mainboard/intel/d810e2cb/mainboard.c
index bf2c902..65166b5 100644
--- a/src/mainboard/intel/d810e2cb/mainboard.c
+++ b/src/mainboard/intel/d810e2cb/mainboard.c
@@ -20,5 +20,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Intel D810E2CB Mainboard")
 };
diff --git a/src/mainboard/intel/d945gclf/mainboard.c b/src/mainboard/intel/d945gclf/mainboard.c
index 2e25fa3..516cf98 100644
--- a/src/mainboard/intel/d945gclf/mainboard.c
+++ b/src/mainboard/intel/d945gclf/mainboard.c
@@ -21,6 +21,5 @@
 #include <console/console.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Intel D945GCLF Mainboard")
 };
 
diff --git a/src/mainboard/intel/eagleheights/mainboard.c b/src/mainboard/intel/eagleheights/mainboard.c
index dbe76b2..ec02584 100644
--- a/src/mainboard/intel/eagleheights/mainboard.c
+++ b/src/mainboard/intel/eagleheights/mainboard.c
@@ -23,6 +23,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Intel Eagle Heights Mainboard")
 };
 
diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c
index a649e27..f65a064 100644
--- a/src/mainboard/intel/emeraldlake2/mainboard.c
+++ b/src/mainboard/intel/emeraldlake2/mainboard.c
@@ -224,7 +224,6 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Compal Link ChromeBox")
 	.enable_dev = mainboard_enable,
 };
 
diff --git a/src/mainboard/intel/jarrell/mainboard.c b/src/mainboard/intel/jarrell/mainboard.c
index f66431d..0c310fb 100644
--- a/src/mainboard/intel/jarrell/mainboard.c
+++ b/src/mainboard/intel/jarrell/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Intel Jarell Mainboard")
 };
 
diff --git a/src/mainboard/intel/mtarvon/mainboard.c b/src/mainboard/intel/mtarvon/mainboard.c
index b69df9b..26bc002 100644
--- a/src/mainboard/intel/mtarvon/mainboard.c
+++ b/src/mainboard/intel/mtarvon/mainboard.c
@@ -21,6 +21,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Intel Mt. Arvon Mainboard")
 };
 
diff --git a/src/mainboard/intel/truxton/mainboard.c b/src/mainboard/intel/truxton/mainboard.c
index 754ba0d..26bc002 100644
--- a/src/mainboard/intel/truxton/mainboard.c
+++ b/src/mainboard/intel/truxton/mainboard.c
@@ -21,6 +21,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Intel Truxton Mainboard")
 };
 
diff --git a/src/mainboard/intel/xe7501devkit/mainboard.c b/src/mainboard/intel/xe7501devkit/mainboard.c
index c605624..0c310fb 100644
--- a/src/mainboard/intel/xe7501devkit/mainboard.c
+++ b/src/mainboard/intel/xe7501devkit/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Intel Xeon E7501 DevKit Mainboard")
 };
 
diff --git a/src/mainboard/iwave/iWRainbowG6/mainboard.c b/src/mainboard/iwave/iWRainbowG6/mainboard.c
index 38847e2..7c4064c 100644
--- a/src/mainboard/iwave/iWRainbowG6/mainboard.c
+++ b/src/mainboard/iwave/iWRainbowG6/mainboard.c
@@ -34,6 +34,5 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("iW Rainbow G6 Mainboard")
 	.enable_dev = mainboard_enable,
 };
diff --git a/src/mainboard/iwill/dk8_htx/mainboard.c b/src/mainboard/iwill/dk8_htx/mainboard.c
index 251852f..0fb0f5e 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>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("IWILL DK8-HTX Mainboard")
 };
diff --git a/src/mainboard/iwill/dk8s2/mainboard.c b/src/mainboard/iwill/dk8s2/mainboard.c
index 18ab152..0c310fb 100644
--- a/src/mainboard/iwill/dk8s2/mainboard.c
+++ b/src/mainboard/iwill/dk8s2/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("IWILL DK8S2 Mainboard")
 };
 
diff --git a/src/mainboard/iwill/dk8x/mainboard.c b/src/mainboard/iwill/dk8x/mainboard.c
index 3e062de..0c310fb 100644
--- a/src/mainboard/iwill/dk8x/mainboard.c
+++ b/src/mainboard/iwill/dk8x/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("IWILL DK8X Mainboard")
 };
 
diff --git a/src/mainboard/jetway/j7f24/mainboard.c b/src/mainboard/jetway/j7f24/mainboard.c
index 4b1ee39..96a521d 100644
--- a/src/mainboard/jetway/j7f24/mainboard.c
+++ b/src/mainboard/jetway/j7f24/mainboard.c
@@ -22,5 +22,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Jetway J7F[24]* Mainboard")
 };
diff --git a/src/mainboard/jetway/pa78vm5/mainboard.c b/src/mainboard/jetway/pa78vm5/mainboard.c
index e0f6747..3cf1b0d 100644
--- a/src/mainboard/jetway/pa78vm5/mainboard.c
+++ b/src/mainboard/jetway/pa78vm5/mainboard.c
@@ -109,6 +109,5 @@ static void pa78vm5_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AMD PA78VM5 Mainboard")
 	.enable_dev = pa78vm5_enable,
 };
diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c
index e45956f..cde4389 100644
--- a/src/mainboard/kontron/986lcd-m/mainboard.c
+++ b/src/mainboard/kontron/986lcd-m/mainboard.c
@@ -265,7 +265,6 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Kontron 986LCD-M Mainboard")
 	.enable_dev = mainboard_enable,
 };
 
diff --git a/src/mainboard/kontron/kt690/mainboard.c b/src/mainboard/kontron/kt690/mainboard.c
index 4ca90ad..189b65c 100644
--- a/src/mainboard/kontron/kt690/mainboard.c
+++ b/src/mainboard/kontron/kt690/mainboard.c
@@ -190,6 +190,5 @@ static void kt690_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Kontron KT690/mITX Mainboard")
 	.enable_dev = kt690_enable,
 };
diff --git a/src/mainboard/lanner/em8510/mainboard.c b/src/mainboard/lanner/em8510/mainboard.c
index 9317944..7afd006 100644
--- a/src/mainboard/lanner/em8510/mainboard.c
+++ b/src/mainboard/lanner/em8510/mainboard.c
@@ -21,6 +21,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("LANNER EM-8510 Mainboard")
 };
 
diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c
index 6f00069..2e54c7b 100644
--- a/src/mainboard/lenovo/t60/mainboard.c
+++ b/src/mainboard/lenovo/t60/mainboard.c
@@ -96,7 +96,6 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER)
 	.enable_dev = mainboard_enable,
 };
 
diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c
index e28fa10..e5d2e19 100644
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -108,7 +108,6 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER)
 	.enable_dev = mainboard_enable,
 };
 
diff --git a/src/mainboard/lippert/frontrunner/mainboard.c b/src/mainboard/lippert/frontrunner/mainboard.c
index ec1503e..0c310fb 100644
--- a/src/mainboard/lippert/frontrunner/mainboard.c
+++ b/src/mainboard/lippert/frontrunner/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Lippert Cool Frontrunner Mainboard")
 };
 
diff --git a/src/mainboard/lippert/hurricane-lx/mainboard.c b/src/mainboard/lippert/hurricane-lx/mainboard.c
index 9b7ad98..f13e48b 100644
--- a/src/mainboard/lippert/hurricane-lx/mainboard.c
+++ b/src/mainboard/lippert/hurricane-lx/mainboard.c
@@ -83,6 +83,5 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("LiPPERT Hurricane-LX Mainboard")
 	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/lippert/literunner-lx/mainboard.c b/src/mainboard/lippert/literunner-lx/mainboard.c
index cfec2a8..c1b8fc2 100644
--- a/src/mainboard/lippert/literunner-lx/mainboard.c
+++ b/src/mainboard/lippert/literunner-lx/mainboard.c
@@ -87,6 +87,5 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("LiPPERT LiteRunner-LX Mainboard")
 	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/lippert/roadrunner-lx/mainboard.c b/src/mainboard/lippert/roadrunner-lx/mainboard.c
index 26adb2f..22bcf43 100644
--- a/src/mainboard/lippert/roadrunner-lx/mainboard.c
+++ b/src/mainboard/lippert/roadrunner-lx/mainboard.c
@@ -77,6 +77,5 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("LiPPERT RoadRunner-LX Mainboard")
 	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/lippert/spacerunner-lx/mainboard.c b/src/mainboard/lippert/spacerunner-lx/mainboard.c
index f2aeb10..e2e6093 100644
--- a/src/mainboard/lippert/spacerunner-lx/mainboard.c
+++ b/src/mainboard/lippert/spacerunner-lx/mainboard.c
@@ -82,6 +82,5 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("LiPPERT SpaceRunner-LX Mainboard")
 	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/mitac/6513wu/mainboard.c b/src/mainboard/mitac/6513wu/mainboard.c
index e9d80c4..76ede4f 100644
--- a/src/mainboard/mitac/6513wu/mainboard.c
+++ b/src/mainboard/mitac/6513wu/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Mitac 6513WU Mainboard")
 };
diff --git a/src/mainboard/msi/ms6119/mainboard.c b/src/mainboard/msi/ms6119/mainboard.c
index 7ef3d4b..443b375 100644
--- a/src/mainboard/msi/ms6119/mainboard.c
+++ b/src/mainboard/msi/ms6119/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("MSI MS-6119 Mainboard")
 };
diff --git a/src/mainboard/msi/ms6147/mainboard.c b/src/mainboard/msi/ms6147/mainboard.c
index 091de54..a35a6f1 100644
--- a/src/mainboard/msi/ms6147/mainboard.c
+++ b/src/mainboard/msi/ms6147/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("MSI MS-6147 Mainboard")
 };
diff --git a/src/mainboard/msi/ms6156/mainboard.c b/src/mainboard/msi/ms6156/mainboard.c
index 28b5e81..43f1738 100644
--- a/src/mainboard/msi/ms6156/mainboard.c
+++ b/src/mainboard/msi/ms6156/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("MSI MS-6156 Mainboard")
 };
diff --git a/src/mainboard/msi/ms6178/mainboard.c b/src/mainboard/msi/ms6178/mainboard.c
index 009c134..7b22b87 100644
--- a/src/mainboard/msi/ms6178/mainboard.c
+++ b/src/mainboard/msi/ms6178/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("MSI MS-6178 Mainboard")
 };
diff --git a/src/mainboard/msi/ms7135/mainboard.c b/src/mainboard/msi/ms7135/mainboard.c
index 3ed0c6b..5c30aae 100644
--- a/src/mainboard/msi/ms7135/mainboard.c
+++ b/src/mainboard/msi/ms7135/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("MSI MS7135 Mainboard")
 };
diff --git a/src/mainboard/msi/ms7260/mainboard.c b/src/mainboard/msi/ms7260/mainboard.c
index 06d606f..641e352 100644
--- a/src/mainboard/msi/ms7260/mainboard.c
+++ b/src/mainboard/msi/ms7260/mainboard.c
@@ -36,6 +36,5 @@ static void mainboard_enable(device_t dev)
 #endif
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("MSI K9N Neo (MS-7260) Mainboard")
 	// .enable_dev = mainboard_enable,
 };
diff --git a/src/mainboard/msi/ms9185/mainboard.c b/src/mainboard/msi/ms9185/mainboard.c
index f3e28d4..d4b6ff8 100644
--- a/src/mainboard/msi/ms9185/mainboard.c
+++ b/src/mainboard/msi/ms9185/mainboard.c
@@ -26,5 +26,4 @@
 #include <device/pci_ops.h>
 
 struct chip_operations mainboard_ops = {
-       CHIP_NAME("MSI MS-9185 Mainboard")
 };
diff --git a/src/mainboard/msi/ms9282/mainboard.c b/src/mainboard/msi/ms9282/mainboard.c
index 800fd25..63c7ea7 100644
--- a/src/mainboard/msi/ms9282/mainboard.c
+++ b/src/mainboard/msi/ms9282/mainboard.c
@@ -39,6 +39,5 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-       CHIP_NAME("MSI MS-9282 Mainboard")
        .enable_dev = mainboard_enable,
 };
diff --git a/src/mainboard/msi/ms9652_fam10/mainboard.c b/src/mainboard/msi/ms9652_fam10/mainboard.c
index e570607..afb95d5 100644
--- a/src/mainboard/msi/ms9652_fam10/mainboard.c
+++ b/src/mainboard/msi/ms9652_fam10/mainboard.c
@@ -39,6 +39,5 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("MSI MS-9652 Mainboard (Family 10)")
 	.enable_dev = mainboard_enable,
 };
diff --git a/src/mainboard/nec/powermate2000/mainboard.c b/src/mainboard/nec/powermate2000/mainboard.c
index 1536b70..443b375 100644
--- a/src/mainboard/nec/powermate2000/mainboard.c
+++ b/src/mainboard/nec/powermate2000/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("NEC PowerMate 2000 Mainboard")
 };
diff --git a/src/mainboard/newisys/khepri/mainboard.c b/src/mainboard/newisys/khepri/mainboard.c
index 11e7032..0c310fb 100644
--- a/src/mainboard/newisys/khepri/mainboard.c
+++ b/src/mainboard/newisys/khepri/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Newisys 2100 Mainboard")
 };
 
diff --git a/src/mainboard/nokia/ip530/mainboard.c b/src/mainboard/nokia/ip530/mainboard.c
index 8b934ff..5867573 100644
--- a/src/mainboard/nokia/ip530/mainboard.c
+++ b/src/mainboard/nokia/ip530/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Nokia IP530 Mainboard")
 };
diff --git a/src/mainboard/nvidia/l1_2pvv/mainboard.c b/src/mainboard/nvidia/l1_2pvv/mainboard.c
index 5836571..f55283b 100644
--- a/src/mainboard/nvidia/l1_2pvv/mainboard.c
+++ b/src/mainboard/nvidia/l1_2pvv/mainboard.c
@@ -38,6 +38,5 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("NVIDIA l1_2pvv Mainboard")
 	.enable_dev = mainboard_enable,
 };
diff --git a/src/mainboard/pcengines/alix1c/mainboard.c b/src/mainboard/pcengines/alix1c/mainboard.c
index 74c1cc4..7dda79a 100644
--- a/src/mainboard/pcengines/alix1c/mainboard.c
+++ b/src/mainboard/pcengines/alix1c/mainboard.c
@@ -32,7 +32,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("PC Engines ALIX1.C Mainboard")
 	.enable_dev = enable_dev,
 };
 
diff --git a/src/mainboard/pcengines/alix2d/mainboard.c b/src/mainboard/pcengines/alix2d/mainboard.c
index 1b526c9..c60b134 100644
--- a/src/mainboard/pcengines/alix2d/mainboard.c
+++ b/src/mainboard/pcengines/alix2d/mainboard.c
@@ -32,7 +32,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("PC Engines ALIX.2D Mainboard")
 	.enable_dev = enable_dev,
 };
 
diff --git a/src/mainboard/rca/rm4100/mainboard.c b/src/mainboard/rca/rm4100/mainboard.c
index 29885b0..773d609 100644
--- a/src/mainboard/rca/rm4100/mainboard.c
+++ b/src/mainboard/rca/rm4100/mainboard.c
@@ -33,5 +33,4 @@ static void mainboard_enable(device_t dev)
 
 struct chip_operations mainboard_ops = {
 	.enable_dev = mainboard_enable,
-	CHIP_NAME("RCA RM4100 Mainboard")
 };
diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c
index 78c36e3..4b35e7b 100644
--- a/src/mainboard/roda/rk886ex/mainboard.c
+++ b/src/mainboard/roda/rk886ex/mainboard.c
@@ -167,7 +167,6 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Roda Computer GmbH RK886EX Rugged Notebook (ROCKY3+)")
 	.enable_dev = mainboard_enable,
 };
 
diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c
index 9d44c9a..f5477d4 100644
--- a/src/mainboard/samsung/lumpy/mainboard.c
+++ b/src/mainboard/samsung/lumpy/mainboard.c
@@ -309,7 +309,6 @@ static int lumpy_onboard_smbios_data(device_t dev, int *handle,
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Samsung Lumpy ChromeBook")
 	.enable_dev = mainboard_enable,
 	.get_smbios_data = lumpy_onboard_smbios_data,
 };
diff --git a/src/mainboard/samsung/stumpy/mainboard.c b/src/mainboard/samsung/stumpy/mainboard.c
index 7dc82fc..eab75f4 100644
--- a/src/mainboard/samsung/stumpy/mainboard.c
+++ b/src/mainboard/samsung/stumpy/mainboard.c
@@ -228,7 +228,6 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Samsung Stumpy ChromeBox")
 	.enable_dev = mainboard_enable,
 };
 
diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.c b/src/mainboard/siemens/sitemp_g1p1/mainboard.c
index f9c0eca..8a63cff 100644
--- a/src/mainboard/siemens/sitemp_g1p1/mainboard.c
+++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.c
@@ -848,6 +848,5 @@ static void enable_dev(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_PART_NUMBER)
 	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/mainboard.c b/src/mainboard/soyo/sy-6ba-plus-iii/mainboard.c
index 9e7b1f2..43f1738 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/mainboard.c
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Soyo SY-6BA+ III Mainboard")
 };
diff --git a/src/mainboard/sunw/ultra40/mainboard.c b/src/mainboard/sunw/ultra40/mainboard.c
index d46ea38..0c310fb 100644
--- a/src/mainboard/sunw/ultra40/mainboard.c
+++ b/src/mainboard/sunw/ultra40/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Sun Ultra 40 Mainboard")
 };
 
diff --git a/src/mainboard/supermicro/h8dme/mainboard.c b/src/mainboard/supermicro/h8dme/mainboard.c
index c092c71..060875c 100644
--- a/src/mainboard/supermicro/h8dme/mainboard.c
+++ b/src/mainboard/supermicro/h8dme/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Supermicro H8DME Mainboard")
 };
diff --git a/src/mainboard/supermicro/h8dmr/mainboard.c b/src/mainboard/supermicro/h8dmr/mainboard.c
index 45536af..ff9cb6b 100644
--- a/src/mainboard/supermicro/h8dmr/mainboard.c
+++ b/src/mainboard/supermicro/h8dmr/mainboard.c
@@ -22,5 +22,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Supermicro H8DMR Mainboard")
 };
diff --git a/src/mainboard/supermicro/h8dmr_fam10/mainboard.c b/src/mainboard/supermicro/h8dmr_fam10/mainboard.c
index 24736a9..ff9cb6b 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/mainboard.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/mainboard.c
@@ -22,5 +22,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Supermicro H8DMR Mainboard (Family 10)")
 };
diff --git a/src/mainboard/supermicro/h8qgi/mainboard.c b/src/mainboard/supermicro/h8qgi/mainboard.c
index e1d3cdb..30695ff 100644
--- a/src/mainboard/supermicro/h8qgi/mainboard.c
+++ b/src/mainboard/supermicro/h8qgi/mainboard.c
@@ -71,6 +71,5 @@ static void h8qgi_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard")
 		.enable_dev = h8qgi_enable,
 };
diff --git a/src/mainboard/supermicro/h8qme_fam10/mainboard.c b/src/mainboard/supermicro/h8qme_fam10/mainboard.c
index 647f623..ff9cb6b 100644
--- a/src/mainboard/supermicro/h8qme_fam10/mainboard.c
+++ b/src/mainboard/supermicro/h8qme_fam10/mainboard.c
@@ -22,5 +22,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Supermicro H8QME-2+ Mainboard (Family 10)")
 };
diff --git a/src/mainboard/supermicro/h8scm_fam10/mainboard.c b/src/mainboard/supermicro/h8scm_fam10/mainboard.c
index 3d71996..5faca50 100644
--- a/src/mainboard/supermicro/h8scm_fam10/mainboard.c
+++ b/src/mainboard/supermicro/h8scm_fam10/mainboard.c
@@ -92,6 +92,5 @@ static void h8scm_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("AMD H8SCM   Mainboard")
 	.enable_dev = h8scm_enable,
 };
diff --git a/src/mainboard/supermicro/x6dai_g/mainboard.c b/src/mainboard/supermicro/x6dai_g/mainboard.c
index d9b4bc4..0c310fb 100644
--- a/src/mainboard/supermicro/x6dai_g/mainboard.c
+++ b/src/mainboard/supermicro/x6dai_g/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Supermicro X6DAi-G Mainboard")
 };
 
diff --git a/src/mainboard/supermicro/x6dhe_g/mainboard.c b/src/mainboard/supermicro/x6dhe_g/mainboard.c
index c09c95a..0c310fb 100644
--- a/src/mainboard/supermicro/x6dhe_g/mainboard.c
+++ b/src/mainboard/supermicro/x6dhe_g/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-    CHIP_NAME("Supermicro X6DHE-G Mainboard")
 };
 
diff --git a/src/mainboard/supermicro/x6dhe_g2/mainboard.c b/src/mainboard/supermicro/x6dhe_g2/mainboard.c
index c20a842..0c310fb 100644
--- a/src/mainboard/supermicro/x6dhe_g2/mainboard.c
+++ b/src/mainboard/supermicro/x6dhe_g2/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-    CHIP_NAME("Supermicro X6DHE-G2 Mainboard")
 };
 
diff --git a/src/mainboard/supermicro/x6dhr_ig/mainboard.c b/src/mainboard/supermicro/x6dhr_ig/mainboard.c
index 3875fe0..0c310fb 100644
--- a/src/mainboard/supermicro/x6dhr_ig/mainboard.c
+++ b/src/mainboard/supermicro/x6dhr_ig/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Supermicro X6DHR-iG Mainboard")
 };
 
diff --git a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
index 981aee8..0c310fb 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Supermicro X6DHR-iG2 Mainboard")
 };
 
diff --git a/src/mainboard/supermicro/x7db8/mainboard.c b/src/mainboard/supermicro/x7db8/mainboard.c
index e4057e5..34a355e 100644
--- a/src/mainboard/supermicro/x7db8/mainboard.c
+++ b/src/mainboard/supermicro/x7db8/mainboard.c
@@ -32,7 +32,6 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER)
 	.enable_dev = mainboard_enable,
 };
 
diff --git a/src/mainboard/technexion/tim5690/mainboard.c b/src/mainboard/technexion/tim5690/mainboard.c
index 46d7731..878daae 100644
--- a/src/mainboard/technexion/tim5690/mainboard.c
+++ b/src/mainboard/technexion/tim5690/mainboard.c
@@ -251,6 +251,5 @@ void mainboard_post(u8 value)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("TechNexion TIM-5690   Mainboard")
 	.enable_dev = tim5690_enable,
 };
diff --git a/src/mainboard/technexion/tim8690/mainboard.c b/src/mainboard/technexion/tim8690/mainboard.c
index 0ce0417..377cbd7 100644
--- a/src/mainboard/technexion/tim8690/mainboard.c
+++ b/src/mainboard/technexion/tim8690/mainboard.c
@@ -149,6 +149,5 @@ static void tim8690_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("TechNexion TIM-8690   Mainboard")
 	.enable_dev = tim8690_enable,
 };
diff --git a/src/mainboard/technologic/ts5300/mainboard.c b/src/mainboard/technologic/ts5300/mainboard.c
index 164b7e8..7dcac68 100644
--- a/src/mainboard/technologic/ts5300/mainboard.c
+++ b/src/mainboard/technologic/ts5300/mainboard.c
@@ -142,7 +142,6 @@ static void enable_dev(struct device *dev) {
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Technologic Systems TS-5300 Mainboard")
 	.enable_dev = enable_dev
 };
 
diff --git a/src/mainboard/televideo/tc7020/mainboard.c b/src/mainboard/televideo/tc7020/mainboard.c
index ee41109..99de6ed 100644
--- a/src/mainboard/televideo/tc7020/mainboard.c
+++ b/src/mainboard/televideo/tc7020/mainboard.c
@@ -21,6 +21,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("TeleVideo TC7020 Mainboard")
 };
 
diff --git a/src/mainboard/thomson/ip1000/mainboard.c b/src/mainboard/thomson/ip1000/mainboard.c
index feb5879..381e1f8 100644
--- a/src/mainboard/thomson/ip1000/mainboard.c
+++ b/src/mainboard/thomson/ip1000/mainboard.c
@@ -149,5 +149,4 @@ static void mainboard_enable(device_t dev)
 
 struct chip_operations mainboard_ops = {
 	.enable_dev = mainboard_enable,
-	CHIP_NAME("THOMSON IP1000 Mainboard")
 };
diff --git a/src/mainboard/traverse/geos/mainboard.c b/src/mainboard/traverse/geos/mainboard.c
index c299bc8..96f6f08 100644
--- a/src/mainboard/traverse/geos/mainboard.c
+++ b/src/mainboard/traverse/geos/mainboard.c
@@ -32,6 +32,5 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Traverse Technologies Geos Mainboard")
 	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/tyan/s1846/mainboard.c b/src/mainboard/tyan/s1846/mainboard.c
index fb2034c..7b22b87 100644
--- a/src/mainboard/tyan/s1846/mainboard.c
+++ b/src/mainboard/tyan/s1846/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S1846 Mainboard")
 };
diff --git a/src/mainboard/tyan/s2735/mainboard.c b/src/mainboard/tyan/s2735/mainboard.c
index 5456b9e..0c310fb 100644
--- a/src/mainboard/tyan/s2735/mainboard.c
+++ b/src/mainboard/tyan/s2735/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S2735 Mainboard")
 };
 
diff --git a/src/mainboard/tyan/s2850/mainboard.c b/src/mainboard/tyan/s2850/mainboard.c
index 137aa57..0c310fb 100644
--- a/src/mainboard/tyan/s2850/mainboard.c
+++ b/src/mainboard/tyan/s2850/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S2850 Mainboard")
 };
 
diff --git a/src/mainboard/tyan/s2875/mainboard.c b/src/mainboard/tyan/s2875/mainboard.c
index cbc4c6c..0c310fb 100644
--- a/src/mainboard/tyan/s2875/mainboard.c
+++ b/src/mainboard/tyan/s2875/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S2875 Mainboard")
 };
 
diff --git a/src/mainboard/tyan/s2880/mainboard.c b/src/mainboard/tyan/s2880/mainboard.c
index 96e3cf2..0c310fb 100644
--- a/src/mainboard/tyan/s2880/mainboard.c
+++ b/src/mainboard/tyan/s2880/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S2880 Mainboard")
 };
 
diff --git a/src/mainboard/tyan/s2881/mainboard.c b/src/mainboard/tyan/s2881/mainboard.c
index 5034c5d..c224d1f 100644
--- a/src/mainboard/tyan/s2881/mainboard.c
+++ b/src/mainboard/tyan/s2881/mainboard.c
@@ -23,5 +23,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S2881 Mainboard")
 };
diff --git a/src/mainboard/tyan/s2882/mainboard.c b/src/mainboard/tyan/s2882/mainboard.c
index 771d8b6..0c310fb 100644
--- a/src/mainboard/tyan/s2882/mainboard.c
+++ b/src/mainboard/tyan/s2882/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S2882 Mainboard")
 };
 
diff --git a/src/mainboard/tyan/s2885/mainboard.c b/src/mainboard/tyan/s2885/mainboard.c
index 446460d..0c310fb 100644
--- a/src/mainboard/tyan/s2885/mainboard.c
+++ b/src/mainboard/tyan/s2885/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S2885 Mainboard")
 };
 
diff --git a/src/mainboard/tyan/s2891/mainboard.c b/src/mainboard/tyan/s2891/mainboard.c
index 155f084..0c310fb 100644
--- a/src/mainboard/tyan/s2891/mainboard.c
+++ b/src/mainboard/tyan/s2891/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S2891 Mainboard")
 };
 
diff --git a/src/mainboard/tyan/s2892/mainboard.c b/src/mainboard/tyan/s2892/mainboard.c
index 10fd0c0..0c310fb 100644
--- a/src/mainboard/tyan/s2892/mainboard.c
+++ b/src/mainboard/tyan/s2892/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S2892 Mainboard")
 };
 
diff --git a/src/mainboard/tyan/s2895/mainboard.c b/src/mainboard/tyan/s2895/mainboard.c
index 4de60af..0c310fb 100644
--- a/src/mainboard/tyan/s2895/mainboard.c
+++ b/src/mainboard/tyan/s2895/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S2895 Mainboard")
 };
 
diff --git a/src/mainboard/tyan/s2912/mainboard.c b/src/mainboard/tyan/s2912/mainboard.c
index bfdb75e..ff9cb6b 100644
--- a/src/mainboard/tyan/s2912/mainboard.c
+++ b/src/mainboard/tyan/s2912/mainboard.c
@@ -22,5 +22,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S2912 Mainboard")
 };
diff --git a/src/mainboard/tyan/s2912_fam10/mainboard.c b/src/mainboard/tyan/s2912_fam10/mainboard.c
index 3fed2f8..ff9cb6b 100644
--- a/src/mainboard/tyan/s2912_fam10/mainboard.c
+++ b/src/mainboard/tyan/s2912_fam10/mainboard.c
@@ -22,5 +22,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S2912 Mainboard (Family 10)")
 };
diff --git a/src/mainboard/tyan/s4880/mainboard.c b/src/mainboard/tyan/s4880/mainboard.c
index ad9adab..0c310fb 100644
--- a/src/mainboard/tyan/s4880/mainboard.c
+++ b/src/mainboard/tyan/s4880/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S4880 Mainboard")
 };
 
diff --git a/src/mainboard/tyan/s4882/mainboard.c b/src/mainboard/tyan/s4882/mainboard.c
index 0595d59..0c310fb 100644
--- a/src/mainboard/tyan/s4882/mainboard.c
+++ b/src/mainboard/tyan/s4882/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Tyan S4882 Mainboard")
 };
 
diff --git a/src/mainboard/tyan/s8226/mainboard.c b/src/mainboard/tyan/s8226/mainboard.c
index 9190feb..b0d6b48 100644
--- a/src/mainboard/tyan/s8226/mainboard.c
+++ b/src/mainboard/tyan/s8226/mainboard.c
@@ -73,6 +73,5 @@ static void s8226_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME(CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER " Mainboard")
 		.enable_dev = s8226_enable,
 };
diff --git a/src/mainboard/via/epia-cn/mainboard.c b/src/mainboard/via/epia-cn/mainboard.c
index 702b5b0..96a521d 100644
--- a/src/mainboard/via/epia-cn/mainboard.c
+++ b/src/mainboard/via/epia-cn/mainboard.c
@@ -22,5 +22,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("VIA EPIA-CN Mainboard")
 };
diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c
index 49f18df..0c310fb 100644
--- a/src/mainboard/via/epia-m/mainboard.c
+++ b/src/mainboard/via/epia-m/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("VIA EPIA-M Mainboard")
 };
 
diff --git a/src/mainboard/via/epia-m700/mainboard.c b/src/mainboard/via/epia-m700/mainboard.c
index 53537e0..7ff16ec 100644
--- a/src/mainboard/via/epia-m700/mainboard.c
+++ b/src/mainboard/via/epia-m700/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("VIA EPIA-M700 Mainboard")
 };
diff --git a/src/mainboard/via/epia-n/mainboard.c b/src/mainboard/via/epia-n/mainboard.c
index 528e891..96a521d 100644
--- a/src/mainboard/via/epia-n/mainboard.c
+++ b/src/mainboard/via/epia-n/mainboard.c
@@ -22,5 +22,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("VIA EPIA-N Mainboard")
 };
diff --git a/src/mainboard/via/epia/mainboard.c b/src/mainboard/via/epia/mainboard.c
index 95edf46..0c310fb 100644
--- a/src/mainboard/via/epia/mainboard.c
+++ b/src/mainboard/via/epia/mainboard.c
@@ -1,6 +1,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("VIA EPIA Mainboard")
 };
 
diff --git a/src/mainboard/via/pc2500e/mainboard.c b/src/mainboard/via/pc2500e/mainboard.c
index 65aed56..443b375 100644
--- a/src/mainboard/via/pc2500e/mainboard.c
+++ b/src/mainboard/via/pc2500e/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("VIA pc2500e Mainboard")
 };
diff --git a/src/mainboard/via/vt8454c/mainboard.c b/src/mainboard/via/vt8454c/mainboard.c
index c6e1b92..a9eea2c 100644
--- a/src/mainboard/via/vt8454c/mainboard.c
+++ b/src/mainboard/via/vt8454c/mainboard.c
@@ -22,6 +22,5 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("VIA VT8454c Mainboard")
 };
 
diff --git a/src/mainboard/winent/pl6064/mainboard.c b/src/mainboard/winent/pl6064/mainboard.c
index 0293c7a..5fd83ed 100644
--- a/src/mainboard/winent/pl6064/mainboard.c
+++ b/src/mainboard/winent/pl6064/mainboard.c
@@ -32,6 +32,5 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("Win Enterprises PL-6064/65 Mainboard")
 	.enable_dev = enable_dev,
 };
diff --git a/src/mainboard/wyse/s50/mainboard.c b/src/mainboard/wyse/s50/mainboard.c
index 99dfb42..644a64e 100644
--- a/src/mainboard/wyse/s50/mainboard.c
+++ b/src/mainboard/wyse/s50/mainboard.c
@@ -34,7 +34,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("WYSE S50 Mainboard")
 	.enable_dev = enable_dev,
 };
 
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index f066d7b..91d85fe 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -419,6 +419,8 @@ static void pass1(FILE *fil, struct device *ptr)
 			fprintf(fil, "\t.sibling = &%s,\n", ptr->sibling->name);
 		fprintf(fil, "#ifndef __PRE_RAM__\n");
 		fprintf(fil, "\t.chip_ops = &%s_ops,\n", ptr->chip->name_underscore);
+		if (ptr->chip->chip == &mainboard)
+			fprintf(fil, "\t.name = mainboard_name,\n");
 		fprintf(fil, "#endif\n");
 		if (ptr->chip->chiph_exists)
 			fprintf(fil, "\t.chip_info = &%s_info_%d,\n", ptr->chip->name_underscore, ptr->chip->id);




More information about the coreboot mailing list