diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-11-14 11:08:15 +0100 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-11-14 11:08:15 +0100 |
| commit | dbf8051b468e240370e3bde630a4e6fa88a031de (patch) | |
| tree | f4c5d3ef5d79d8eac27affed07e4a9215610590c | |
| parent | e3cc5f6c89ba9f37bf2c1edf588d0f75c1d63c57 (diff) | |
adapt buildsys
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | boot1/Makefile | 3 | ||||
| -rw-r--r-- | boot2/Makefile | 4 | ||||
| -rw-r--r-- | boot2/mp.asm | 2 |
5 files changed, 16 insertions, 15 deletions
@@ -42,7 +42,7 @@ ASMSOURCES=$(wildcard ./asm/*.asm) #kernel object files OBJECTS=$(patsubst %.c, %.o, $(SOURCES)) ASMOBJECTS=$(patsubst %.asm, %.o, $(ASMSOURCES)) -KERNEL_ENTRY=./boot/kernel_entry.o +KERNEL_ENTRY=./boot2/kernel_entry.o # deps DEPS=$(patsubst %.c, %.d, $(SOURCES)) @@ -57,17 +57,19 @@ include Makefile.common -include $(DEPS) #master boot record -MBR=./boot0/mbr.bin +MBR=./boot1/mbr.bin $(MBR): - make -C boot0 + make -C boot1 #stage 2 bootloader -STAGE2=./boot/stage2.bin +STAGE2=./boot2/stage2.bin $(STAGE2): - make -C boot + make -C boot2 #multiprocessor binary entry -MP_BIN=./boot/mp.bin +MP_BIN=./boot2/mp.bin +$(MP_BIN): + make -C boot2 mp.bin #some fillup data (zeros) FILLUP=./data/fill.bin @@ -129,9 +131,9 @@ stick: FoolOS.img clean_release: -rm *.bin FoolData.img binfont.img bochs.log $(KERNEL_ENTRY) $(ASMOBJECTS) $(OBJECTS) $(FILLUP) $(MBR) $(MP_BIN) bochs.out ne2k-tx.log ne2k-txdump.txt $(STAGE2) $(DEPS) + make -C boot1 clean + make -C boot2 clean make -C userspace clean - make -C boot0 clean - make -C boot clean clean: clean_release -rm FoolOS.img FoolOS.vdi @@ -112,8 +112,8 @@ Organization * asm/ - NASM assembler files * bochs/ -Bochs config files -* boot/ - 2nd stage bootloader -* boot0/ - 1st stage bootloader +* boot1/ - 2nd stage bootloader +* boot2/ - 1st stage bootloader * data/ - datafiles (font-file and fill.asm) * fs/ - file system related source * kernel/ - kernel source diff --git a/boot1/Makefile b/boot1/Makefile index e930498..b9b2e24 100644 --- a/boot1/Makefile +++ b/boot1/Makefile @@ -11,6 +11,3 @@ $(MBR): $(ASM_SOURCES) clean: -rm $(MBR) - - - diff --git a/boot2/Makefile b/boot2/Makefile index 17dc454..f1de230 100644 --- a/boot2/Makefile +++ b/boot2/Makefile @@ -3,13 +3,15 @@ include ../Makefile.common STAGE2=stage2.bin +MP=mp.bin ASM_SOURCES=$(wildcard *.asm) $(STAGE2): $(ASM_SOURCES) +$(MP): $(ASM_SOURCES) clean: - -rm $(STAGE2) + -rm $(STAGE2) $(MP) diff --git a/boot2/mp.asm b/boot2/mp.asm index 072aa74..b6efd04 100644 --- a/boot2/mp.asm +++ b/boot2/mp.asm @@ -34,4 +34,4 @@ boot_32_pm: ; call 0x18000 ;jump into our Kernel! -%include "boot/GDT.asm" +%include "GDT.asm" |