diff --git a/src/arch/i386/boot/Config.lb b/src/arch/i386/boot/Config.lb
new file mode 100644
index 0000000000..041cecb360
--- /dev/null
+++ b/src/arch/i386/boot/Config.lb
@@ -0,0 +1,7 @@
+object boot.o
+object linuxbios_table.o
+object tables.o
+if HAVE_PIRQ_TABLE
+object pirq_routing.o 
+end
+
diff --git a/src/arch/i386/boot/tables.c b/src/arch/i386/boot/tables.c
index 07579fefe2..45e2283001 100644
--- a/src/arch/i386/boot/tables.c
+++ b/src/arch/i386/boot/tables.c
@@ -52,9 +52,11 @@ struct lb_memory *write_tables(struct mem_range *mem, unsigned long *processor_m
 
 	/* copy the smp block to address 0 */
 	post_code(0x96);
+#if CONFIG_SMP 
 	/* The smp table must be in 0-1K, 639K-640K, or 960K-1M */
 	remove_logical_cpus(processor_map);
 	low_table_end = write_smp_table(low_table_end, processor_map);
+#endif
 
 	/* Don't write anything in the traditional x86 BIOS data segment */
 	if (low_table_end < 0x500) {