summaryrefslogtreecommitdiff
path: root/src/mainboard/msi/ms7135
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2009-04-01 13:43:21 +0000
committerStefan Reinauer <stepan@openbios.org>2009-04-01 13:43:21 +0000
commit3081bdfa44b89c2fa34eee902c13e0d1d618bff3 (patch)
treeecbc109bd40a63fc168355b0fff859f9a0473e20 /src/mainboard/msi/ms7135
parent77cf00850f457e799f7b05ee9c98fb6b990b2514 (diff)
Drop CONFIG_CHIP_NAME. Those config statements in Config.lb should
be used unconditionally, and the names don't hurt. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4042 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/msi/ms7135')
-rw-r--r--src/mainboard/msi/ms7135/Config.lb4
-rw-r--r--src/mainboard/msi/ms7135/Options.lb1
-rw-r--r--src/mainboard/msi/ms7135/mainboard.c2
3 files changed, 1 insertions, 6 deletions
diff --git a/src/mainboard/msi/ms7135/Config.lb b/src/mainboard/msi/ms7135/Config.lb
index d42e9ea7c8..1feec7fb63 100644
--- a/src/mainboard/msi/ms7135/Config.lb
+++ b/src/mainboard/msi/ms7135/Config.lb
@@ -223,9 +223,7 @@ end
##
## Include the secondary configuration files
##
-if CONFIG_CHIP_NAME
- config chip.h
-end
+config chip.h
chip northbridge/amd/amdk8/root_complex # Root complex
device apic_cluster 0 on # APIC cluster
diff --git a/src/mainboard/msi/ms7135/Options.lb b/src/mainboard/msi/ms7135/Options.lb
index e3ae6efaf3..c4c31027c9 100644
--- a/src/mainboard/msi/ms7135/Options.lb
+++ b/src/mainboard/msi/ms7135/Options.lb
@@ -77,7 +77,6 @@ uses CONFIG_CONSOLE_SERIAL8250
uses CONFIG_CONSOLE_BTEXT
uses HAVE_INIT_TIMER
uses CONFIG_GDB_STUB
-uses CONFIG_CHIP_NAME
uses CONFIG_CONSOLE_VGA
uses CONFIG_PCI_ROM_RUN
uses HW_MEM_HOLE_SIZEK
diff --git a/src/mainboard/msi/ms7135/mainboard.c b/src/mainboard/msi/ms7135/mainboard.c
index ac0bace413..586f9c5a17 100644
--- a/src/mainboard/msi/ms7135/mainboard.c
+++ b/src/mainboard/msi/ms7135/mainboard.c
@@ -21,8 +21,6 @@
#include <device/device.h>
#include "chip.h"
-#if CONFIG_CHIP_NAME == 1
struct chip_operations mainboard_ops = {
CHIP_NAME("MSI MS7135 Mainboard")
};
-#endif