feat: spec-compliant AHCI HBA initialization

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

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index 4ed0d3bd7c9e81a34477b7c6bde309fc82bc287c..9ac9c3e415139cd701a0a0585cb124e14f7b9eea 100644 (file)
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -44,23 +44,29 @@ all-debug: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W) $(ARCH_OPT) -D__LUNA
 all-debug: LDFLAGS := -g -ffreestanding $(O) -nostdlib -lgcc
 all-debug: clean $(BUILD_DIR)/$(OS_ISO)
        @echo "Dumping the disassembled kernel code to $(BUILD_DIR)/kdump.txt"
 all-debug: LDFLAGS := -g -ffreestanding $(O) -nostdlib -lgcc
 all-debug: clean $(BUILD_DIR)/$(OS_ISO)
        @echo "Dumping the disassembled kernel code to $(BUILD_DIR)/kdump.txt"

-       @i686-elf-objdump -S $(BIN_DIR)/$(OS_BIN) > $(BUILD_DIR)/kdump.txt
+       @${TOOLCHAIN}/i686-elf-objdump -S $(BIN_DIR)/$(OS_BIN) > $(BUILD_DIR)/kdump.txt

 
 clean:
 
 clean:

-       @rm -rf $(BUILD_DIR)
-       @sleep 1
+       @rm -rf $(BUILD_DIR) || exit 1
+       @sleep 2

 
 run: $(BUILD_DIR)/$(OS_ISO)
 
 run: $(BUILD_DIR)/$(OS_ISO)

-       @qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) -monitor telnet::$(QEMU_MON_PORT),server,nowait &
+       @qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) $(QEMU_OPTIONS)

        @sleep 1
        @telnet 127.0.0.1 $(QEMU_MON_PORT)
 
 debug-qemu: all-debug
        @sleep 1
        @telnet 127.0.0.1 $(QEMU_MON_PORT)
 
 debug-qemu: all-debug

-       @i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
-       @qemu-system-i386 -s -S -cdrom $(BUILD_DIR)/$(OS_ISO) -monitor telnet::$(QEMU_MON_PORT),server,nowait &
+       @${TOOLCHAIN}/i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
+       @qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) $(QEMU_OPTIONS)

        @sleep 1
        @sleep 1

-       @$(QEMU_MON_TERM) -e "telnet 127.0.0.1 $(QEMU_MON_PORT)"
+       @$(QEMU_MON_TERM) -- telnet 127.0.0.1 $(QEMU_MON_PORT)

        @gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote localhost:1234"
 
        @gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote localhost:1234"
 

+debug-qemu-vscode: all-debug
+       @${TOOLCHAIN}/i686-elf-objcopy --only-keep-debug $(BIN_DIR)/$(OS_BIN) $(BUILD_DIR)/kernel.dbg
+       @qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) $(QEMU_OPTIONS)
+       @sleep 0.5
+       @telnet 127.0.0.1 $(QEMU_MON_PORT)
+

 debug-bochs: all-debug
        @bochs -q -f bochs.cfg
 debug-bochs: all-debug
        @bochs -q -f bochs.cfg