From 3fc40ce6be09f8bdaba74af9c47d9a5ca434a32a Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 11 Dec 2024 18:52:55 -0800 Subject: [PATCH] Fix bootloader --- .editorconfig | 5 ++++- bios/bootloader.asm | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index 941e639..055607d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,4 +6,7 @@ indent_size = 4 end_of_line = lf charset = utf-8 trim_trailing_whitespace = false -insert_final_newline = false \ No newline at end of file +insert_final_newline = false + +[*.asm] +indent_style = space \ No newline at end of file diff --git a/bios/bootloader.asm b/bios/bootloader.asm index 8b59b20..3911cd0 100644 --- a/bios/bootloader.asm +++ b/bios/bootloader.asm @@ -22,9 +22,9 @@ times 3072 db 0 ; Pad to 0x13000 ; stage3, loaded at 0x13000 stage3: -; %defstr STAGE3_STR %[STAGE3] -; incbin STAGE3_STR -; align 512, db 0 + %defstr STAGE3_STR %[STAGE3] + incbin STAGE3_STR + align 512, db 0 .end: ; the maximum size of the boot loader portion is 384 KiB