Changeset 63cda71 in mainline for boot/arch/sparc64/loader/main.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/sparc64/loader/main.c (modified) (2 diffs)

boot/arch/sparc64/loader/main.c

@@ -32 +32 @@
 #include "_components.h"
 #include <ofw.h>
+#include <align.h>
 
 #define KERNEL_VIRTUAL_ADDRESS 0x400000
@@ -44 +45 @@
         init_components(components);
 
+        if (!ofw_memmap(&bootinfo.memmap)) {
+                printf("Error: unable to get memory map, halting.\n");
+                halt();
+        }
+        
+        if (bootinfo.memmap.total == 0) {
+                printf("Error: no memory detected, halting.\n");
+                halt();
+        }
+        
+        if (!ofw_screen(&bootinfo.screen)) {
+                printf("Error: unable to get screen properties, halting.\n");
+                halt();
+        }
+        bootinfo.screen.addr = ofw_translate(bootinfo.screen.addr);
+        
+        if (!ofw_keyboard(&bootinfo.keyboard)) {
+                printf("Error: unable to get keyboard properties, halting.\n");
+                halt();
+        }
+        
+        printf("\nDevice statistics\n");
+        printf(" memory: %dM\n", bootinfo.memmap.total>>20);
+        printf(" screen at %P, resolution %dx%d, %d bpp (scanline %d bytes)\n", (uintptr_t) bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);
+        printf(" keyboard at %P (size %d bytes)\n", (uintptr_t) bootinfo.keyboard.addr, bootinfo.keyboard.size);
+
         printf("\nMemory statistics\n");
-        printf(" kernel entry point at %L\n", KERNEL_VIRTUAL_ADDRESS);
-        printf(" %L: boot info structure\n", &bootinfo);
+        printf(" kernel entry point at %P\n", KERNEL_VIRTUAL_ADDRESS);
+        printf(" %P: boot info structure\n", &bootinfo);
         
         unsigned int i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %L: %s image (size %d bytes)\n", components[i].start, components[i].name, components[i].size);
+                printf(" %P: %s image (size %d bytes)\n", components[i].start, components[i].name, components[i].size);
 
         printf("\nCopying components\n");