Changeset 63cda71 in mainline for kernel

Timestamp:

2006-07-13T14:58:57Z (19 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.

Location:

kernel/arch/sparc64

Files:

• include/regdef.h (added)
• include/register.h (modified) (2 diffs)
• src/asm.S (modified) (1 diff)
• src/start.S (modified) (2 diffs)

kernel/arch/sparc64/include/register.h

@@ -36 +36 @@
 #define KERN_sparc64_REGISTER_H_
 
-#ifdef __ASM__
-#define PSTATE_IE_BIT   2
-#define PSTATE_AM_BIT   8
-#else
-
+#include <arch/regdef.h>
 #include <arch/types.h>
 
@@ -112 +108 @@
 #endif
 
-#endif
-
 /** @}
  */

kernel/arch/sparc64/src/asm.S

@@ -28 +28 @@
 
 #include <arch/stack.h>
-#include <arch/register.h>
+#include <arch/regdef.h>
 
 .text

kernel/arch/sparc64/src/start.S

@@ -28 +28 @@
 
 #include <arch/boot/boot.h>
-#include <arch/register.h>
+#include <arch/regdef.h>
 
 .register %g2, #scratch
@@ -38 +38 @@
 
 /*
- * Here is where the kernel is passed control.
+ * Here is where the kernel is passed control
+ * from the boot loader.
  */