4 files changed, 8 insertions, 17 deletions
diff --git a/src/config/Config.lb b/src/config/Config.lb
index 27c599fe7b..86c58d0654 100644
--- a/src/config/Config.lb
+++ b/src/config/Config.lb
@@ -1,10 +1,6 @@
 ## This is Architecture independant part of the makefile
 
-option LINUXBIOS_VERSION="1.1.0"
-
-option CC="$(CROSS_COMPILE)gcc"
-option HOSTCC="$(CROSS_COMPILE)gcc"
-option OBJCOPY="objcopy"
+uses HAVE_OPTION_TABLE
 
 makedefine CPP:= $(CC) -no-gcc -x assembler-with-cpp -DASSEMBLY -E
 makedefine LIBGCC_FILE_NAME := $(shell $(CC) -print-libgcc-file-name)
@@ -16,15 +12,6 @@ makedefine CFLAGS := $(CPU_OPT) $(CPPFLAGS) -Os -nostdinc -nostdlib -fno-builtin
 
 makedefine HOSTCFLAGS:= -Os -Wall
 
-option LINUXBIOS_BUILD          = "$(shell date)	"
-option LINUXBIOS_COMPILE_TIME   = "$(shell date +%T)"
-option LINUXBIOS_COMPILE_BY     = "$(shell whoami)"
-option LINUXBIOS_COMPILE_HOST   = "$(shell hostname)"
-option LINUXBIOS_COMPILE_DOMAIN = "$(shell dnsdomainname)"
-option LINUXBIOS_COMPILER       = "$(shell  $(CC) $(CFLAGS) -v 2>&1 | tail -n 1)"
-option LINUXBIOS_LINKER         = "$(shell  $(CC) -Wl,-v 2>&1 | grep version | tail -n 1)"
-option LINUXBIOS_ASSEMBLER      = "$(shell  touch dummy.s ; $(CC) -c -Wa,-v dummy.s 2>&1; rm -f dummy.s dummy.o )"
-
 makerule ldscript.ld   dep "ldoptions $(LDSUBSCRIPTS-1)" act " echo \"INCLUDE ldoptions\" > $@ ; for file in $(LDSUBSCRIPTS-1) ; do echo \"INCLUDE $$file\" >> $@ ; done"
 
 makerule cpuflags   dep "Makefile.settings" act " perl -e 'print \"CPUFLAGS :=\n\"; foreach $$var (split(\" \", $$ENV{VARIABLES})) { if (exists($$ENV{$$var})) { print \"CPUFLAGS += -D$$var\" . (length($$ENV{$$var})?\"=\x27$$ENV{$$var}\x27\":\"\") .\"\n\"} else { print \"CPUFLAGS += -U$$var\n\"} }' > $@"
@@ -41,8 +28,6 @@ makerule linuxbios_c  dep "linuxbios_c.o $(TOP)/src/config/linuxbios_c.ld ldopti
 ##
 ## By default compress the C part of linuxbios
 ##
-option CONFIG_COMPRESS=1
-option CONFIG_UNCOMPRESSED=!CONFIG_COMPRESS
 makedefine LINUXBIOS_PAYLOAD-$(CONFIG_COMPRESS):=linuxbios_payload.nrv2b
 makedefine LINUXBIOS_PAYLOAD-$(CONFIG_UNCOMPRESSED):=linuxbios_payload.bin
 
@@ -56,7 +41,6 @@ addaction linuxbios "$(CROSS_COMPILE)nm -n linuxbios | sort > linuxbios.map"
 makerule linuxbios.a   dep "$(OBJECTS-1) " act "rm -f linuxbios.a"
 addaction linuxbios.a "ar cr linuxbios.a $(OBJECTS-1)"
 
-option CRT0="$(TOP)/src/arch/$(ARCH)/config/crt0.base"
 makerule crt0.S   dep "$(CRT0) " act "cp $< $@"
 
 # the buildrom tool
diff --git a/src/console/Config.lb b/src/console/Config.lb
index 48ce3f6f5a..eb2d33c8e9 100644
--- a/src/console/Config.lb
+++ b/src/console/Config.lb
@@ -1,3 +1,6 @@
+uses CONFIG_CONSOLE_SERIAL8250 CONFIG_CONSOLE_VGA
+uses CONFIG_CONSOLE_LOGBUF CONFIG_CONSOLE_SROM
+
 object printk.o
 if CONFIG_CONSOLE_SERIAL8250
   driver uart8250_console.o 
diff --git a/src/lib/Config.lb b/src/lib/Config.lb
index d312dd1fac..1d05709fa5 100644
--- a/src/lib/Config.lb
+++ b/src/lib/Config.lb
@@ -1,3 +1,5 @@
+uses HAVE_FALLBACK_BOOT
+
 object clog2.o
 object uart8250.o
 object memset.o
diff --git a/src/stream/Config.lb b/src/stream/Config.lb
index f95a072b1a..9ad9378bee 100644
--- a/src/stream/Config.lb
+++ b/src/stream/Config.lb
@@ -1,3 +1,5 @@
+uses CONFIG_ROM_STREAM
+
 if CONFIG_ROM_STREAM
   object rom_stream.o
 end