Changeset 077b9172 in mainline

Timestamp:

2013-01-24T21:18:56Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6968948

Parents:

b1011dae (diff), 0e63d34 (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 changes from jan.vesely/helenos/arm

Files:

• boot/arch/arm32/src/main.c (modified) (1 diff)
• uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c (modified) (2 diffs)

boot/arch/arm32/src/main.c

@@ -153 +153 @@
         printf(".\n");
         
-        void *kernel_end = (void *) PA2KA(BOOT_OFFSET + components[0].inflated);
         printf("Booting the kernel...\n");
         jump_to_kernel((void *) PA2KA(BOOT_OFFSET), &bootinfo);

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -42 +42 @@
 #include "amdm37x_dispc.h"
 
+#ifndef CONFIG_BFB_BPP
+#define CONFIG_BFB_BPP 24
+#endif
+
+#ifndef CONFIG_BFB_WIDTH
+#define CONFIG_BFB_WIDTH 1024
+#endif
+
+#ifndef CONFIG_BFB_HEIGHT
+#define CONFIG_BFB_HEIGHT 768
+#endif
+
+
 static int change_mode(visualizer_t *vis, vslmode_t mode);
 static int handle_damage(visualizer_t *vs,
@@ -109 +122 @@
         instance->size = 0;
 
-        visual_t visual = VISUAL_UNKNOWN;
-
+        /* Default is 24bpp, use config option if available */
+        visual_t visual = VISUAL_BGR_8_8_8;
         switch (CONFIG_BFB_BPP) {
         case 8: visual = VISUAL_INDIRECT_8; break;