Changeset 96e0748d in mainline for kernel/arch/arm32/include

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:

kernel/arch/arm32/include

Files:

• arch.h (modified) (2 diffs)
• asm/boot.h (modified) (2 diffs)
• boot.h (deleted)

kernel/arch/arm32/include/arch.h

@@ -27 +27 @@
  */
 
-/** @addtogroup arm32   
+/** @addtogroup arm32
  * @{
  */
@@ -37 +37 @@
 #define KERN_arm32_ARCH_H_
 
+#define TASKMAP_MAX_RECORDS  32
+#define CPUMAP_MAX_RECORDS   32
+
+#include <typedefs.h>
+
+typedef struct {
+        uintptr_t addr;
+        uint32_t size;
+} utask_t;
+
+typedef struct {
+        uint32_t cnt;
+        utask_t tasks[TASKMAP_MAX_RECORDS];
+} bootinfo_t;
+
+extern void arch_pre_main(void *entry, bootinfo_t *bootinfo);
+
 #endif
 

kernel/arch/arm32/include/asm/boot.h

@@ -27 +27 @@
  */
 
-/** @addtogroup arm32   
+/** @addtogroup arm32
  * @{
  */
@@ -40 +40 @@
 #define TEMP_STACK_SIZE 0x100
 
-#ifndef __ASM__
-
-/** Kernel entry point.
- *
- * Implemented in assembly. Copies boot_bootinfo (declared as bootinfo in 
- * boot/arch/arm32/loader/main.c) to #bootinfo struct. Then jumps to
- * #arch_pre_main and #main_bsp.
- *
- * @param entry          Entry point address (not used).
- * @param boot_bootinfo  Struct holding information about loaded tasks.
- * @param bootinfo_size  Size of the bootinfo structure.
- */
-extern void kernel_image_start(void *entry, void *boot_bootinfo,
-    unsigned int bootinfo_size);
-
-#endif
-
 #endif