6 files changed, 21 insertions, 17 deletions
diff --git a/src/arch/i386/boot/pirq_routing.c b/src/arch/i386/boot/pirq_routing.c
index 6c7f640ca3..bb0f66b280 100644
--- a/src/arch/i386/boot/pirq_routing.c
+++ b/src/arch/i386/boot/pirq_routing.c
@@ -2,7 +2,7 @@
 #include <arch/pirq_routing.h>
 #include <string.h>
 
-#if DEBUG==1
+#if (DEBUG==1 && HAVE_PIRQ_TABLE==1)
 void check_pirq_routing_table(void)
 {
 	const uint8_t *addr;
@@ -84,6 +84,7 @@ int verify_copy_pirq_routing_table(unsigned long addr)
 #define verify_copy_pirq_routing_table(addr)
 #endif
 
+#if HAVE_PIRQ_TABLE==1
 unsigned long copy_pirq_routing_table(unsigned long addr)
 {
 	/* Align the table to be 16 byte aligned. */
@@ -97,3 +98,4 @@ unsigned long copy_pirq_routing_table(unsigned long addr)
 	verify_copy_pirq_routing_table(addr);
 	return addr + intel_irq_routing_table.size;
 }
+#endif
diff --git a/src/arch/i386/include/arch/pirq_routing.h b/src/arch/i386/include/arch/pirq_routing.h
index 215c4e58c8..9f7059f27c 100644
--- a/src/arch/i386/include/arch/pirq_routing.h
+++ b/src/arch/i386/include/arch/pirq_routing.h
@@ -39,13 +39,13 @@ struct irq_routing_table {
 
 extern const struct irq_routing_table intel_irq_routing_table;
 
-#if defined(DEBUG) && defined(HAVE_PIRQ_TABLE)
+#if (DEBUG==1 && HAVE_PIRQ_TABLE==1)
 void check_pirq_routing_table(void);
 #else
 #define check_pirq_routing_table() do {} while(0)
 #endif
 
-#if defined(HAVE_PIRQ_TABLE)
+#if HAVE_PIRQ_TABLE==1
 unsigned long copy_pirq_routing_table(unsigned long start);
 #else
 #define copy_pirq_routing_table(start) (start)
diff --git a/src/config/Options.lb b/src/config/Options.lb
index 5993ae14dd..694a8aad4d 100644
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -63,27 +63,27 @@ define ARCH
 end
 define k7
 	default none
-	export always
+	export used
 	comment "We're a k7"
 end
 define k8
 	default none
-	export always
+	export used
 	comment "We're a k8"
 end
 define i586
 	default none
-	export always
+	export used
 	comment "We're a 586"
 end
 define i686
 	default none
-	export always
+	export used
 	comment "We're a 686"
 end
 define CPU_FIXUP
 	default none
-	export always
+	export used
 	comment "Do CPU fixups"
 end
 
@@ -263,7 +263,7 @@ end
 define HEAP_SIZE
 	default 0x2000
 	format "0x%x"
-	export used
+	export always
 	comment "Default heap size"
 end
 define _RAMBASE
@@ -415,7 +415,7 @@ define CONFIG_SERIAL_POST
 end
 define NO_POST
 	default none
-	export always
+	export used
 	comment "Disable POST codes"
 end
 define TTYS0_BASE
@@ -503,7 +503,7 @@ define CONFIG_LOGICAL_CPUS
 end
 define HAVE_MP_TABLE
 	default none
-	export always
+	export used
 	comment "Define to build an MP table"
 end
 
@@ -565,22 +565,22 @@ end
 
 define HAVE_PIRQ_TABLE
 	default none
-	export always
+	export used
 	comment "Define if we have a PIRQ table"
 end
 define IRQ_SLOT_COUNT
 	default none
-	export always
+	export used
 	comment "Number of IRQ slots"
 end
 define CONFIG_PCIBIOS_IRQ
 	default none
-	export always
+	export used
 	comment "PCIBIOS IRQ support"
 end
 define CONFIG_IOAPIC
 	default none
-	export always
+	export used
 	comment "IOAPIC support"
 end
 
@@ -600,7 +600,7 @@ define IDE_BOOT_DRIVE
 end
 define IDE_SWAB
 	default none
-	export always
+	export used
 	comment "Swap bytes when reading from IDE device"
 end
 define IDE_OFFSET
diff --git a/src/cpu/k7/Config.lb b/src/cpu/k7/Config.lb
index 3c45a215b7..fafe44d64e 100644
--- a/src/cpu/k7/Config.lb
+++ b/src/cpu/k7/Config.lb
@@ -1,4 +1,5 @@
 uses k7
 uses CPU_FIXUP
+default k7=1
 dir /cpu/p6
 #object cpufixup.o
diff --git a/src/cpu/k8/Config.lb b/src/cpu/k8/Config.lb
index c44659517a..a0a702e043 100644
--- a/src/cpu/k8/Config.lb
+++ b/src/cpu/k8/Config.lb
@@ -1,4 +1,6 @@
+uses k8
 uses CPU_FIXUP
+default k8=1
 dir /cpu/k7
 config chip.h
 if CPU_FIXUP
diff --git a/src/cpu/p6/Config.lb b/src/cpu/p6/Config.lb
index f6e9777bcd..22142623e0 100644
--- a/src/cpu/p6/Config.lb
+++ b/src/cpu/p6/Config.lb
@@ -1,4 +1,3 @@
-uses i686
 uses INTEL_PPRO_MTRR
 dir /cpu/p5
 object cpufixup.o