Use the canonical name of the vendors/devices and the

same format for all CHIP_NAME() entries in LinuxBIOS (Closes #20).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@linuxbios.org>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2490 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

52 files changed, 53 insertions, 53 deletions

diff --git a/src/mainboard/amd/quartet/mainboard.c b/src/mainboard/amd/quartet/mainboard.c
index 7e02e98dc1..d3bfb13308 100644
--- a/src/mainboard/amd/quartet/mainboard.c
+++ b/src/mainboard/amd/quartet/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_amd_quartet_ops = {
-	CHIP_NAME("AMD Quartet mainboard")
+	CHIP_NAME("AMD Quartet Mainboard")
 };
 
diff --git a/src/mainboard/amd/rumba/mainboard.c b/src/mainboard/amd/rumba/mainboard.c
index 6b8151221c..47ba2897d0 100644
--- a/src/mainboard/amd/rumba/mainboard.c
+++ b/src/mainboard/amd/rumba/mainboard.c
@@ -37,7 +37,7 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_amd_rumba_ops = {
-	CHIP_NAME("AMD Rumba mainboard")
+	CHIP_NAME("AMD Rumba Mainboard")
         .enable_dev = enable_dev,
 };
 
diff --git a/src/mainboard/amd/serenade/mainboard.c b/src/mainboard/amd/serenade/mainboard.c
index 3834d025bb..d0c911272d 100644
--- a/src/mainboard/amd/serenade/mainboard.c
+++ b/src/mainboard/amd/serenade/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_amd_serenade_ops = {
-	CHIP_NAME("AMD Serenade mainboard")
+	CHIP_NAME("AMD Serenade Mainboard")
 };
 
diff --git a/src/mainboard/amd/serengeti_cheetah/mainboard.c b/src/mainboard/amd/serengeti_cheetah/mainboard.c
index 5e1add27bc..73d962513b 100644
--- a/src/mainboard/amd/serengeti_cheetah/mainboard.c
+++ b/src/mainboard/amd/serengeti_cheetah/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_amd_serengeti_cheetah_ops = {
-	CHIP_NAME("AMD Serengeti Cheetah mainboard")
+	CHIP_NAME("AMD Serengeti Cheetah Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/amd/serengeti_leopard/mainboard.c b/src/mainboard/amd/serengeti_leopard/mainboard.c
index a0ac927448..2002bd14de 100644
--- a/src/mainboard/amd/serengeti_leopard/mainboard.c
+++ b/src/mainboard/amd/serengeti_leopard/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_amd_serengeti_leopard_ops = {
-	CHIP_NAME("AMD Serengeti Leopard mainboard")
+	CHIP_NAME("AMD Serengeti Leopard Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/amd/solo/mainboard.c b/src/mainboard/amd/solo/mainboard.c
index 32be49839e..4c482402c1 100644
--- a/src/mainboard/amd/solo/mainboard.c
+++ b/src/mainboard/amd/solo/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_amd_solo_ops = {
-	CHIP_NAME("AMD Solo7 mainboard")
+	CHIP_NAME("AMD Solo7 Mainboard")
 };
 
diff --git a/src/mainboard/arima/hdama/mainboard.c b/src/mainboard/arima/hdama/mainboard.c
index 12fc7f135a..d676f975ac 100644
--- a/src/mainboard/arima/hdama/mainboard.c
+++ b/src/mainboard/arima/hdama/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_arima_hdama_ops = {
-	CHIP_NAME("Arima HDAMA mainboard")
+	CHIP_NAME("Arima HDAMA Mainboard")
 };
 
diff --git a/src/mainboard/artecgroup/dbe61/mainboard.c b/src/mainboard/artecgroup/dbe61/mainboard.c
index 83fd121397..0476400de0 100644
--- a/src/mainboard/artecgroup/dbe61/mainboard.c
+++ b/src/mainboard/artecgroup/dbe61/mainboard.c
@@ -39,6 +39,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_artecgroup_dbe61_ops = {
-	CHIP_NAME("Artec Group dbe61 mainboard")
+	CHIP_NAME("Artec Group dbe61 Mainboard")
         .enable_dev = enable_dev,
 };
diff --git a/src/mainboard/asus/p2b/mainboard.c b/src/mainboard/asus/p2b/mainboard.c
index 434c5fb160..414ac44ac9 100644
--- a/src/mainboard/asus/p2b/mainboard.c
+++ b/src/mainboard/asus/p2b/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_asus_p2b_ops = {
-	CHIP_NAME("ASUS P2B mainboard")
+	CHIP_NAME("ASUS P2B Mainboard")
 };
 
diff --git a/src/mainboard/bitworks/ims/mainboard.c b/src/mainboard/bitworks/ims/mainboard.c
index c97598eb82..8da5632823 100644
--- a/src/mainboard/bitworks/ims/mainboard.c
+++ b/src/mainboard/bitworks/ims/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_bitworks_ims_ops = {
-	CHIP_NAME("Bitworks IMS mainboard")
+	CHIP_NAME("Bitworks IMS Mainboard")
 };
 
diff --git a/src/mainboard/broadcom/blast/mainboard.c b/src/mainboard/broadcom/blast/mainboard.c
index 574414c8c6..27909ecd81 100644
--- a/src/mainboard/broadcom/blast/mainboard.c
+++ b/src/mainboard/broadcom/blast/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_broadcom_blast_ops = {
-	CHIP_NAME("Broadcom Blast mainboard")
+	CHIP_NAME("Broadcom Blast Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/dell/s1850/mainboard.c b/src/mainboard/dell/s1850/mainboard.c
index 1c751aa401..e969dd20f3 100644
--- a/src/mainboard/dell/s1850/mainboard.c
+++ b/src/mainboard/dell/s1850/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_dell_s1850_ops = {
-	CHIP_NAME("Dell S1850 mainboard")
+	CHIP_NAME("Dell S1850 Mainboard")
 };
 
diff --git a/src/mainboard/densitron/dpx114/mainboard.c b/src/mainboard/densitron/dpx114/mainboard.c
index 5f180dc82e..189e9b2788 100644
--- a/src/mainboard/densitron/dpx114/mainboard.c
+++ b/src/mainboard/densitron/dpx114/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_densitron_dpx114_ops = {
-	CHIP_NAME("Densitron DPX114 mainboard")
+	CHIP_NAME("Densitron DPX114 Mainboard")
 };
 
diff --git a/src/mainboard/digitallogic/adl855pc/mainboard.c b/src/mainboard/digitallogic/adl855pc/mainboard.c
index 78046a217a..2e0e332ee1 100644
--- a/src/mainboard/digitallogic/adl855pc/mainboard.c
+++ b/src/mainboard/digitallogic/adl855pc/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_digitallogic_adl855pc_ops = {
-	CHIP_NAME("DIGITAL-LOGIC ADL855PC mainboard")
+	CHIP_NAME("DIGITAL-LOGIC ADL855PC Mainboard")
 };
 
diff --git a/src/mainboard/digitallogic/msm586seg/mainboard.c b/src/mainboard/digitallogic/msm586seg/mainboard.c
index 63cf2884d2..8e537958ae 100644
--- a/src/mainboard/digitallogic/msm586seg/mainboard.c
+++ b/src/mainboard/digitallogic/msm586seg/mainboard.c
@@ -142,7 +142,7 @@ static void enable_dev(struct device *dev) {
 	
 }
 struct chip_operations mainboard_digitallogic_msm586seg_ops = {
-	CHIP_NAME("DIGITAL-LOGIC MSM586SEG mainboard")
+	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 2cd090bc03..8bc24a43a3 100644
--- a/src/mainboard/digitallogic/msm800sev/mainboard.c
+++ b/src/mainboard/digitallogic/msm800sev/mainboard.c
@@ -62,7 +62,7 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_digitallogic_msm800sev_ops = {
-	CHIP_NAME("DIGITAL-LOGIC MSM800SEV mainboard")
+	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 0de9942b17..7048ad819a 100644
--- a/src/mainboard/eaglelion/5bcm/mainboard.c
+++ b/src/mainboard/eaglelion/5bcm/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_eaglelion_5bcm_ops = {
-	CHIP_NAME("Eaglelion 5BCM mainboard")
+	CHIP_NAME("Eaglelion 5BCM Mainboard")
 };
 
diff --git a/src/mainboard/emulation/qemu-i386/mainboard.c b/src/mainboard/emulation/qemu-i386/mainboard.c
index b6e328ea53..497f66eaa4 100644
--- a/src/mainboard/emulation/qemu-i386/mainboard.c
+++ b/src/mainboard/emulation/qemu-i386/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_emulation_qemu_i386_ops = {
-	CHIP_NAME("QEMU mainboard")
+	CHIP_NAME("QEMU Mainboard")
 };
 
diff --git a/src/mainboard/ibm/e325/mainboard.c b/src/mainboard/ibm/e325/mainboard.c
index 464155e3e5..81aa594c19 100644
--- a/src/mainboard/ibm/e325/mainboard.c
+++ b/src/mainboard/ibm/e325/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_ibm_e325_ops = {
-	CHIP_NAME("IBM eServer 325 mainboard")
+	CHIP_NAME("IBM eServer 325 Mainboard")
 };
 
diff --git a/src/mainboard/ibm/e326/mainboard.c b/src/mainboard/ibm/e326/mainboard.c
index a6dd4a4083..0439a5b709 100644
--- a/src/mainboard/ibm/e326/mainboard.c
+++ b/src/mainboard/ibm/e326/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_ibm_e326_ops = {
-	CHIP_NAME("IBM eServer 326 mainboard")
+	CHIP_NAME("IBM eServer 326 Mainboard")
 };
 
diff --git a/src/mainboard/intel/jarrell/mainboard.c b/src/mainboard/intel/jarrell/mainboard.c
index 0b1eec585a..f7b58ac3f0 100644
--- a/src/mainboard/intel/jarrell/mainboard.c
+++ b/src/mainboard/intel/jarrell/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_intel_e7520_ops = {
-	CHIP_NAME("Intel Jarell mainboard")
+	CHIP_NAME("Intel Jarell Mainboard")
 };
 
diff --git a/src/mainboard/intel/xe7501devkit/mainboard.c b/src/mainboard/intel/xe7501devkit/mainboard.c
index fd7404b5c4..923878291a 100644
--- a/src/mainboard/intel/xe7501devkit/mainboard.c
+++ b/src/mainboard/intel/xe7501devkit/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_intel_xe7501devkit_ops = {
-	CHIP_NAME("Intel Xeon E7501 DevKit mainboard")
+	CHIP_NAME("Intel Xeon E7501 DevKit Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/iwill/dk8_htx/Options.lb b/src/mainboard/iwill/dk8_htx/Options.lb
index 0387b5ac4c..993c01183f 100644
--- a/src/mainboard/iwill/dk8_htx/Options.lb
+++ b/src/mainboard/iwill/dk8_htx/Options.lb
@@ -230,7 +230,7 @@ default CONFIG_IOAPIC=1
 ## Clean up the motherboard id strings
 ##
 default MAINBOARD_PART_NUMBER="dk8_htx"
-default MAINBOARD_VENDOR="iwill"
+default MAINBOARD_VENDOR="IWILL"
 default MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x1022
 default MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x2b80
 
diff --git a/src/mainboard/iwill/dk8_htx/mainboard.c b/src/mainboard/iwill/dk8_htx/mainboard.c
index c49af62767..01cbe494a8 100644
--- a/src/mainboard/iwill/dk8_htx/mainboard.c
+++ b/src/mainboard/iwill/dk8_htx/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_iwill_dk8_htx_ops = {
-	CHIP_NAME("IWILL DK8-HTX mainboard")
+	CHIP_NAME("IWILL DK8-HTX Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/iwill/dk8s2/mainboard.c b/src/mainboard/iwill/dk8s2/mainboard.c
index 4b7a1ecdcc..b51ef18bad 100644
--- a/src/mainboard/iwill/dk8s2/mainboard.c
+++ b/src/mainboard/iwill/dk8s2/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_iwill_dk8s2_ops = {
-	CHIP_NAME("IWILL DK8S2 mainboard")
+	CHIP_NAME("IWILL DK8S2 Mainboard")
 };
 
diff --git a/src/mainboard/iwill/dk8x/mainboard.c b/src/mainboard/iwill/dk8x/mainboard.c
index 0e8a361539..18cb2b5b4f 100644
--- a/src/mainboard/iwill/dk8x/mainboard.c
+++ b/src/mainboard/iwill/dk8x/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_iwill_dk8x_ops = {
-	CHIP_NAME("IWILL DK8X mainboard")
+	CHIP_NAME("IWILL DK8X Mainboard")
 };
 
diff --git a/src/mainboard/lippert/frontrunner/mainboard.c b/src/mainboard/lippert/frontrunner/mainboard.c
index 30fd7b130a..aa82ae1525 100644
--- a/src/mainboard/lippert/frontrunner/mainboard.c
+++ b/src/mainboard/lippert/frontrunner/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_lippert_frontrunner_ops = {
-	CHIP_NAME("Lippert Cool Frontrunner mainboard")
+	CHIP_NAME("Lippert Cool Frontrunner Mainboard")
 };
 
diff --git a/src/mainboard/newisys/khepri/Options.lb b/src/mainboard/newisys/khepri/Options.lb
index 90abf22839..69af4c8442 100644
--- a/src/mainboard/newisys/khepri/Options.lb
+++ b/src/mainboard/newisys/khepri/Options.lb
@@ -110,8 +110,8 @@ default CONFIG_IOAPIC=1
 ##
 ## Clean up the motherboard id strings
 ##
-default MAINBOARD_PART_NUMBER="KHEPRI"
-default MAINBOARD_VENDOR="NEWISYS"
+default MAINBOARD_PART_NUMBER="Khepri"
+default MAINBOARD_VENDOR="Newisys"
 
 ###
 ### LinuxBIOS layout values
diff --git a/src/mainboard/newisys/khepri/mainboard.c b/src/mainboard/newisys/khepri/mainboard.c
index 7aba8132ad..d5dfcbc05e 100644
--- a/src/mainboard/newisys/khepri/mainboard.c
+++ b/src/mainboard/newisys/khepri/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_newisys_khepri_ops = {
-	CHIP_NAME("Newisys 2100 mainboard")
+	CHIP_NAME("Newisys 2100 Mainboard")
 };
 
diff --git a/src/mainboard/olpc/btest/mainboard.c b/src/mainboard/olpc/btest/mainboard.c
index 0f4be07dcc..814d17751e 100644
--- a/src/mainboard/olpc/btest/mainboard.c
+++ b/src/mainboard/olpc/btest/mainboard.c
@@ -131,6 +131,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_olpc_btest_ops = {
-	CHIP_NAME("OLPC btest mainboard")
+	CHIP_NAME("OLPC btest Mainboard")
         .enable_dev = enable_dev,
 };
diff --git a/src/mainboard/olpc/rev_a/mainboard.c b/src/mainboard/olpc/rev_a/mainboard.c
index 89c741cf79..e9f5cabf10 100644
--- a/src/mainboard/olpc/rev_a/mainboard.c
+++ b/src/mainboard/olpc/rev_a/mainboard.c
@@ -103,6 +103,6 @@ static void enable_dev(struct device *dev)
 }
 
 struct chip_operations mainboard_olpc_rev_a_ops = {
-	CHIP_NAME("OLPC rev_a mainboard")
+	CHIP_NAME("OLPC rev_a Mainboard")
         .enable_dev = enable_dev,
 };
diff --git a/src/mainboard/sunw/ultra40/mainboard.c b/src/mainboard/sunw/ultra40/mainboard.c
index e4e1052a49..6660badb0e 100644
--- a/src/mainboard/sunw/ultra40/mainboard.c
+++ b/src/mainboard/sunw/ultra40/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_sunw_ultra40_ops = {
-	CHIP_NAME("Sun Ultra 40 mainboard")
+	CHIP_NAME("Sun Ultra 40 Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/supermicro/x6dai_g/mainboard.c b/src/mainboard/supermicro/x6dai_g/mainboard.c
index e0a9b9d6ef..b32dbd560e 100644
--- a/src/mainboard/supermicro/x6dai_g/mainboard.c
+++ b/src/mainboard/supermicro/x6dai_g/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations supermicro_x6dai_g_ops = {
-	CHIP_NAME("Supermicro X6DAi-G mainboard")
+	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 d559977c9b..343c9bb7da 100644
--- a/src/mainboard/supermicro/x6dhe_g/mainboard.c
+++ b/src/mainboard/supermicro/x6dhe_g/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations supermicro_x6dhe_g_ops = {
-    CHIP_NAME("Supermicro X6DHE-G mainboard")
+    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 ba3125615c..856dc8f53d 100644
--- a/src/mainboard/supermicro/x6dhe_g2/mainboard.c
+++ b/src/mainboard/supermicro/x6dhe_g2/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations supermicro_x6dhe_g2_ops = {
-    CHIP_NAME("Supermicro X6DHE-G2 mainboard")
+    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 b344a94cb4..59051de317 100644
--- a/src/mainboard/supermicro/x6dhr_ig/mainboard.c
+++ b/src/mainboard/supermicro/x6dhr_ig/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_supermicro_x6dhr_ig_ops = {
-	CHIP_NAME("Supermicro X6DHR-iG mainboard")
+	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 dfe4d9435b..b1cda733f4 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_supermicro_x6dhr_ig2_ops = {
-	CHIP_NAME("Supermicro X6DHR-iG2 mainboard")
+	CHIP_NAME("Supermicro X6DHR-iG2 Mainboard")
 };
 
diff --git a/src/mainboard/technologic/ts5300/mainboard.c b/src/mainboard/technologic/ts5300/mainboard.c
index 9c15d12ab1..d4120c6467 100644
--- a/src/mainboard/technologic/ts5300/mainboard.c
+++ b/src/mainboard/technologic/ts5300/mainboard.c
@@ -149,7 +149,7 @@ static void enable_dev(struct device *dev) {
 }
 
 struct chip_operations mainboard_technologic_ts5300_ops = {
-	CHIP_NAME("Technologic Systems TS-5300 mainboard")
+	CHIP_NAME("Technologic Systems TS-5300 Mainboard")
 	.enable_dev = enable_dev
 };
 
diff --git a/src/mainboard/tyan/s2735/mainboard.c b/src/mainboard/tyan/s2735/mainboard.c
index a20db8c6d2..a460b77683 100644
--- a/src/mainboard/tyan/s2735/mainboard.c
+++ b/src/mainboard/tyan/s2735/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2735_ops = {
-	CHIP_NAME("Tyan S2735 mainboard")
+	CHIP_NAME("Tyan S2735 Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/tyan/s2850/mainboard.c b/src/mainboard/tyan/s2850/mainboard.c
index 238c707fd5..c769cb52a1 100644
--- a/src/mainboard/tyan/s2850/mainboard.c
+++ b/src/mainboard/tyan/s2850/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2850_ops = {
-	CHIP_NAME("Tyan S2850 mainboard")
+	CHIP_NAME("Tyan S2850 Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/tyan/s2875/mainboard.c b/src/mainboard/tyan/s2875/mainboard.c
index dcbbe172ce..1f4a38bcb8 100644
--- a/src/mainboard/tyan/s2875/mainboard.c
+++ b/src/mainboard/tyan/s2875/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2875_ops = {
-	CHIP_NAME("Tyan S2875 mainboard")
+	CHIP_NAME("Tyan S2875 Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/tyan/s2880/mainboard.c b/src/mainboard/tyan/s2880/mainboard.c
index 6197172934..20721c19ef 100644
--- a/src/mainboard/tyan/s2880/mainboard.c
+++ b/src/mainboard/tyan/s2880/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2880_ops = {
-	CHIP_NAME("Tyan S2880 mainboard")
+	CHIP_NAME("Tyan S2880 Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/tyan/s2881/mainboard.c b/src/mainboard/tyan/s2881/mainboard.c
index b17c4b12cd..e0aea30dd8 100644
--- a/src/mainboard/tyan/s2881/mainboard.c
+++ b/src/mainboard/tyan/s2881/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2881_ops = {
-	CHIP_NAME("Tyan S2881 mainboard")
+	CHIP_NAME("Tyan S2881 Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/tyan/s2882/mainboard.c b/src/mainboard/tyan/s2882/mainboard.c
index 3475d709b0..89e81956ec 100644
--- a/src/mainboard/tyan/s2882/mainboard.c
+++ b/src/mainboard/tyan/s2882/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2882_ops = {
-	CHIP_NAME("Tyan S2882 mainboard")
+	CHIP_NAME("Tyan S2882 Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/tyan/s2885/mainboard.c b/src/mainboard/tyan/s2885/mainboard.c
index aca02f0d3b..6b1beadaf2 100644
--- a/src/mainboard/tyan/s2885/mainboard.c
+++ b/src/mainboard/tyan/s2885/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2885_ops = {
-	CHIP_NAME("Tyan S2885 mainboard")
+	CHIP_NAME("Tyan S2885 Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/tyan/s2891/mainboard.c b/src/mainboard/tyan/s2891/mainboard.c
index 455e65a7f9..a396404b08 100644
--- a/src/mainboard/tyan/s2891/mainboard.c
+++ b/src/mainboard/tyan/s2891/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2891_ops = {
-	CHIP_NAME("Tyan S2891 mainboard")
+	CHIP_NAME("Tyan S2891 Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/tyan/s2892/mainboard.c b/src/mainboard/tyan/s2892/mainboard.c
index fc4c88953a..2aad2b3b42 100644
--- a/src/mainboard/tyan/s2892/mainboard.c
+++ b/src/mainboard/tyan/s2892/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2892_ops = {
-	CHIP_NAME("Tyan S2892 mainboard")
+	CHIP_NAME("Tyan S2892 Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/tyan/s2895/mainboard.c b/src/mainboard/tyan/s2895/mainboard.c
index 1476702527..03514f11c6 100644
--- a/src/mainboard/tyan/s2895/mainboard.c
+++ b/src/mainboard/tyan/s2895/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s2895_ops = {
-	CHIP_NAME("Tyan S2895 mainboard")
+	CHIP_NAME("Tyan S2895 Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/tyan/s4880/mainboard.c b/src/mainboard/tyan/s4880/mainboard.c
index dd7e3ede4c..c48c7e3e74 100644
--- a/src/mainboard/tyan/s4880/mainboard.c
+++ b/src/mainboard/tyan/s4880/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s4880_ops = {
-	CHIP_NAME("Tyan S4880 mainboard")
+	CHIP_NAME("Tyan S4880 Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/tyan/s4882/mainboard.c b/src/mainboard/tyan/s4882/mainboard.c
index 83371ee659..1d1d306e85 100644
--- a/src/mainboard/tyan/s4882/mainboard.c
+++ b/src/mainboard/tyan/s4882/mainboard.c
@@ -3,7 +3,7 @@
 
 #if CONFIG_CHIP_NAME == 1
 struct chip_operations mainboard_tyan_s4882_ops = {
-	CHIP_NAME("Tyan S4882 mainboard")
+	CHIP_NAME("Tyan S4882 Mainboard")
 };
 #endif
 
diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c
index dbeae2575b..d48330ff4b 100644
--- a/src/mainboard/via/epia-m/mainboard.c
+++ b/src/mainboard/via/epia-m/mainboard.c
@@ -41,6 +41,6 @@ void write_protect_vgabios(void)
 }
 
 struct chip_operations mainboard_via_epia_m_ops = {
-	CHIP_NAME("VIA EPIA-M mainboard")
+	CHIP_NAME("VIA EPIA-M Mainboard")
 };
 
diff --git a/src/mainboard/via/epia/mainboard.c b/src/mainboard/via/epia/mainboard.c
index 96a0988edb..4242dfa92f 100644
--- a/src/mainboard/via/epia/mainboard.c
+++ b/src/mainboard/via/epia/mainboard.c
@@ -2,6 +2,6 @@
 #include "chip.h"
 
 struct chip_operations mainboard_via_epia_ops = {
-	CHIP_NAME("VIA EPIA mainboard")
+	CHIP_NAME("VIA EPIA Mainboard")
 };