4 files changed, 10 insertions, 9 deletions
diff --git a/src/cpu/k7/Config.lb b/src/cpu/k7/Config.lb
index e27b42efb3..d631c6fd49 100644
--- a/src/cpu/k7/Config.lb
+++ b/src/cpu/k7/Config.lb
@@ -1,3 +1,3 @@
-option k7=1
-default  CPU_FIXUP=1
+uses k7
+uses CPU_FIXUP
 #object cpufixup.o
diff --git a/src/cpu/k8/Config.lb b/src/cpu/k8/Config.lb
index 28cd7a2877..7a83d3e846 100644
--- a/src/cpu/k8/Config.lb
+++ b/src/cpu/k8/Config.lb
@@ -1,3 +1,4 @@
-default k8=1
-default  CPU_FIXUP=1
-object cpufixup.o
+uses CPU_FIXUP
+if CPU_FIXUP
+  object cpufixup.o
+end
diff --git a/src/cpu/p5/Config.lb b/src/cpu/p5/Config.lb
index 9d1d7f2a64..99858dbb29 100644
--- a/src/cpu/p5/Config.lb
+++ b/src/cpu/p5/Config.lb
@@ -1,5 +1,5 @@
-default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=0
-option i586=1
+uses  CONFIG_UDELAY_TSC
+
 object cpuid.o
 if CONFIG_UDELAY_TSC object delay_tsc.o  end
 #object tsc.o
diff --git a/src/cpu/p6/Config.lb b/src/cpu/p6/Config.lb
index aa92fa46d8..fb6d9ab996 100644
--- a/src/cpu/p6/Config.lb
+++ b/src/cpu/p6/Config.lb
@@ -1,5 +1,5 @@
-option i686=1
-option INTEL_PPRO_MTRR=1
+uses i686
+uses INTEL_PPRO_MTRR
 #object microcode.o
 object mtrr.o
 #object l2_cache.o