Changeset 96e0748d in mainline for boot/arch/arm32

Timestamp:

2009-02-17T22:47:27Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f89979b

Parents:

e662a5f

Message:

make arch_pre_main optional, don't force any specific prototype
simplify boot process
mips32: detect number of configured CPUs in msim

Location:

boot/arch/arm32/loader

Files:

• asm.h (modified) (3 diffs)
• boot.S (modified) (1 diff)
• main.c (modified) (3 diffs)
• main.h (modified) (3 diffs)

boot/arch/arm32/loader/asm.h

@@ -33 +33 @@
 /** @file
  *  @brief Functions implemented in assembly.
- */ 
+ */
 
 
@@ -41 +41 @@
 
 /** Copies cnt bytes from dst to src.
- * 
+ *
  * @param dst Destination address.
  * @param src Source address.
- * @param cnt Count of bytes to be copied. 
+ * @param cnt Count of bytes to be copied.
  */
 #define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt))
@@ -59 +59 @@
 /** Jumps to the kernel entry point.
  *
- * @param entry          Kernel entry point address.
- * @param bootinfo       Structure holding information about loaded tasks.
- * @param bootinfo_size  Size of the bootinfo structure.
+ * @param entry    Kernel entry point address.
+ * @param bootinfo Structure holding information about loaded tasks.
+ *
  */
-extern void jump_to_kernel(void *entry, void *bootinfo,
-    unsigned int bootinfo_size) __attribute__((noreturn));
+extern void jump_to_kernel(void *entry, void *bootinfo) __attribute__((noreturn));
 
 

boot/arch/arm32/loader/boot.S

@@ -54 +54 @@
 page_table:
         .skip PTL0_ENTRIES * PTL0_ENTRY_SIZE
-
-

boot/arch/arm32/loader/main.c

@@ -33 +33 @@
 /** @file
  *  @brief Bootstrap.
- */ 
+ */
 
 
@@ -40 +40 @@
 #include "_components.h"
 #include <printf.h>
+#include <align.h>
 #include <macros.h>
 
@@ -110 +111 @@
         
         printf("\nBooting the kernel...\n");
-        jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS, &bootinfo, sizeof(bootinfo));
+        jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS, &bootinfo);
 }
 

boot/arch/arm32/loader/main.h

@@ -33 +33 @@
 /** @file
  *  @brief Boot related declarations.
- */ 
+ */
 
 
@@ -39 +39 @@
 #define BOOT_arm32_MAIN_H
 
-
-/** Aligns to the nearest higher address.
- *
- * @param addr  Address or number to be aligned.
- * @param align Size of alignment, must be power of 2.
- */
-#define ALIGN_UP(addr, align) (((addr) + ((align) - 1)) & ~((align) - 1))
 
 /** Maximum number of tasks in the #bootinfo_t struct. */
@@ -75 +68 @@
 /** @}
  */
-