diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2009-12-26 23:32:57 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2009-12-26 23:32:57 -0500 |
| commit | 52a300f1c1ec2d9733d41ecd3ecaf78be48097b8 (patch) | |
| tree | aae0fd6884fd93440080f65144d3f7eab327e1b5 /Makefile | |
| parent | fe2c3eece930e6d6e9f88e5d4d4ba4ccbe29f9fa (diff) | |
| download | seabios-52a300f1c1ec2d9733d41ecd3ecaf78be48097b8.tar.gz | |
Introduce MODESEGMENT define; rename VISIBLE32 to VISIBLE32FLAT.
Prepare for support of segmented 32bit code.
Add new MODESEGMENT definition, and clarify existing 32bit mode defs.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -16,7 +16,7 @@ SRCBOTH=misc.c pmm.c stacks.c output.c util.c block.c floppy.c ata.c mouse.c \ pnpbios.c pirtable.c vgahooks.c ramdisk.c \ usb.c usb-uhci.c usb-ohci.c usb-hid.c paravirt.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 \ +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 @@ -34,8 +34,8 @@ COMMONCFLAGS += $(call cc-option,$(CC),-nopie,) COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,) -override CFLAGS = $(COMMONCFLAGS) -g -DMODE16=0 -CFLAGS16INC = $(COMMONCFLAGS) -DMODE16=1 -fno-defer-pop \ +override CFLAGS = $(COMMONCFLAGS) -g -DMODE16=0 -DMODESEGMENT=0 +CFLAGS16INC = $(COMMONCFLAGS) -DMODE16=1 -DMODESEGMENT=1 -fno-defer-pop \ $(call cc-option,$(CC),-fno-jump-tables,-DMANUAL_NO_JUMP_TABLE) \ $(call cc-option,$(CC),-fno-tree-switch-conversion,) \ $(call cc-option,$(CC),--param large-stack-frame=4,) @@ -112,36 +112,36 @@ $(OUT)asm-offsets.h: $(OUT)asm-offsets.s $(OUT)ccode.16.s: ; $(call whole-compile, $(CFLAGS16) -S, $(addprefix src/, $(SRC16)),$@) -$(OUT)ccode32.o: ; $(call whole-compile, $(CFLAGS), $(addprefix src/, $(SRC32)),$@) +$(OUT)ccode32flat.o: ; $(call whole-compile, $(CFLAGS), $(addprefix src/, $(SRC32FLAT)),$@) $(OUT)code16.o: romlayout.S $(OUT)ccode.16.s $(OUT)asm-offsets.h @echo " Compiling (16bit) $@" $(Q)$(CC) $(CFLAGS16INC) -c -D__ASSEMBLY__ $< -o $@ -$(OUT)romlayout16.lds $(OUT)romlayout32.lds $(OUT)code32.o: $(OUT)ccode32.o $(OUT)code16.o tools/layoutrom.py +$(OUT)romlayout16.lds $(OUT)romlayout32flat.lds $(OUT)code32flat.o: $(OUT)ccode32flat.o $(OUT)code16.o tools/layoutrom.py @echo " Building ld scripts (version \"$(VERSION)\")" $(Q)echo 'const char VERSION[] = "$(VERSION)";' > $(OUT)version.c $(Q)$(CC) $(CFLAGS) -c $(OUT)version.c -o $(OUT)version.o - $(Q)$(LD) -melf_i386 -r $(OUT)ccode32.o $(OUT)version.o -o $(OUT)code32.o - $(Q)$(OBJDUMP) -thr $(OUT)code32.o > $(OUT)code32.o.objdump + $(Q)$(LD) -melf_i386 -r $(OUT)ccode32flat.o $(OUT)version.o -o $(OUT)code32flat.o + $(Q)$(OBJDUMP) -thr $(OUT)code32flat.o > $(OUT)code32flat.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 + $(Q)./tools/layoutrom.py $(OUT)code16.o.objdump $(OUT)code32flat.o.objdump $(OUT)romlayout16.lds $(OUT)romlayout32flat.lds -$(OUT)rom16.o: $(OUT)code16.o $(OUT)rom32.o $(OUT)romlayout16.lds +$(OUT)rom16.o: $(OUT)code16.o $(OUT)rom32flat.o $(OUT)romlayout16.lds @echo " Linking (no relocs) $@" $(Q)$(LD) -r -T $(OUT)romlayout16.lds $< -o $@ -$(OUT)rom32.o: $(OUT)code32.o $(OUT)romlayout32.lds +$(OUT)rom32flat.o: $(OUT)code32flat.o $(OUT)romlayout32flat.lds @echo " Linking (no relocs) $@" - $(Q)$(LD) -r -T $(OUT)romlayout32.lds $< -o $@ + $(Q)$(LD) -r -T $(OUT)romlayout32flat.lds $< -o $@ -$(OUT)rom.o: $(OUT)rom16.o $(OUT)rom32.o $(OUT)rombios16.lds $(OUT)rombios.lds +$(OUT)rom.o: $(OUT)rom16.o $(OUT)rom32flat.o $(OUT)rombios16.lds $(OUT)rombios.lds @echo " Linking $@" - $(Q)$(LD) -T $(OUT)rombios16.lds $(OUT)rom16.o -R $(OUT)rom32.o -o $(OUT)rom16.reloc.o + $(Q)$(LD) -T $(OUT)rombios16.lds $(OUT)rom16.o -R $(OUT)rom32flat.o -o $(OUT)rom16.reloc.o $(Q)$(STRIP) $(OUT)rom16.reloc.o -o $(OUT)rom16.final.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 -R $(OUT)rom16.moved.o -o $@ + $(Q)$(LD) -T $(OUT)rombios.lds $(OUT)rom16.final.o $(OUT)rom32flat.o -R $(OUT)rom16.moved.o -o $@ $(OUT)bios.bin.elf $(OUT)bios.bin: $(OUT)rom.o tools/checkrom.py @echo " Prepping $@" |