From 3081bdfa44b89c2fa34eee902c13e0d1d618bff3 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 1 Apr 2009 13:43:21 +0000 Subject: 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 Acked-by: Carl-Daniel Hailfinger git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4042 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/intel/xe7501devkit/Config.lb | 4 +--- src/mainboard/intel/xe7501devkit/Options.lb | 2 -- src/mainboard/intel/xe7501devkit/mainboard.c | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) (limited to 'src/mainboard/intel') diff --git a/src/mainboard/intel/xe7501devkit/Config.lb b/src/mainboard/intel/xe7501devkit/Config.lb index eec15cdfb6..1a46ec9770 100644 --- a/src/mainboard/intel/xe7501devkit/Config.lb +++ b/src/mainboard/intel/xe7501devkit/Config.lb @@ -142,9 +142,7 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc ## dir /pc80 -if CONFIG_CHIP_NAME - config chip.h -end +config chip.h # based on sample config for tyan/s2735 chip northbridge/intel/e7501 diff --git a/src/mainboard/intel/xe7501devkit/Options.lb b/src/mainboard/intel/xe7501devkit/Options.lb index ea03ea87c2..5e7a6473c6 100644 --- a/src/mainboard/intel/xe7501devkit/Options.lb +++ b/src/mainboard/intel/xe7501devkit/Options.lb @@ -40,7 +40,6 @@ uses CROSS_COMPILE uses CC uses HOSTCC uses OBJCOPY -uses CONFIG_CHIP_NAME uses CONFIG_CONSOLE_VGA uses CONFIG_PCI_ROM_RUN uses DEBUG @@ -238,7 +237,6 @@ default CONFIG_IDE=1 default DEBUG=1 # default CPU_OPT="-g" -default CONFIG_CHIP_NAME=1 ### End Options.lb # diff --git a/src/mainboard/intel/xe7501devkit/mainboard.c b/src/mainboard/intel/xe7501devkit/mainboard.c index 1d0a1d09c8..3b757d63c5 100644 --- a/src/mainboard/intel/xe7501devkit/mainboard.c +++ b/src/mainboard/intel/xe7501devkit/mainboard.c @@ -1,9 +1,7 @@ #include #include "chip.h" -#if CONFIG_CHIP_NAME == 1 struct chip_operations mainboard_ops = { CHIP_NAME("Intel Xeon E7501 DevKit Mainboard") }; -#endif -- cgit v1.2.3