* Sync to trunk HEAD (r53318).

[reactos.git] / boot / freeldr / freeldr / arch / i386 / mb.S

diff --git a/boot/freeldr/freeldr/arch/i386/mb.S b/boot/freeldr/freeldr/arch/i386/mb.S
index 3b36d17..592e066 100644 (file)
--- a/boot/freeldr/freeldr/arch/i386/mb.S
+++ b/boot/freeldr/freeldr/arch/i386/mb.S
@@ -17,40 +17,22 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-       .text
-       .code16
-
-#define ASM
-#include <arch.h>
+#include <asm.inc>
+#include <arch/pc/x86common.h>
 #include <multiboot.h>
 
-       /*
-        * Here we assume the kernel is loaded at 1mb
-        * This boots the kernel
-        */
-       .code32
-    .globl _PageDirectoryStart
-    
-    .globl _startup_pagedirectory
-    .globl _lowmem_pagetable
-    .globl _kernel_pagetable
-    .globl _apic_pagetable
-
-    .globl _PageDirectoryEnd
-
-       //
-       // Boot information structure
-       //
+.code32
+PUBLIC _PageDirectoryStart
 
-EXTERN(_reactos_memory_map_descriptor_size)
-       .long   0
-
-EXTERN(_reactos_memory_map)
-       .rept   (32 * /*sizeof(memory_map_t)*/24)
-       .byte   0
-       .endr
+PUBLIC _startup_pagedirectory
+PUBLIC _lowmem_pagetable
+PUBLIC _kernel_pagetable
+PUBLIC _apic_pagetable
+PUBLIC _PageDirectoryEnd
 
+#ifndef _USE_ML
 .bss
+#endif
 _PageDirectoryStart:
 _startup_pagedirectory:
        .fill 4096, 1, 0
@@ -65,3 +47,5 @@ _apic_pagetable:
        .fill 4096, 1, 0
 
 _PageDirectoryEnd:
+
+END