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 60a735a48bff..bd9610594d09 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 e0c3ccec1dfa..963a27e5406f 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 cff1c6eab9a9..34d1405f6626 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 4b12629ad7b8..de3c04608fc0 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 7406391a528f..42afda14b868 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 cc3e22102114..5777e356d40e 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 0ebfb8ae8775..5cdc3bffabae 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 1271d1697807..986e70b9a9c7 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