Add support for using floppy images in CBFS.

[seabios.git] / Makefile

diff --git a/Makefile b/Makefile
index 71e3cb48b0df271c9dd7795a5201e47264d373e0..d697fcac1fae1aeb809e4dbe3deb83b03bcb61dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,17 @@
 #
 # This file may be distributed under the terms of the GNU LGPLv3 license.
 
+# Program version
+VERSION=pre-0.4.2-$(shell date +"%Y%m%d_%H%M%S")-$(shell hostname)
+
 # Output directory
 OUT=out/
 
 # Source files
-SRCBOTH=output.c util.c floppy.c ata.c misc.c mouse.c kbd.c pci.c \
+SRCBOTH=output.c util.c block.c floppy.c ata.c misc.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
-SRC16=$(SRCBOTH) system.c disk.c apm.c pcibios.c vgahooks.c font.c
+        pnpbios.c pirtable.c vgahooks.c pmm.c ramdisk.c
+SRC16=$(SRCBOTH) system.c disk.c apm.c pcibios.c font.c
 SRC32=$(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
@@ -106,37 +109,41 @@ $(OUT)asm-offsets.h: $(OUT)asm-offsets.s
        @echo "  Generating offset file $@"
        $(Q)./tools/gen-offsets.sh $< $@
 
+
 $(OUT)ccode.16.s: ; $(call whole-compile, $(CFLAGS16) -S, $(addprefix src/, $(SRC16)),$@)
 
-$(OUT)romlayout16.o: romlayout.S $(OUT)ccode.16.s $(OUT)asm-offsets.h
+$(OUT)code16.o: romlayout.S $(OUT)ccode.16.s $(OUT)asm-offsets.h
        @echo "  Compiling (16bit) $@"
        $(Q)$(CC) $(CFLAGS16INC) -c -D__ASSEMBLY__ $< -o $@
 
-$(OUT)ccode32.o: ; $(call whole-compile, $(CFLAGS), $(addprefix src/, $(SRC32)),$@)
-
-$(OUT)rom32.o: $(OUT)ccode32.o $(OUT)rombios32.lds
-       @echo "  Linking (no relocs) $@"
-       $(Q)$(LD) -r -T $(OUT)rombios32.lds $< -o $@
+$(OUT)code32.o: ; $(call whole-compile, $(CFLAGS), $(addprefix src/, $(SRC32)),$@)
 
-$(OUT)romlayout16.lds $(OUT)romlayout32.lds: $(OUT)ccode32.o $(OUT)romlayout16.o
+$(OUT)romlayout16.lds $(OUT)romlayout32.lds: $(OUT)code32.o $(OUT)code16.o
        @echo "  Building layout information $@"
-       $(Q)$(OBJDUMP) -thr $(OUT)ccode32.o > $(OUT)ccode32.o.objdump
-       $(Q)$(OBJDUMP) -thr $(OUT)romlayout16.o > $(OUT)romlayout16.o.objdump
-       $(Q)./tools/layoutrom.py $(OUT)romlayout16.o.objdump $(OUT)ccode32.o.objdump $(OUT)romlayout16.lds $(OUT)romlayout32.lds
+       $(Q)$(OBJDUMP) -thr $(OUT)code32.o > $(OUT)code32.o.objdump
+       $(Q)$(OBJDUMP) -thr $(OUT)code16.o > $(OUT)code16.o.objdump
+       $(Q)./tools/layoutrom.py $(OUT)code16.o.objdump $(OUT)code32.o.objdump $(OUT)romlayout16.lds $(OUT)romlayout32.lds
 
 $(OUT)layout16.lds: $(OUT)romlayout16.lds
 $(OUT)rombios32.lds: $(OUT)romlayout32.lds
 
-$(OUT)rom16.o: $(OUT)romlayout16.o $(OUT)rom32.o $(OUT)layout16.lds
+
+$(OUT)rom16.o: $(OUT)code16.o $(OUT)rom32.o $(OUT)layout16.lds
        @echo "  Linking (no relocs) $@"
        $(Q)$(LD) -r -T $(OUT)layout16.lds $< -o $@
 
+$(OUT)rom32.o: $(OUT)code32.o $(OUT)rombios32.lds
+       @echo "  Linking (no relocs) $@"
+       $(Q)$(LD) -r -T $(OUT)rombios32.lds $< -o $@
+
 $(OUT)rom.o: $(OUT)rom16.o $(OUT)rom32.o $(OUT)rombios16.lds $(OUT)rombios.lds
-       @echo "  Linking $@"
+       @echo "  Linking $@ (version \"$(VERSION)\")"
+       $(Q)echo 'const char VERSION[] __attribute__((section(".data32.version"))) = "$(VERSION)";' > $(OUT)version.c
+       $(Q)$(CC) $(CFLAGS) -c $(OUT)version.c -o $(OUT)version.o
        $(Q)$(LD) -T $(OUT)rombios16.lds $(OUT)rom16.o -R $(OUT)rom32.o -o $(OUT)rom16.reloc.o
        $(Q)$(STRIP) $(OUT)rom16.reloc.o -o $(OUT)rom16.final.o
-       $(Q)$(OBJCOPY) --extract-symbol --adjust-vma 0xf0000 $(OUT)rom16.o $(OUT)rom16.moved.o
-       $(Q)$(LD) -T $(OUT)rombios.lds $(OUT)rom16.final.o $(OUT)rom32.o -R $(OUT)rom16.moved.o -o $@
+       $(Q)$(OBJCOPY) --adjust-vma 0xf0000 $(OUT)rom16.o $(OUT)rom16.moved.o
+       $(Q)$(LD) -T $(OUT)rombios.lds $(OUT)rom16.final.o $(OUT)rom32.o $(OUT)version.o -R $(OUT)rom16.moved.o -o $@
 
 $(OUT)bios.bin.elf: $(OUT)rom.o
        @echo "  Prepping $@"