Changeset c47e1a8 in mainline for boot/arch/ppc32/include/main.h

Timestamp:

2010-05-21T07:50:04Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

• boot/arch/ppc32/include/main.h (moved) (moved from boot/arch/ia64/loader/main.h ) (1 diff)

boot/arch/ppc32/include/main.h

@@ -27 +27 @@
  */
 
-#ifndef BOOT_ia64_MAIN_H_
-#define BOOT_ia64_MAIN_H_
+#ifndef BOOT_ppc32_MAIN_H_
+#define BOOT_ppc32_MAIN_H_
 
-#include <types.h>
-#include <../../../../kernel/arch/ia64/include/bootinfo.h> 
+#include <typedefs.h>
+#include <balloc.h>
+#include <genarch/ofw_tree.h>
 
+typedef struct {
+        memmap_t memmap;
+        taskmap_t taskmap;
+        ballocs_t ballocs;
+        ofw_tree_node_t *ofw_root;
+} bootinfo_t;
 
-#define CONFIG_INIT_TASKS  32
-
-extern void start(void);
 extern void bootstrap(void);