Changeset 63cda71 in mainline for boot/arch/ppc32/loader/ofwarch.c

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/arch/ppc32/loader/ofwarch.c (moved) (moved from boot/arch/ppc32/loader/ofw.c ) (2 diffs)

boot/arch/ppc32/loader/ofwarch.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
+#include <ofwarch.h> 
 #include <ofw.h>
 #include <printf.h>
@@ -56 +57 @@
         if (ofw_get_property(device, "assigned-addresses", &macio, sizeof(macio)) <= 0)
                 return false;
-        keyboard->addr = macio.addr.addr_lo;
+        keyboard->addr = (void *) macio.addr.addr_lo;
         keyboard->size = macio.size_lo;