load address changed to 1MB
git-svn-id: svn://anubis/hos/trunk@7 5b3e749e-e535-0410-8002-a9bb6afbdfca
This commit is contained in:
parent
f58228c559
commit
af529606e9
4
Makefile
4
Makefile
@ -4,7 +4,7 @@ MKISOFS = genisoimage
|
|||||||
ISO = $(HOS).iso
|
ISO = $(HOS).iso
|
||||||
QEMU = qemu-system-x86_64
|
QEMU = qemu-system-x86_64
|
||||||
|
|
||||||
.PHONY: kernel clean qemu
|
.PHONY: kernel clean qemu iso
|
||||||
|
|
||||||
# default target: build the kernel and ISO image
|
# default target: build the kernel and ISO image
|
||||||
all: kernel iso
|
all: kernel iso
|
||||||
@ -14,6 +14,8 @@ kernel:
|
|||||||
make -C kernel
|
make -C kernel
|
||||||
|
|
||||||
# build the ISO image
|
# build the ISO image
|
||||||
|
iso: $(ISO)
|
||||||
|
|
||||||
$(ISO): kernel
|
$(ISO): kernel
|
||||||
cp kernel/$(HOS) iso/boot
|
cp kernel/$(HOS) iso/boot
|
||||||
$(MKISOFS) -R -b boot/grub/stage2_eltorito -no-emul-boot \
|
$(MKISOFS) -R -b boot/grub/stage2_eltorito -no-emul-boot \
|
||||||
|
@ -1,12 +1,14 @@
|
|||||||
|
|
||||||
KERNEL = hos
|
KERNEL = hos
|
||||||
TARGET = elf32-i386
|
LOAD_ADDRESS = 0x100000
|
||||||
|
LDTARGET = elf32-i386
|
||||||
|
LDFLAGS = -Ttext $(LOAD_ADDRESS) --oformat $(LDTARGET)
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
|
|
||||||
all:
|
all:
|
||||||
nasm -f elf -o boot.o boot.asm
|
nasm -f elf -o boot.o boot.asm
|
||||||
ld --oformat $(TARGET) -o $(KERNEL) boot.o
|
ld $(LDFLAGS) -o $(KERNEL) boot.o
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
-rm -f *~ $(KERNEL) *.o
|
-rm -f *~ $(KERNEL) *.o
|
||||||
|
Loading…
x
Reference in New Issue
Block a user