Changeset f2ea5d8 in mainline for boot/arch/sparc64/loader/main.c

Timestamp:

2006-11-17T20:21:25Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f18cc64

Parents:

282f2c9c

Message:

sparc64 code to support physical memory that starts on non-zero addresses.
Still needs to be tested on systems with such setup.

File:

• boot/arch/sparc64/loader/main.c (modified) (4 diffs)

boot/arch/sparc64/loader/main.c

@@ -47 +47 @@
         init_components(components);
 
+        if (!ofw_get_physmem_start(&bootinfo.physmem_start)) {
+                printf("Error: unable to get start of physical memory.\n");
+                halt();
+        }
+
         if (!ofw_memmap(&bootinfo.memmap)) {
                 printf("Error: unable to get memory map, halting.\n");
@@ -58 +63 @@
         
         printf("\nSystem info\n");
-        printf(" memory: %dM\n", bootinfo.memmap.total>>20);
+        printf(" memory: %dM starting at %P\n",
+                bootinfo.memmap.total >> 20, bootinfo.physmem_start);
 
         printf("\nMemory statistics\n");
@@ -66 +72 @@
         unsigned int i;
         for (i = 0; i < COMPONENTS; i++)
-                printf(" %P: %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);
 
         void * base = (void *) KERNEL_VIRTUAL_ADDRESS;
@@ -94 +101 @@
         printf("\nChecking for secondary processors...");
         if (!ofw_cpu())
-                printf("Error: unable to get cpu properties\n");
+                printf("Error: unable to get CPU properties\n");
         printf("done.\n");
 
         printf("\nBooting the kernel...\n");
-        jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS, 1, &bootinfo, sizeof(bootinfo));
+        jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS,
+                bootinfo.physmem_start | BSP_PROCESSOR, &bootinfo, sizeof(bootinfo));
 }