fix issue 31 (#32)

[lunaix-os.git] / lunaix-os / makefile

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index e8deacf55c399343fc96376639dd96ed7165d5ae..c332bf7d361e594f0671ae1dba68647df03d83bd 100644 (file)
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -5,12 +5,13 @@ include $(mkinc_dir)/toolchain.mkinc
 include $(mkinc_dir)/qemu.mkinc
 include $(mkinc_dir)/utils.mkinc
 
 include $(mkinc_dir)/qemu.mkinc
 include $(mkinc_dir)/utils.mkinc
 

-

 ARCH ?= i386
 export ARCH
 
 DEPS := $(CC) $(LD) $(AR) xorriso grub-mkrescue
 
 ARCH ?= i386
 export ARCH
 
 DEPS := $(CC) $(LD) $(AR) xorriso grub-mkrescue
 

+CMDLINE ?= console=/dev/ttyFB0
+

 kbuild_dir := build
 kbin_dir := $(kbuild_dir)/bin
 os_img_dir := $(kbuild_dir)/img
 kbuild_dir := build
 kbin_dir := $(kbuild_dir)/bin
 os_img_dir := $(kbuild_dir)/img


@@ -38,15 +39,19 @@ $(kbuild_dir):
        @mkdir -p $(os_img_dir)/boot/grub
        @mkdir -p $(os_img_dir)/usr
 
        @mkdir -p $(os_img_dir)/boot/grub
        @mkdir -p $(os_img_dir)/usr
 

+.PHONY: kernel

 export BUILD_DIR=$(kbin_dir)
 export BUILD_NAME=$(kbin)
 export BUILD_DIR=$(kbin_dir)
 export BUILD_NAME=$(kbin)

-$(kbin):
+kernel:

        $(call status,TASK,$(notdir $@))
        @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all
 
        $(call status,TASK,$(notdir $@))
        @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all
 

-$(kimg): usr/build $(kbin)
+.PHONY: image
+export KCMD=$(CMDLINE)
+export _OS_NAME=$(OS_NAME)
+image: usr/build kernel

        $(call status,TASK,$(notdir $@))
        $(call status,TASK,$(notdir $@))

-       @./config-grub.sh ${OS_NAME} $(os_img_dir)/boot/grub/grub.cfg
+       @./config-grub.sh $(os_img_dir)/boot/grub/grub.cfg

        @cp -r usr/build/* $(os_img_dir)/usr
        @cp -r $(kbin_dir)/* $(os_img_dir)/boot
        @grub-mkrescue -o $(kimg) $(os_img_dir) -- -volid "$(OS_ID) $(OS_VER)" -system_id "$(OS_NAME)"
        @cp -r usr/build/* $(os_img_dir)/usr
        @cp -r $(kbin_dir)/* $(os_img_dir)/boot
        @grub-mkrescue -o $(kimg) $(os_img_dir) -- -volid "$(OS_ID) $(OS_VER)" -system_id "$(OS_NAME)"


@@ -58,10 +63,10 @@ check: $(DEPS) check-cc GRUB_TEMPLATE
 prepare: check $(os_img_dir)
 
 export BUILD_MODE=release
 prepare: check $(os_img_dir)
 
 export BUILD_MODE=release

-bootable: $(kbuild_dir) $(kimg)
+bootable: $(kbuild_dir) image

 
 export BUILD_MODE=debug
 
 export BUILD_MODE=debug

-bootable-debug: $(kbuild_dir) $(kimg)
+bootable-debug: $(kbuild_dir) image

 
 user:
        $(call status,$@)
 
 user:
        $(call status,$@)


@@ -73,8 +78,6 @@ instable: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNAI
 instable: all
 
 all-debug: bootable-debug
 instable: all
 
 all-debug: bootable-debug

-       @echo "Dumping the disassembled kernel code to $(kbuild_dir)/kdump.txt"
-       @i686-elf-objdump -S $(kbin) > $(kbuild_dir)/kdump.txt

 
 clean:
        @rm -rf $(kbuild_dir) || exit 1
 
 clean:
        @rm -rf $(kbuild_dir) || exit 1


@@ -90,11 +93,9 @@ debug-qemu: all-debug
        @i686-elf-objcopy --only-keep-debug $(kbin) $(kbuild_dir)/kernel.dbg
        @qemu-system-i386 $(call get_qemu_options,$(kimg))
        @sleep 1
        @i686-elf-objcopy --only-keep-debug $(kbin) $(kbuild_dir)/kernel.dbg
        @qemu-system-i386 $(call get_qemu_options,$(kimg))
        @sleep 1

-       @$(QEMU_MON_TERM) -- telnet 127.0.0.1 $(QEMU_MON_PORT)
-       @gdb -s $(kbuild_dir)/kernel.dbg -ex "target remote localhost:1234"
+       @QMPORT=$(QEMU_MON_PORT) gdb $(kbin) -ex "target remote localhost:1234"

 
 debug-qemu-vscode: all-debug
 
 debug-qemu-vscode: all-debug

-       @i686-elf-objcopy --only-keep-debug $(kbin) $(kbuild_dir)/kernel.dbg

        @qemu-system-i386 $(call get_qemu_options,$(kimg))
        @sleep 0.5
        @telnet 127.0.0.1 $(QEMU_MON_PORT)
        @qemu-system-i386 $(call get_qemu_options,$(kimg))
        @sleep 0.5
        @telnet 127.0.0.1 $(QEMU_MON_PORT)