josh/hos
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

fixed sample boot.asm, changed Makefile target to $(ISO)

Browse Source 
git-svn-id: svn://anubis/hos/trunk@6 5b3e749e-e535-0410-8002-a9bb6afbdfca
This commit is contained in:
josh 2007-07-25 03:16:59 +00:00
parent 8f00324b30
commit f58228c559
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -4,7 +4,7 @@ MKISOFS = genisoimage
ISO = $(HOS).iso ISO = $(HOS).iso
QEMU = qemu-system-x86_64 QEMU = qemu-system-x86_64
.PHONY: kernel iso clean qemu .PHONY: kernel clean qemu
# default target: build the kernel and ISO image # default target: build the kernel and ISO image
all: kernel iso all: kernel iso
@ -14,7 +14,7 @@ kernel:
make -C kernel make -C kernel
# build the ISO image # build the ISO image
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 \
-boot-load-size 4 -boot-info-table -o $(ISO) iso -boot-load-size 4 -boot-info-table -o $(ISO) iso
@ -23,5 +23,5 @@ clean:
make -C kernel clean make -C kernel clean
-rm -f $(ISO) iso/boot/$(HOS) -rm -f $(ISO) iso/boot/$(HOS)
qemu: qemu: $(ISO)
$(QEMU) -cdrom $(ISO) -boot d -m 384 -localtime $(QEMU) -cdrom $(ISO) -boot d -m 384 -localtime

4
kernel/boot.asm
View File

@ -18,8 +18,8 @@ multiboot_header:
dd -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) dd -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
multiboot_entry: multiboot_entry:
mov byte [0xB8000+160*10+2*2], 'J' mov ax, 0x0700 + 'J'
mov byte [0xB8001+160*10+2*2+1], 0x07 mov [0xB8000+160*10+2*2], ax
looplbl: looplbl:
hlt hlt