Changeset deca67b in mainline for kernel/arch/ia32/include/boot

Timestamp:

2009-03-03T12:56:20Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

add04f7

Parents:

2f57690

Message:

rename ia32_cboot() to arch_pre_main() and move it to ia32.c (to be in line with other platforms)

Location:

kernel/arch/ia32/include/boot

Files:

• boot.h (modified) (2 diffs)
• multiboot.h (moved) (moved from kernel/arch/ia32/include/boot/cboot.h ) (3 diffs)

kernel/arch/ia32/include/boot/boot.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia32
  * @{
  */
@@ -36 +36 @@
 #define KERN_ia32_BOOT_H_
 
-#define BOOT_OFFSET             0x108000
-#define AP_BOOT_OFFSET          0x8000
-#define BOOT_STACK_SIZE 0x400
+#define BOOT_OFFSET      0x108000
+#define AP_BOOT_OFFSET   0x8000
+#define BOOT_STACK_SIZE  0x400
 
-#define MULTIBOOT_HEADER_MAGIC  0x1BADB002
-#define MULTIBOOT_HEADER_FLAGS  0x00010003
+#define MULTIBOOT_HEADER_MAGIC  0x1BADB002
+#define MULTIBOOT_HEADER_FLAGS  0x00010003
 
-#define MULTIBOOT_LOADER_MAGIC  0x2BADB002
+#define MULTIBOOT_LOADER_MAGIC  0x2BADB002
+
+#ifndef __ASM__
+
+#ifdef CONFIG_SMP
+
+extern int _hardcoded_unmapped_size;
+
+#endif /* CONFIG_SMP */
+
+#endif /* __ASM__ */
 
 #endif

kernel/arch/ia32/include/boot/multiboot.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia32
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef KERN_ia32_CBOOT_H__
-#define KERN_ia32_CBOOT_H_
+#ifndef KERN_ia32_MULTIBOOT_H__
+#define KERN_ia32_MULTIBOOT_H_
 
 #include <arch/types.h>
@@ -58 +58 @@
         uintptr_t mem_lower;
         uintptr_t mem_upper;
-
+        
         uint32_t boot_device;
         char *cmdline;
-
+        
         uint32_t mods_count;
         mb_mod_t *mods_addr;
-
+        
         uint32_t syms[4];
-
+        
         uint32_t mmap_length;
         mb_mmap_t *mmap_addr;
-
+        
         /* ... */
 } __attribute__ ((packed)) mb_info_t;
 
 enum mb_info_flags {
-        MBINFO_FLAGS_MEM        = 0x01,
-        MBINFO_FLAGS_BOOT       = 0x02,
-        MBINFO_FLAGS_CMDLINE    = 0x04,
-        MBINFO_FLAGS_MODS       = 0x08,
-        MBINFO_FLAGS_SYMS1      = 0x10,
-        MBINFO_FLAGS_SYMS2      = 0x20,
-        MBINFO_FLAGS_MMAP       = 0x40
+        MBINFO_FLAGS_MEM     = 0x01,
+        MBINFO_FLAGS_BOOT    = 0x02,
+        MBINFO_FLAGS_CMDLINE = 0x04,
+        MBINFO_FLAGS_MODS    = 0x08,
+        MBINFO_FLAGS_SYMS1   = 0x10,
+        MBINFO_FLAGS_SYMS2   = 0x20,
+        MBINFO_FLAGS_MMAP    = 0x40
+        
         /* ... */
 };
-
-extern void ia32_cboot(uint32_t signature, const mb_info_t *mi);
 
 #endif