vgabios: Build vgabios by default if enabled in Kconfig.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
diff --git a/Makefile b/Makefile
index beb8fd0..0343ce5 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,6 @@
$(call cc-option,$(CC),--param large-stack-frame=4,-fno-inline)
CFLAGS16 = $(CFLAGS16INC) -g -fomit-frame-pointer
-all: $(OUT) $(OUT)bios.bin
-
# Run with "make V=1" to see the actual compile commands
ifdef V
Q=
@@ -57,10 +55,24 @@
MAKEFLAGS += --no-print-directory
endif
+# Common command definitions
+export HOSTCC := $(CC)
+export CONFIG_SHELL := sh
+export KCONFIG_AUTOHEADER := autoconf.h
+export KCONFIG_CONFIG := $(CURDIR)/.config
OBJCOPY=objcopy
OBJDUMP=objdump
STRIP=strip
+# Default targets
+-include $(KCONFIG_CONFIG)
+
+target-y = $(OUT) $(OUT)bios.bin
+target-$(CONFIG_BUILD_VGABIOS) += $(OUT)vgabios.bin
+
+all: $(target-y)
+
+# Make definitions
.PHONY : all clean distclean FORCE
vpath %.c src vgasrc
@@ -206,24 +218,16 @@
$(OUT)ccode32flat.o: src/acpi-dsdt.hex src/ssdt-proc.hex src/ssdt-pcihp.hex
####### Kconfig rules
-export HOSTCC := $(CC)
-export CONFIG_SHELL := sh
-export KCONFIG_AUTOHEADER := autoconf.h
-export KCONFIG_CONFIG := $(CURDIR)/.config
+define do-kconfig
+$(Q)mkdir -p $(OUT)/tools/kconfig/lxdialog
+$(Q)mkdir -p $(OUT)/include/config
+$(Q)$(MAKE) -C $(OUT) -f $(CURDIR)/tools/kconfig/Makefile srctree=$(CURDIR) src=tools/kconfig obj=tools/kconfig Q=$(Q) Kconfig=$(CURDIR)/src/Kconfig $1
+endef
-$(OUT)autoconf.h : $(KCONFIG_CONFIG)
- $(Q)$(MAKE) silentoldconfig
-
-$(KCONFIG_CONFIG):
- $(Q)$(MAKE) defconfig
-
-%onfig:
- $(Q)mkdir -p $(OUT)/tools/kconfig/lxdialog
- $(Q)mkdir -p $(OUT)/include/config
- $(Q)$(MAKE) -C $(OUT) -f $(CURDIR)/tools/kconfig/Makefile srctree=$(CURDIR) src=tools/kconfig obj=tools/kconfig Q=$(Q) Kconfig=$(CURDIR)/src/Kconfig $@
-
-help:
- $(Q)$(MAKE) -f $(CURDIR)/tools/kconfig/Makefile help
+$(OUT)autoconf.h : $(KCONFIG_CONFIG) ; $(call do-kconfig, silentoldconfig)
+$(KCONFIG_CONFIG): ; $(call do-kconfig, defconfig)
+%onfig: ; $(call do-kconfig, $@)
+help: ; $(call do-kconfig, $@)
####### Generic rules
clean:
diff --git a/src/Kconfig b/src/Kconfig
index e6ce117..4b72bd1 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -327,7 +327,12 @@
menu "VGA ROM"
choice
prompt "VGA Hardware Type"
- default VGA_CIRRUS
+ default NO_VGABIOS
+
+ config NO_VGABIOS
+ bool "None"
+ help
+ Do not build a VGA BIOS.
config VGA_STANDARD_VGA
bool "Standard VGA"
@@ -355,7 +360,12 @@
Build support for Geode LX vga.
endchoice
+ config BUILD_VGABIOS
+ bool
+ default !NO_VGABIOS
+
config VGA_PCI
+ depends on BUILD_VGABIOS
bool "PCI ROM Headers"
default y
help