X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile;h=0343ce555b72ce510a5d16a198f967f952d6ff30;hb=8cf8f8e6ce971b16ee25309df7ebf32f7a04dc14;hp=c3ba2f38bc43cd1a05241030efc5e4843b0b51e7;hpb=aba52eba96e019b396177e0e422fc053640aeeb2;p=seabios.git diff --git a/Makefile b/Makefile index c3ba2f3..0343ce5 100644 --- a/Makefile +++ b/Makefile @@ -12,43 +12,40 @@ OUT=out/ # Source files SRCBOTH=misc.c stacks.c pmm.c output.c util.c block.c floppy.c ata.c mouse.c \ - kbd.c pci.c serial.c clock.c pic.c cdrom.c ps2port.c smp.c resume.c \ - pnpbios.c pirtable.c vgahooks.c ramdisk.c pcibios.c blockcmd.c \ - usb.c usb-uhci.c usb-ohci.c usb-ehci.c usb-hid.c usb-msc.c \ - virtio-ring.c virtio-pci.c virtio-blk.c apm.c ahci.c + kbd.c pci.c serial.c clock.c pic.c cdrom.c ps2port.c smp.c resume.c \ + pnpbios.c pirtable.c vgahooks.c ramdisk.c pcibios.c blockcmd.c \ + usb.c usb-uhci.c usb-ohci.c usb-ehci.c usb-hid.c usb-msc.c \ + virtio-ring.c virtio-pci.c virtio-blk.c apm.c ahci.c SRC16=$(SRCBOTH) system.c disk.c font.c SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \ - acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \ - lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c \ - biostables.c xen.c bmp.c + acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \ + lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c \ + biostables.c xen.c bmp.c SRC32SEG=util.c output.c pci.c pcibios.c apm.c stacks.c -cc-option = $(shell if test -z "`$(1) $(2) -S -o /dev/null -xc \ - /dev/null 2>&1`"; then echo "$(2)"; else echo "$(3)"; fi ;) +cc-option=$(shell if test -z "`$(1) $(2) -S -o /dev/null -xc /dev/null 2>&1`" \ + ; then echo "$(2)"; else echo "$(3)"; fi ;) # Default compiler flags COMMONCFLAGS = -I$(OUT) -Os -MD \ - -Wall -Wno-strict-aliasing -Wold-style-definition \ - $(call cc-option,$(CC),-Wtype-limits,) \ - -m32 -march=i386 -mregparm=3 -mpreferred-stack-boundary=2 \ - -mrtd -minline-all-stringops \ - -freg-struct-return -ffreestanding -fomit-frame-pointer \ - -fno-delete-null-pointer-checks \ - -ffunction-sections -fdata-sections -fno-common + -Wall -Wno-strict-aliasing -Wold-style-definition \ + $(call cc-option,$(CC),-Wtype-limits,) \ + -m32 -march=i386 -mregparm=3 -mpreferred-stack-boundary=2 \ + -mrtd -minline-all-stringops \ + -freg-struct-return -ffreestanding -fno-delete-null-pointer-checks \ + -ffunction-sections -fdata-sections -fno-common COMMONCFLAGS += $(call cc-option,$(CC),-nopie,) COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,) -CFLAGS32FLAT = $(COMMONCFLAGS) -g -DMODE16=0 -DMODESEGMENT=0 +CFLAGS32FLAT = $(COMMONCFLAGS) -DMODE16=0 -DMODESEGMENT=0 -g -fomit-frame-pointer CFLAGSSEG = $(COMMONCFLAGS) -DMODESEGMENT=1 -fno-defer-pop \ - $(call cc-option,$(CC),-fno-jump-tables,-DMANUAL_NO_JUMP_TABLE) \ - $(call cc-option,$(CC),-fno-tree-switch-conversion,) -CFLAGS32SEG = $(CFLAGSSEG) -DMODE16=0 -g + $(call cc-option,$(CC),-fno-jump-tables,-DMANUAL_NO_JUMP_TABLE) \ + $(call cc-option,$(CC),-fno-tree-switch-conversion,) +CFLAGS32SEG = $(CFLAGSSEG) -DMODE16=0 -g -fomit-frame-pointer CFLAGS16INC = $(CFLAGSSEG) -DMODE16=1 \ - $(call cc-option,$(CC),--param large-stack-frame=4,-fno-inline) -CFLAGS16 = $(CFLAGS16INC) -g - -all: $(OUT) $(OUT)bios.bin + $(call cc-option,$(CC),--param large-stack-frame=4,-fno-inline) +CFLAGS16 = $(CFLAGS16INC) -g -fomit-frame-pointer # Run with "make V=1" to see the actual compile commands ifdef V @@ -58,10 +55,24 @@ Q=@ 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 @@ -170,10 +181,14 @@ $(OUT)bios.bin.elf $(OUT)bios.bin: $(OUT)rom.o tools/checkrom.py ################ VGA build rules # VGA src files -SRCVGA=src/output.c src/util.c vgasrc/vga.c vgasrc/vgafb.c vgasrc/vgaio.c \ - vgasrc/vgatables.c vgasrc/vgafonts.c vgasrc/clext.c +SRCVGA=src/output.c src/util.c src/pci.c \ + vgasrc/vgabios.c vgasrc/vgafb.c vgasrc/vgafonts.c vgasrc/vbe.c \ + vgasrc/stdvga.c vgasrc/stdvgamodes.c vgasrc/stdvgaio.c \ + vgasrc/clext.c vgasrc/bochsvga.c vgasrc/geodevga.c + +CFLAGS16VGA = $(CFLAGS16INC) -g -Isrc -$(OUT)vgaccode.16.s: $(OUT)autoconf.h ; $(call whole-compile, $(CFLAGS16) -S -Isrc, $(SRCVGA),$@) +$(OUT)vgaccode.16.s: $(OUT)autoconf.h ; $(call whole-compile, $(CFLAGS16VGA) -S, $(SRCVGA),$@) $(OUT)vgalayout16.o: vgaentry.S $(OUT)vgaccode.16.s $(OUT)asm-offsets.h @echo " Compiling (16bit) $@" @@ -203,24 +218,16 @@ src/%.hex: src/%.dsl ./tools/acpi_extract_preprocess.py ./tools/acpi_extract.py $(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 - -$(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 $@ +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 -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: