Changeset a9ddab2 in mainline

Timestamp:

2008-09-06T21:31:41Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a1696d8

Parents:

6d37d27

Message:

Be aware of the ramdisk passed by SILO.

Location:

boot/arch/sparc64/loader

Files:

• boot.S (modified) (1 diff)
• main.c (modified) (2 diffs)
• main.h (modified) (1 diff)

boot/arch/sparc64/loader/boot.S

@@ -54 +54 @@
         .word 0
         .half 0
+        .half 0
+        .half 0
+        .half 0
+.global silo_ramdisk_image
+silo_ramdisk_image:
+        .word 0
+.global silo_ramdisk_size
+silo_ramdisk_size:
+        .word 0
 
 .align 8

boot/arch/sparc64/loader/main.c

@@ -58 +58 @@
 static void version_print(void)
 {
-        printf("HelenOS SPARC64 Bootloader\nRelease %s%s%s\nCopyright (c) 2006 HelenOS project\n", release, revision, timestamp);
+        printf("HelenOS SPARC64 Bootloader\nRelease %s%s%s\n"
+            "Copyright (c) 2006 HelenOS project\n",
+            release, revision, timestamp);
 }
 
@@ -81 +83 @@
                 halt();
         }
+
+        /*
+         * SILO for some reason adds 0x400000 and subtracts
+         * bootinfo.physmem_start to/from silo_ramdisk_image.
+         * We just need plain physical address so we fix it up.
+         */
+        if (silo_ramdisk_image) {
+                silo_ramdisk_image += bootinfo.physmem_start;
+                silo_ramdisk_image -= 0x400000;
+        }
         
         printf("\nSystem info\n");
         printf(" memory: %dM starting at %P\n",
-                bootinfo.memmap.total >> 20, bootinfo.physmem_start);
+            bootinfo.memmap.total >> 20, bootinfo.physmem_start);
 
         printf("\nMemory statistics\n");

boot/arch/sparc64/loader/main.h

@@ -60 +60 @@
 } bootinfo_t;
 
+extern uint32_t silo_ramdisk_image;
+extern uint32_t silo_ramdisk_size;
+
 extern bootinfo_t bootinfo;