Changes in kernel/arch/ppc32/src/ppc32.c [2e533d6f:c0699467] in mainline

File:

• kernel/arch/ppc32/src/ppc32.c (modified) (6 diffs)

kernel/arch/ppc32/src/ppc32.c

@@ -46 +46 @@
 #include <userspace.h>
 #include <mm/page.h>
-#include <mm/km.h>
 #include <abi/proc/uarg.h>
 #include <console/console.h>
@@ -72 +71 @@
         size_t i;
         for (i = 0; i < init.cnt; i++) {
-                init.tasks[i].paddr = KA2PA(bootinfo->taskmap.tasks[i].addr);
+                init.tasks[i].addr = (uintptr_t) bootinfo->taskmap.tasks[i].addr;
                 init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
@@ -130 +129 @@
                         visual = VISUAL_INDIRECT_8;
                         break;
-                case 15:
+                case 16:
                         visual = VISUAL_RGB_5_5_5_BE;
-                        break;
-                case 16:
-                        visual = VISUAL_RGB_5_6_5_BE;
                         break;
                 case 24:
@@ -176 +172 @@
                 ofw_tree_walk_by_device_type("display", display_register, NULL);
 #endif
-                /* Map OFW information into sysinfo */
-                ofw_sysinfo_map();
                 
                 /* Initialize IRQ routing */
@@ -214 +208 @@
                 size_t size = 2 * PAGE_SIZE;
                 
-                cuda_t *cuda = (cuda_t *) (km_map(aligned_addr, offset + size,
-                    PAGE_WRITE | PAGE_NOT_CACHEABLE) + offset);
+                cuda_t *cuda = (cuda_t *)
+                    (hw_map(aligned_addr, offset + size) + offset);
                 
                 /* Initialize I/O controller */
@@ -237 +231 @@
                 sysinfo_set_item_val("cuda.inr", NULL, IRQ_CUDA);
                 sysinfo_set_item_val("cuda.address.physical", NULL, pa);
+                sysinfo_set_item_val("cuda.address.kernel", NULL,
+                    (uintptr_t) cuda);
 #endif
         }