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

Timestamp:

2006-07-13T17:32:38Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a5f76758

Parents:

63cda71

Message:

Remove OpenFirmware calls from kernel/ entirely.

Switch the sparc64 port to use bootinfo.

Copy memcpy from boot/ to sparc64 kernel/ and
adjust it for memcpy_from/to_uspace.

File:

• boot/arch/sparc64/loader/main.c (modified) (1 diff)

boot/arch/sparc64/loader/main.c

@@ -81 +81 @@
         printf("\nCopying components\n");
         unsigned int top = 0;
-        bootinfo.cnt = 0;
+        bootinfo.taskmap.count = 0;
         for (i = 0; i < COMPONENTS; i++) {
+                void * base = (void *) KERNEL_VIRTUAL_ADDRESS;
+        
                 printf(" %s...", components[i].name);
                 top = ALIGN_UP(top, PAGE_SIZE);
-                memcpy(((void *) KERNEL_VIRTUAL_ADDRESS) + top, components[i].start, components[i].size);
+                memcpy(base + top, components[i].start, components[i].size);
                 if (i > 0) {
-                        bootinfo.tasks[bootinfo.cnt].addr = ((void *) KERNEL_VIRTUAL_ADDRESS) + top;
-                        bootinfo.tasks[bootinfo.cnt].size = components[i].size;
-                        bootinfo.cnt++;
+                        bootinfo.taskmap.tasks[bootinfo.taskmap.count].addr = base + top;
+                        bootinfo.taskmap.tasks[bootinfo.taskmap.count].size = components[i].size;
+                        bootinfo.taskmap.count++;
                 }
                 top += components[i].size;