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

Timestamp:

2009-08-20T16:58:55Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b9c7425

Parents:

a11099f

Message:

make ppc32 OFW usage on par with sparc64, make appropriate modifications elsewhere

• introduce ofw_tree_walk_by_device_type() to gather all OFW devices of a given type
• ppc32 uses canonized OFW tree, mac-io and display devices are detected in kernel (not by the boot loader) by means of device type
• various busses (PCI, EBUS, etc.) stay sparc64 specific for now
• boot memcpy() is defined in a common way
• BALLOC_MAX_SIZE is platform-dependent
• ppc32 and sparc64 boot loaders cleanup (removal of obsolete stuff, data is not passed by global variables if not necessary, etc.)
• balloc and OFW tree canonizer have now a provision to support different mapping of the data during boot time and kernel run-time
• OFW tree canonizer uses balloc_rebase() to store pointers suitable for access during kernel run-time (with potentially different memory mapping than during boot time)

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;