Changeset 38fe9d0 in mainline for arch/ppc32/loader/main.c

Timestamp:

2006-04-02T15:10:41Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

89343aac

Parents:

730de779

Message:

add instruction cache flush
align framebuffer on 128K boundary
change OFW calling method
make OFW code more compatible

File:

• arch/ppc32/loader/main.c (modified) (5 diffs)

arch/ppc32/loader/main.c

@@ -43 +43 @@
 {
         if ((unsigned int) addr % PAGE_SIZE != 0) {
-                printf("Error: %s not on page boundary\n", desc);
+                printf("Error: %s not on page boundary, halting.\n", desc);
                 halt();
         }
@@ -59 +59 @@
                 
                 if (ofw_map(new_pa, new_va, PAGE_SIZE, 0) != 0) {
-                        printf("Error: Unable to map page aligned memory at %L (physical %L)\n", new_va, new_pa);
+                        printf("Error: Unable to map page aligned memory at %L (physical %L), halting.\n", new_va, new_pa);
                         halt();
                 }
                 
                 if ((unsigned int) new_pa + PAGE_SIZE < KERNEL_SIZE) {
-                        printf("Error: %s cannot be relocated\n", desc);
+                        printf("Error: %s cannot be relocated, halting.\n", desc);
                         halt(); 
                 }
@@ -84 +84 @@
         
         if (!ofw_memmap(&bootinfo.memmap)) {
-                printf("Error: Unable to get memory map\n");
+                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\n");
+                printf("Error: Unable to get screen properties, halting.\n");
                 halt();
         }
@@ -99 +104 @@
         void *trans_pa = ofw_translate(&trans);
         void *bootinfo_pa = ofw_translate(&bootinfo);
+        void *fb = (void *) (((unsigned int) bootinfo.screen.addr) & ((unsigned int) ~0 << 17));
         
         printf("\nMemory statistics (total %d MB)\n", bootinfo.memmap.total >> 20);
@@ -119 +125 @@
         
         printf("\nBooting the kernel...\n");
-        jump_to_kernel(bootinfo_pa, sizeof(bootinfo), trans_pa, KERNEL_SIZE, real_mode_pa);
+        jump_to_kernel(bootinfo_pa, sizeof(bootinfo), trans_pa, KERNEL_SIZE, fb, real_mode_pa);
 }