diff options
author | Stefan Reinauer <stepan@coresystems.de> | 2009-04-01 13:43:21 +0000 |
---|---|---|
committer | Stefan Reinauer <stepan@openbios.org> | 2009-04-01 13:43:21 +0000 |
commit | 3081bdfa44b89c2fa34eee902c13e0d1d618bff3 (patch) | |
tree | ecbc109bd40a63fc168355b0fff859f9a0473e20 /src/mainboard/msi/ms7260 | |
parent | 77cf00850f457e799f7b05ee9c98fb6b990b2514 (diff) | |
download | coreboot-staging-3081bdfa44b89c2fa34eee902c13e0d1d618bff3.zip coreboot-staging-3081bdfa44b89c2fa34eee902c13e0d1d618bff3.tar.gz |
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/ms7260')
-rw-r--r-- | src/mainboard/msi/ms7260/Config.lb | 4 | ||||
-rw-r--r-- | src/mainboard/msi/ms7260/Options.lb | 2 | ||||
-rw-r--r-- | src/mainboard/msi/ms7260/mainboard.c | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/src/mainboard/msi/ms7260/Config.lb b/src/mainboard/msi/ms7260/Config.lb index 1fd67af..992a424 100644 --- a/src/mainboard/msi/ms7260/Config.lb +++ b/src/mainboard/msi/ms7260/Config.lb @@ -164,9 +164,7 @@ if USE_DCACHE_RAM end end -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/ms7260/Options.lb b/src/mainboard/msi/ms7260/Options.lb index 5192870..ddd2252 100644 --- a/src/mainboard/msi/ms7260/Options.lb +++ b/src/mainboard/msi/ms7260/Options.lb @@ -74,7 +74,6 @@ uses CROSS_COMPILE uses CC uses HOSTCC uses OBJCOPY -uses CONFIG_CHIP_NAME uses CONFIG_CONSOLE_VGA uses CONFIG_PCI_ROM_RUN uses CONFIG_USBDEBUG_DIRECT @@ -120,7 +119,6 @@ default CONFIG_LOGICAL_CPUS = 1 default ENABLE_APIC_EXT_ID = 0 default APIC_ID_OFFSET = 0x10 default LIFT_BSP_APIC_ID = 1 -default CONFIG_CHIP_NAME = 1 # Move the default coreboot CMOS range off of AMD RTC registers. default LB_CKS_RANGE_START = 49 diff --git a/src/mainboard/msi/ms7260/mainboard.c b/src/mainboard/msi/ms7260/mainboard.c index a6c6e08..710e59e 100644 --- a/src/mainboard/msi/ms7260/mainboard.c +++ b/src/mainboard/msi/ms7260/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 K9N Neo (MS-7260) Mainboard") }; -#endif |