Changeset 63cda71 in mainline for boot/genarch/ofw.h

Timestamp:

2006-07-13T14:58:57Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

94d614e

Parents:

eda7bf81

Message:

Fix ofw_memmap() in boot infrastructure.
The cell size is 32-bit and not equal sizeof(ofw_arg_t).
Define architecture dependant #address-cells and #size-cells for cases
the respective properties are missing in the OpenFirmware device tree.
The algorithm now works both for ppc32 and sparc64.

Add memmap_t, screen_t and keyboard_t to sparc64 bootinfo structure.
Be more verbose during sparc64 boot.

Move ALIGN_UP to generic part of boot/.

Change header guards in several places so that they don't contain double underscore.

File:

• boot/genarch/ofw.h (modified) (6 diffs)

boot/genarch/ofw.h

@@ -27 +27 @@
  */
 
-#ifndef __OFW_H__
-#define __OFW_H__
+#ifndef BOOT_OFW_H_
+#define BOOT_OFW_H_
 
 #include <types.h>
@@ -39 +39 @@
 #define MAX_OFW_ARGS            12
 
-typedef unsigned long ofw_arg_t;
+typedef unative_t ofw_arg_t;
 typedef unsigned int ihandle;
 typedef unsigned int phandle;
@@ -65 +65 @@
 
 typedef struct {
-        uint32_t addr;
+        void *addr;
         unsigned int width;
         unsigned int height;
@@ -73 +73 @@
 
 typedef struct {
-        uint32_t addr;
+        void *addr;
         unsigned int size;
 } keyboard_t;
@@ -93 +93 @@
 extern phandle ofw_aliases;
 
-extern void init(void);
+extern void ofw_init(void);
 extern void ofw_write(const char *str, const int len);
 
@@ -100 +100 @@
 
 extern int ofw(ofw_args_t *arg);
+extern unsigned int ofw_get_address_cells(const phandle device);
+extern unsigned int ofw_get_size_cells(const phandle device);
 extern void *ofw_translate(const void *virt);
 extern int ofw_translate_failed(ofw_arg_t flag);