summaryrefslogtreecommitdiff
path: root/src/cpu
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/cpu
parent77cf00850f457e799f7b05ee9c98fb6b990b2514 (diff)
downloadcoreboot-3081bdfa44b89c2fa34eee902c13e0d1d618bff3.tar.xz
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/cpu')
-rw-r--r--src/cpu/amd/socket_754/Config.lb5
-rw-r--r--src/cpu/amd/socket_939/Config.lb6
-rw-r--r--src/cpu/amd/socket_940/Config.lb6
-rw-r--r--src/cpu/amd/socket_AM2/Config.lb5
-rw-r--r--src/cpu/amd/socket_F/Config.lb5
-rw-r--r--src/cpu/amd/socket_F_1207/Config.lb5
-rw-r--r--src/cpu/amd/socket_S1G1/Config.lb5
-rw-r--r--src/cpu/intel/socket_mPGA604_533Mhz/Config.lb5
8 files changed, 8 insertions, 34 deletions
diff --git a/src/cpu/amd/socket_754/Config.lb b/src/cpu/amd/socket_754/Config.lb
index 60a735a48b..bd9610594d 100644
--- a/src/cpu/amd/socket_754/Config.lb
+++ b/src/cpu/amd/socket_754/Config.lb
@@ -1,7 +1,4 @@
-uses CONFIG_CHIP_NAME
-if CONFIG_CHIP_NAME
- config chip.h
-end
+config chip.h
object socket_754.o
dir /cpu/amd/model_fxx
diff --git a/src/cpu/amd/socket_939/Config.lb b/src/cpu/amd/socket_939/Config.lb
index e0c3ccec1d..963a27e540 100644
--- a/src/cpu/amd/socket_939/Config.lb
+++ b/src/cpu/amd/socket_939/Config.lb
@@ -1,8 +1,4 @@
-uses CONFIG_CHIP_NAME
-
-if CONFIG_CHIP_NAME
- config chip.h
-end
+config chip.h
object socket_939.o
diff --git a/src/cpu/amd/socket_940/Config.lb b/src/cpu/amd/socket_940/Config.lb
index cff1c6eab9..34d1405f66 100644
--- a/src/cpu/amd/socket_940/Config.lb
+++ b/src/cpu/amd/socket_940/Config.lb
@@ -1,8 +1,4 @@
-uses CONFIG_CHIP_NAME
-
-if CONFIG_CHIP_NAME
- config chip.h
-end
+config chip.h
object socket_940.o
diff --git a/src/cpu/amd/socket_AM2/Config.lb b/src/cpu/amd/socket_AM2/Config.lb
index 4b12629ad7..de3c04608f 100644
--- a/src/cpu/amd/socket_AM2/Config.lb
+++ b/src/cpu/amd/socket_AM2/Config.lb
@@ -1,12 +1,9 @@
-uses CONFIG_CHIP_NAME
uses K8_REV_F_SUPPORT
uses K8_HT_FREQ_1G_SUPPORT
uses DIMM_SUPPORT
uses CPU_SOCKET_TYPE
-if CONFIG_CHIP_NAME
- config chip.h
-end
+config chip.h
default K8_REV_F_SUPPORT=1
#Opteron K8 1G HT Support
diff --git a/src/cpu/amd/socket_F/Config.lb b/src/cpu/amd/socket_F/Config.lb
index 7406391a52..42afda14b8 100644
--- a/src/cpu/amd/socket_F/Config.lb
+++ b/src/cpu/amd/socket_F/Config.lb
@@ -1,12 +1,9 @@
-uses CONFIG_CHIP_NAME
uses K8_REV_F_SUPPORT
uses K8_HT_FREQ_1G_SUPPORT
uses DIMM_SUPPORT
uses CPU_SOCKET_TYPE
-if CONFIG_CHIP_NAME
- config chip.h
-end
+config chip.h
default K8_REV_F_SUPPORT=1
#Opteron K8 1G HT Support
diff --git a/src/cpu/amd/socket_F_1207/Config.lb b/src/cpu/amd/socket_F_1207/Config.lb
index cc3e221021..5777e356d4 100644
--- a/src/cpu/amd/socket_F_1207/Config.lb
+++ b/src/cpu/amd/socket_F_1207/Config.lb
@@ -17,7 +17,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-uses CONFIG_CHIP_NAME
uses PCI_IO_CFG_EXT
uses MMCONF_SUPPORT
uses HT3_SUPPORT
@@ -30,9 +29,7 @@ uses CDB
uses PCI_BUS_SEGN_BITS
uses CAR_FAM10
-if CONFIG_CHIP_NAME
- config chip.h
-end
+config chip.h
default PCI_IO_CFG_EXT=1
diff --git a/src/cpu/amd/socket_S1G1/Config.lb b/src/cpu/amd/socket_S1G1/Config.lb
index 0ebfb8ae87..5cdc3bffab 100644
--- a/src/cpu/amd/socket_S1G1/Config.lb
+++ b/src/cpu/amd/socket_S1G1/Config.lb
@@ -1,12 +1,9 @@
-uses CONFIG_CHIP_NAME
uses K8_REV_F_SUPPORT
uses K8_HT_FREQ_1G_SUPPORT
uses DIMM_SUPPORT
uses CPU_SOCKET_TYPE
-if CONFIG_CHIP_NAME
- config chip.h
-end
+config chip.h
default K8_REV_F_SUPPORT=1
#Opteron K8 1G HT Support
diff --git a/src/cpu/intel/socket_mPGA604_533Mhz/Config.lb b/src/cpu/intel/socket_mPGA604_533Mhz/Config.lb
index 1271d16978..986e70b9a9 100644
--- a/src/cpu/intel/socket_mPGA604_533Mhz/Config.lb
+++ b/src/cpu/intel/socket_mPGA604_533Mhz/Config.lb
@@ -1,6 +1,3 @@
-uses CONFIG_CHIP_NAME
-if CONFIG_CHIP_NAME
- config chip.h
-end
+config chip.h
object socket_mPGA604_533Mhz.o
dir /cpu/intel/model_f2x