Changeset 1787e527 in mainline for kernel/arch/ppc32/include/boot/boot.h

Timestamp:

2009-11-16T21:22:54Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

• kernel/arch/ppc32/include/boot/boot.h (modified) (2 diffs)

kernel/arch/ppc32/include/boot/boot.h

@@ -41 +41 @@
 #define TEMP_STACK_SIZE  0x1000
 
-#define TASKMAP_MAX_RECORDS  32
-#define MEMMAP_MAX_RECORDS   32
+#define TASKMAP_MAX_RECORDS        32
+#define MEMMAP_MAX_RECORDS         32
+#define BOOTINFO_TASK_NAME_BUFLEN  32
 
 #ifndef __ASM__
 
-#define BOOTINFO_TASK_NAME_BUFLEN 32
-
 #include <arch/types.h>
+#include <config.h>
+#include <genarch/ofw/ofw_tree.h>
 
 typedef struct {
@@ -73 +74 @@
 
 typedef struct {
-        uintptr_t addr;
-        unsigned int width;
-        unsigned int height;
-        unsigned int bpp;
-        unsigned int scanline;
-} screen_t;
-
-typedef struct {
-        uintptr_t addr;
-        unsigned int size;
-} macio_t;
-
-typedef struct {
         memmap_t memmap;
         taskmap_t taskmap;
-        screen_t screen;
-        macio_t macio;
+        ballocs_t ballocs;
+        ofw_tree_node_t *ofw_root;
 } bootinfo_t;