diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-13 13:30:54 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-13 13:30:54 +0100 |
| commit | d53ccdb341cf16e32c0ca2d6099b194d9572fe0c (patch) | |
| tree | 1ef7ca4c54463e02d0da5f6351ac5bebc5418c76 /lib/tizen/tizen.c | |
| parent | 7bc5c8c93032a7b86e268a172955e15b84f1aac3 (diff) | |
| parent | e25bfecf7ba54a5b56cf991af8a2f2bb22994293 (diff) | |
| download | blackbird-obmc-uboot-d53ccdb341cf16e32c0ca2d6099b194d9572fe0c.tar.gz blackbird-obmc-uboot-d53ccdb341cf16e32c0ca2d6099b194d9572fe0c.zip | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'lib/tizen/tizen.c')
| -rw-r--r-- | lib/tizen/tizen.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/lib/tizen/tizen.c b/lib/tizen/tizen.c index e872591cd1..814ed18329 100644 --- a/lib/tizen/tizen.c +++ b/lib/tizen/tizen.c @@ -9,18 +9,25 @@ #include <lcd.h> #include <libtizen.h> -#include "tizen_hd_logo.h" -#include "tizen_hd_logo_data.h" +#include "tizen_logo_16bpp.h" +#include "tizen_logo_16bpp_gzip.h" void get_tizen_logo_info(vidinfo_t *vid) { - switch (vid->resolution) { - case HD_RESOLUTION: - vid->logo_width = TIZEN_HD_LOGO_WIDTH; - vid->logo_height = TIZEN_HD_LOGO_HEIGHT; - vid->logo_addr = (ulong)tizen_hd_logo; + switch (vid->vl_bpix) { + case 4: + vid->logo_width = TIZEN_LOGO_16BPP_WIDTH; + vid->logo_height = TIZEN_LOGO_16BPP_HEIGHT; + vid->logo_x_offset = TIZEN_LOGO_16BPP_X_OFFSET; + vid->logo_y_offset = TIZEN_LOGO_16BPP_Y_OFFSET; +#if defined(CONFIG_VIDEO_BMP_GZIP) + vid->logo_addr = (ulong)tizen_logo_16bpp_gzip; +#else + vid->logo_addr = (ulong)tizen_logo_16bpp; +#endif break; default: + vid->logo_addr = 0; break; } } |
