2 files changed, 10 insertions, 3 deletions
diff --git a/src/cpu/amd/socket_940/Config.lb b/src/cpu/amd/socket_940/Config.lb
index 4b23f0b46a..cff1c6eab9 100644
--- a/src/cpu/amd/socket_940/Config.lb
+++ b/src/cpu/amd/socket_940/Config.lb
@@ -1,3 +1,9 @@
-#config chip.h
-#object socket_940.o
+uses CONFIG_CHIP_NAME
+
+if CONFIG_CHIP_NAME
+	config chip.h
+end
+
+object socket_940.o
+
 dir /cpu/amd/model_fxx
diff --git a/src/cpu/amd/socket_940/socket_940.c b/src/cpu/amd/socket_940/socket_940.c
index 1a781d61e5..d412538ed1 100644
--- a/src/cpu/amd/socket_940/socket_940.c
+++ b/src/cpu/amd/socket_940/socket_940.c
@@ -1,7 +1,8 @@
 #include <device/device.h>
 #include "chip.h"
 
-
+#if CONFIG_CHIP_NAME == 1 
 struct chip_operations cpu_amd_socket_940_ops = {
 	CHIP_NAME("socket 940")
 };
+#endif