grub bootloader

.gitignore

@@ -9,7 +9,7 @@ bochsout.txt
 bimg
 !bimg/
 *.dSYM
-iso/
+build_dir/
 HelloOS
 *.s~
 *.i

Makefile

@@ -1,12 +1,11 @@
+MAKEFLAGS = --no-print-directory
 export BASE_DIR=$(shell pwd)
 export TARGET_ISO=HelloOS.iso
 export CONFIG_x86_64=y
 export CC=gcc
 export AS=as
 export HIDE=@
-ifneq ($(HIDE),)
-	MAKEFLAGS += --no-print-dirctory
-endif
+export DEBUG=
 
 
 HelloOS:
@@ -19,4 +18,5 @@ cleanall:
 	$(HIDE)make -C arch cleanall
 
 run:
-	qemu-system-x86_64 -m 1G -cdrom arch/$(TARGET_ISO) -nographic
+	qemu-system-x86_64 -m 1G -cdrom arch/$(TARGET_ISO) -nographic
+

arch/Makefile

@@ -7,12 +7,12 @@ else
 	$(HIDE)echo "unkown arch..."
 endif
 
-$(TARGET_ISO): $(kernel_target)
+$(TARGET_ISO): clean $(kernel_target)
 	$(HIDE)rm -rf build_dir
 	$(HIDE)mkdir -p build_dir/boot/grub
 	$(HIDE)cp $(kernel_target) build_dir/boot
 
-	$(HIDE)echo 'set timeout=0' > build_dir/boot/grub/grub.cfg
+	$(HIDE)echo 'set timeout=1' > build_dir/boot/grub/grub.cfg
 	$(HIDE)echo 'set default=0' >> build_dir/boot/grub/grub.cfg
 	$(HIDE)echo 'menuentry "HelloOS" {' >> build_dir/boot/grub/grub.cfg
 	$(HIDE)echo '	multiboot2 /boot/kernel.elf "HelloOS"' >> build_dir/boot/grub/grub.cfg
@@ -21,14 +21,18 @@ $(TARGET_ISO): $(kernel_target)
 	$(HIDE)grub-mkrescue -o $(TARGET_ISO) build_dir
 	$(HIDE)rm -rf build_dir
 
-$(kernel_target):
+$(kernel_target): compile
+	$(HIDE)ld -b elf64-x86-64 -z muldefs -o $(kernel_target) -Map=./kernel.map -T $(lds) $(shell find $(SRCS) -name "*.o") 
+
+compile:
 	$(HIDE)for dir in $(SRCS); do \
 		make -C $$dir || exit 1; \
 	done
-	$(HIDE)ld -b elf64-x86-64 -z muldefs -o $(kernel_target) -Map=./kernel.map -T $(lds) $(shell find $(SRCS) -name "*.o") 
 
 clean:
 	$(HIDE)rm -rf $(kernel_target) $(TARGET_ISO) kernel.map
 
 cleanall: clean
-	$(HIDE)rm -rf $(kernel_target) $(TARGET_ISO)
+	$(HIDE)for dir in $(SRCS); do \
+		make -C $$dir clean || exit 1; \
+	done

arch/x86/Makefile

@@ -1,9 +1,27 @@
 export ASFLAGS=--64
 export CFLAGS = -I$(BASE_DIR)/include --static -fno-pie -fno-builtin -fno-stack-protector -m64
 
-x86_srcs = boot kernel
+x86_srcs = $(wildcard ./boot/*.c) $(wildcard ./kernel/*.c) $(wildcard ./*.c)
+x86_objs = $(patsubst %.c, %.o, $(x86_srcs))
+
+x86_asm_srcs = $(wildcard ./boot/*.S) $(wildcard ./kernel/*.S)
+x86_asm_tmp_srcs = $(patsubst %.S, %.i, $(x86_asm_srcs))
+x86_asm_objs = $(patsubst %.S, %.o, $(x86_asm_srcs))
+
+build: $(x86_asm_objs) $(x86_objs)
+
+$(x86_objs): $(x86_srcs)
+$(x86_asm_objs): $(x86_asm_srcs)
+
+%.o: %.c
+	@echo "compile $<"
+	$(CC) $(CFLAGS) $(DEBUG) $< -o $@
+
+%.o: %.S
+	@echo "compile $<"
+	$(HIDE)$(CC) -E $(CFLAGS) $< > $<.i
+	$(HIDE)$(AS) $(ASFLAGS) -o $@ $<.i
+
+clean:
+	$(HIDE)rm -rf $(x86_objs) $(x86_asm_objs) $(x86_asm_tmp_srcs)
 
-build:
-	$(HIDE)for dir in $(x86_srcs); do \
-		make -C $$dir || exit 1; \
-	done

arch/x86/boot/header.S

@@ -16,4 +16,9 @@ multiboot_header:
     .long multiboot_header_end - multiboot_header  /* header length */
     .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT_ARCHITECTURE_I386 + (multiboot_header_end - multiboot_header))
 
+    /* required end tag */
+    .align 8
+    .short MULTIBOOT_HEADER_TAG_END # type
+    .short 0                        # flags
+    .long  8                        # size
 multiboot_header_end:

arch/x86/kernel/head_64.S

@@ -1,4 +1,4 @@
 .code32
 .global startup_64
 startup_64:
-
+    hlt

init/Makefile

@@ -1,3 +1,5 @@
 
 build:
-	echo "init"
+	echo "init"
+
+clean:

kernel/Makefile

@@ -2,3 +2,5 @@
 build:
 	echo $(baseDir)
 
+clean:
+

mm/Makefile

@@ -1,3 +1,6 @@
 
 build:
-	echo "mm"
+	echo "mm"
+
+clean:
+