From a93c3fe7f05f5ab440f377360e5149f7234abb73 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Tue, 9 Oct 2012 22:28:56 +0300
Subject: Drop redundant CHIP_NAME in mainboard.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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@gmail.com>
Reviewed-on: http://review.coreboot.org/1635
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
---
 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 -
 16 files changed, 16 deletions(-)

(limited to 'src/mainboard/tyan')

diff --git a/src/mainboard/tyan/s1846/mainboard.c b/src/mainboard/tyan/s1846/mainboard.c
index fb2034ca58..7b22b875f2 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 5456b9ec5d..0c310fb4fd 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 137aa57217..0c310fb4fd 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 cbc4c6c502..0c310fb4fd 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 96e3cf2226..0c310fb4fd 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 5034c5dca2..c224d1f60c 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 771d8b68ac..0c310fb4fd 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 446460db7a..0c310fb4fd 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 155f084004..0c310fb4fd 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 10fd0c03c3..0c310fb4fd 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 4de60aff80..0c310fb4fd 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 bfdb75e7ce..ff9cb6b34a 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 3fed2f8105..ff9cb6b34a 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 ad9adabadd..0c310fb4fd 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 0595d598b9..0c310fb4fd 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 9190feb5f6..b0d6b48d14 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,
 };
-- 
cgit v1.2.3