Changeset c6588ce in mainline for kernel/arch/ppc32/src/ppc32.c

Timestamp:

2012-05-05T08:12:17Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ee04c28

Parents:

2cc7f16 (diff), d21e935c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

kernel/arch/ppc32/src/ppc32.c

@@ -130 +130 @@
                         visual = VISUAL_INDIRECT_8;
                         break;
+                case 15:
+                        visual = VISUAL_RGB_5_5_5_BE;
+                        break;
                 case 16:
-                        visual = VISUAL_RGB_5_5_5_BE;
+                        visual = VISUAL_RGB_5_6_5_BE;
                         break;
                 case 24:
@@ -173 +176 @@
                 ofw_tree_walk_by_device_type("display", display_register, NULL);
 #endif
+                /* Map OFW information into sysinfo */
+                ofw_sysinfo_map();
                 
                 /* Initialize IRQ routing */