Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 077b9172 in mainline


Ignore:
Timestamp:
2013-01-24T21:18:56Z (9 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master
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:
2 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/arm32/src/main.c

    rb1011dae r077b9172  
    153153        printf(".\n");
    154154       
    155         void *kernel_end = (void *) PA2KA(BOOT_OFFSET + components[0].inflated);
    156155        printf("Booting the kernel...\n");
    157156        jump_to_kernel((void *) PA2KA(BOOT_OFFSET), &bootinfo);
  • uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

    rb1011dae r077b9172  
    4242#include "amdm37x_dispc.h"
    4343
     44#ifndef CONFIG_BFB_BPP
     45#define CONFIG_BFB_BPP 24
     46#endif
     47
     48#ifndef CONFIG_BFB_WIDTH
     49#define CONFIG_BFB_WIDTH 1024
     50#endif
     51
     52#ifndef CONFIG_BFB_HEIGHT
     53#define CONFIG_BFB_HEIGHT 768
     54#endif
     55
     56
    4457static int change_mode(visualizer_t *vis, vslmode_t mode);
    4558static int handle_damage(visualizer_t *vs,
     
    109122        instance->size = 0;
    110123
    111         visual_t visual = VISUAL_UNKNOWN;
    112 
     124        /* Default is 24bpp, use config option if available */
     125        visual_t visual = VISUAL_BGR_8_8_8;
    113126        switch (CONFIG_BFB_BPP) {
    114127        case 8: visual = VISUAL_INDIRECT_8; break;
Note: See TracChangeset for help on using the changeset viewer.