Prepare bootloader for use in installer

2017-09-27 20:19:34 -06:00
parent 59fd6fbcfe
commit cccb19d19f
2 changed files with 14 additions and 15 deletions
@@ -17,12 +17,14 @@ startup_end:
      incbin KERNEL_STR
    .end:
    align 512, db 0
-%endif
-
-%ifdef FILESYSTEM
-    filesystem:
-        %defstr FILESYSTEM_STR %[FILESYSTEM]
-        incbin FILESYSTEM_STR
-    .end:
-    align 512, db 0
+%else
+    %ifdef FILESYSTEM
+        filesystem:
+            %defstr FILESYSTEM_STR %[FILESYSTEM]
+            incbin FILESYSTEM_STR
+        .end:
+        align 512, db 0
+    %else
+        filesystem:
+    %endif
 %endif
@@ -19,15 +19,12 @@ startup:
        add ecx, 511
        shr ecx, 9
        call load_extent
-
-        jmp .loaded_kernel
-    %endif
-
-    %ifdef FILESYSTEM
+    %else
        call redoxfs
-        jmp .loaded_kernel
    %endif

+    jmp .loaded_kernel
+
 .loaded_kernel:
    call memory_map

@@ -126,7 +123,7 @@ load_extent:
 %include "memory_map.asm"
 %include "vesa.asm"
 %include "initialize.asm"
-%ifdef FILESYSTEM
+%ifndef KERNEL
    %include "redoxfs.asm"
 %endif