Changeset 63cda71 in mainline for boot/arch/sparc64/loader/boot.S

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/sparc64/loader/boot.S (modified) (3 diffs)

boot/arch/sparc64/loader/boot.S

@@ -30 +30 @@
 
 #define PSTATE_IE_BIT   2
+#define PSTATE_AM_BIT   8
 
 .register %g2, #scratch
@@ -56 +57 @@
 
         /*
-         * Disable interrupts.
+         * Disable interrupts and disable address masking.
          */
         rdpr %pstate, %g2
-        and %g2, ~PSTATE_IE_BIT, %g2    ! mask the Interrupt Enable bit
+        and %g2, ~(PSTATE_IE_BIT|PSTATE_AM_BIT), %g2
         wrpr %g2, 0, %pstate
 
@@ -66 +67 @@
         set ofw_cif, %l0
  
-        call init               ! initialize OpenFirmware
+        call ofw_init           ! initialize OpenFirmware
         stx %o4, [%l0]