Changeset 25a76ab8 in mainline for boot/arch/arm32/include/asm.h

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/arch/arm32/include/asm.h (moved) (moved from boot/arch/arm32/loader/asm.h ) (1 diff)

boot/arch/arm32/include/asm.h

@@ -27 +27 @@
  */
 
-
 /** @addtogroup arm32boot
  * @{
  */
 /** @file
- *  @brief Functions implemented in assembly.
+ * @brief Functions implemented in assembly.
  */
-
 
 #ifndef BOOT_arm32_ASM_H
 #define BOOT_arm32_ASM_H
 
+#include <arch/arch.h>
+#include <arch/mm.h>
 
-/** Called when the CPU is switched on.
+extern pte_level0_section_t boot_pt[PTL0_ENTRIES];
+extern void *boot_stack;
+
+/** Jump to the kernel entry point.
  *
- *  This function is placed to the 0x0 address where ARM CPU starts execution. 
- *  Jumps to the #bootstrap only.
- */
-extern void start(void);
-
-
-/** Jumps to the kernel entry point.
- *
- * @param entry    Kernel entry point address.
+ * @param entry    Kernel entry point.
  * @param bootinfo Structure holding information about loaded tasks.
  *
  */
-extern void jump_to_kernel(void *entry, void *bootinfo) __attribute__((noreturn));
-
+extern void jump_to_kernel(void *entry, void *bootinfo)
+    __attribute__((noreturn));
 
 #endif